-
Notifications
You must be signed in to change notification settings - Fork 127
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Move tab_list_ui/ code into its own DFM
BUG=925126 (cherry picked from commit 02d5848947400d769890ab3bfdf8eb66cd731c4e) Change-Id: I7e0f676f4e9e332945d70bedcbcb6f84665a3c80 Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1475881 Reviewed-by: Tommy Nyquist <[email protected]> Reviewed-by: Ilya Sherman <[email protected]> Reviewed-by: Ted Choc <[email protected]> Reviewed-by: Theresa <[email protected]> Reviewed-by: Tibor Goldschwendt <[email protected]> Commit-Queue: Yusuf Ozuysal <[email protected]> Cr-Original-Commit-Position: refs/heads/master@{#639609} Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1519092 Reviewed-by: Yusuf Ozuysal <[email protected]> Cr-Commit-Position: refs/branch-heads/3729@{#62} Cr-Branched-From: d4a8972-refs/heads/master@{#638880}
- Loading branch information
Yusuf Ozuysal
authored and
Yusuf Ozuysal
committed
Mar 12, 2019
1 parent
603ef46
commit c0b9245
Showing
53 changed files
with
498 additions
and
214 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -2,4 +2,5 @@ | |
| resource_packages_id_mapping = [ | ||
| "ar=0x7e", | ||
| "vr=0x7d", | ||
| "tab_ui=0x7c", | ||
| ] | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,21 @@ | ||
| <?xml version="1.0" encoding="utf-8"?> | ||
| <!-- Copyright 2019 The Chromium Authors. All rights reserved. | ||
| Use of this source code is governed by a BSD-style license that can be | ||
| found in the LICENSE file. --> | ||
|
|
||
| <manifest xmlns:android="http://schemas.android.com/apk/res/android" | ||
| xmlns:dist="http://schemas.android.com/apk/distribution" | ||
| featureSplit="tab_ui" | ||
| package="{{manifest_package}}"> | ||
|
|
||
| <uses-sdk | ||
| android:minSdkVersion="21" | ||
| android:targetSdkVersion="{{target_sdk_version}}" /> | ||
| <application></application> | ||
| <dist:module | ||
| dist:onDemand="true" | ||
| dist:title="@string/tab_management_module_title"> | ||
| <dist:fusing dist:include="false" /> | ||
| </dist:module> | ||
| </manifest> | ||
|
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,58 @@ | ||
| # Copyright 2019 The Chromium Authors. All rights reserved. | ||
| # Use of this source code is governed by a BSD-style license that can be | ||
| # found in the LICENSE file. | ||
|
|
||
| import("//build/config/android/rules.gni") | ||
| import("//chrome/common/features.gni") | ||
|
|
||
| android_library("java") { | ||
| java_files = [ | ||
| "java/src/org/chromium/chrome/browser/tasks/tab_groups/TabGroupUtils.java", | ||
| "java/src/org/chromium/chrome/browser/tasks/tab_management/GridTabSwitcherCoordinator.java", | ||
| "java/src/org/chromium/chrome/browser/tasks/tab_management/GridTabSwitcherMediator.java", | ||
| "java/src/org/chromium/chrome/browser/tasks/tab_management/TabGridContainerViewBinder.java", | ||
| "java/src/org/chromium/chrome/browser/tasks/tab_management/TabGridSheetCoordinator.java", | ||
| "java/src/org/chromium/chrome/browser/tasks/tab_management/TabGridSheetMediator.java", | ||
| "java/src/org/chromium/chrome/browser/tasks/tab_management/TabGridSheetContent.java", | ||
| "java/src/org/chromium/chrome/browser/tasks/tab_management/TabGridSheetProperties.java", | ||
| "java/src/org/chromium/chrome/browser/tasks/tab_management/TabGridSheetToolbarCoordinator.java", | ||
| "java/src/org/chromium/chrome/browser/tasks/tab_management/TabGridSheetViewBinder.java", | ||
| "java/src/org/chromium/chrome/browser/tasks/tab_management/TabGridViewBinder.java", | ||
| "java/src/org/chromium/chrome/browser/tasks/tab_management/TabGridViewHolder.java", | ||
| "java/src/org/chromium/chrome/browser/tasks/tab_management/TabGroupUiCoordinator.java", | ||
| "java/src/org/chromium/chrome/browser/tasks/tab_management/TabGroupUiMediator.java", | ||
| "java/src/org/chromium/chrome/browser/tasks/tab_management/TabGroupUiToolbarView.java", | ||
| "java/src/org/chromium/chrome/browser/tasks/tab_management/TabGroupUiToolbarViewBinder.java", | ||
| "java/src/org/chromium/chrome/browser/tasks/tab_management/TabListContainerProperties.java", | ||
| "java/src/org/chromium/chrome/browser/tasks/tab_management/TabListCoordinator.java", | ||
| "java/src/org/chromium/chrome/browser/tasks/tab_management/TabListMediator.java", | ||
| "java/src/org/chromium/chrome/browser/tasks/tab_management/TabListModel.java", | ||
| "java/src/org/chromium/chrome/browser/tasks/tab_management/TabListRecyclerView.java", | ||
| "java/src/org/chromium/chrome/browser/tasks/tab_management/TabManagementModuleImpl.java", | ||
| "java/src/org/chromium/chrome/browser/tasks/tab_management/TabProperties.java", | ||
| "java/src/org/chromium/chrome/browser/tasks/tab_management/TabStripToolbarCoordinator.java", | ||
| "java/src/org/chromium/chrome/browser/tasks/tab_management/TabStripToolbarViewProperties.java", | ||
| "java/src/org/chromium/chrome/browser/tasks/tab_management/TabStripViewBinder.java", | ||
| "java/src/org/chromium/chrome/browser/tasks/tab_management/TabStripViewHolder.java", | ||
| ] | ||
|
|
||
| classpath_deps = [ | ||
| "//base:base_java", | ||
| "//chrome/android:chrome_java", | ||
| "//chrome/android:chrome_strings_grd", | ||
| "//chrome/android:ui_locale_string_resources", | ||
| "//chrome/app:java_strings_grd", | ||
| "//components/feature_engagement:feature_engagement_java", | ||
| "//components/policy/android:policy_java", | ||
| "//content/public/android:content_java_resources", | ||
| "//content/public/android:content_java", | ||
| "//third_party/android_deps:android_arch_lifecycle_common_java", | ||
| "//third_party/android_deps:android_arch_lifecycle_runtime_java", | ||
| "//third_party/android_deps:android_support_annotations_java", | ||
| "//third_party/android_deps:android_support_compat_java", | ||
| "//third_party/android_deps:android_support_v13_java", | ||
| "//third_party/android_deps:android_support_v7_appcompat_java", | ||
| "//third_party/android_deps:android_support_v7_recyclerview_java", | ||
| "//ui/android:ui_java", | ||
| ] | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,6 @@ | ||
| include_rules = [ | ||
| "+components/feature_engagement/public/android/java/src/org/chromium/components/feature_engagement", | ||
| "+components/module_installer", | ||
|
|
||
| "+content/public/android/java/src/org/chromium/content_public/browser", | ||
| ] |
File renamed without changes.
12 changes: 12 additions & 0 deletions
12
...res/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/GridTabSwitcher.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,12 @@ | ||
| // Copyright 2019 The Chromium Authors. All rights reserved. | ||
| // Use of this source code is governed by a BSD-style license that can be | ||
| // found in the LICENSE file. | ||
|
|
||
| package org.chromium.chrome.browser.tasks.tab_management; | ||
|
|
||
| import org.chromium.chrome.browser.compositor.layouts.OverviewModeController; | ||
|
|
||
| /** | ||
| * Interface for the Grid Tab Switcher. | ||
| */ | ||
| public interface GridTabSwitcher { OverviewModeController getOverviewModeController(); } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
31 changes: 31 additions & 0 deletions
31
...s/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/SilenceLintErrors.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,31 @@ | ||
| // Copyright 2018 The Chromium Authors. All rights reserved. | ||
| // Use of this source code is governed by a BSD-style license that can be | ||
| // found in the LICENSE file. | ||
|
|
||
| package org.chromium.chrome.browser.tasks.tab_management; | ||
|
|
||
| import org.chromium.chrome.R; | ||
|
|
||
| /** | ||
| * Hacky class to avoid lint errors for resources called on the module. | ||
| */ | ||
| /* package */ class SilenceLintErrors { | ||
| // TODO(yusufo): Add these resources to the DFM | ||
| private int[] mRes = | ||
| new int[] {R.dimen.tab_grid_favicon_size, R.string.tab_management_module_title, | ||
| R.string.iph_tab_groups_quickly_compare_pages_text, | ||
| R.string.iph_tab_groups_tap_to_see_another_tab_text, | ||
| R.string.iph_tab_groups_your_tabs_together_text, | ||
| R.string.bottom_tab_grid_description, R.string.bottom_tab_grid_opened_half, | ||
| R.string.bottom_tab_grid_opened_full, R.string.bottom_tab_grid_closed, | ||
| R.dimen.tab_list_selected_inset, R.layout.tab_strip_item, | ||
| R.drawable.selected_tab_background, R.drawable.tab_grid_card_background, | ||
| R.layout.tab_grid_card_item, R.layout.tab_list_recycler_view_layout, | ||
| R.layout.bottom_tab_grid_toolbar, R.string.bottom_tab_grid_new_tab, | ||
| R.string.bottom_tab_grid_new_tab, R.plurals.bottom_tab_grid_title_placeholder, | ||
| R.string.iph_tab_groups_tap_to_see_another_tab_accessibility_text, | ||
| R.string.accessibility_bottom_tab_strip_expand_tab_sheet, | ||
| R.layout.bottom_tab_strip_toolbar}; | ||
|
|
||
| private SilenceLintErrors() {} | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.