Commit 0c432190 authored by Theresa Wellington's avatar Theresa Wellington Committed by Commit Bot

Move DateDividedAdapter to //components/browser_ui/widgets/

Move the last widget in //chrome/android/.../widgets/ to //components/
and delete the old directory.

BUG=1003941

Change-Id: I407f883ec4bf03e15d87c5753565567d8f9b9f27
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2410672Reviewed-by: default avatarDavid Trainor <dtrainor@chromium.org>
Commit-Queue: Theresa  <twellington@chromium.org>
Cr-Commit-Position: refs/heads/master@{#807924}
parent 7b1caba7
......@@ -840,7 +840,6 @@ chrome_java_resources = [
"java/res/layout/data_usage_breakdown.xml",
"java/res/layout/data_usage_breakdown_row.xml",
"java/res/layout/data_usage_chart.xml",
"java/res/layout/date_divided_adapter_header_view_holder.xml",
"java/res/layout/date_view.xml",
"java/res/layout/default_search_engine_first_run_fragment.xml",
"java/res/layout/device_item_list.xml",
......
......@@ -1695,5 +1695,4 @@ chrome_java_sources = [
"java/src/org/chromium/chrome/browser/webauth/Fido2Helper.java",
"java/src/org/chromium/chrome/browser/webauth/HandlerResponseCallback.java",
"java/src/org/chromium/chrome/browser/webshare/ShareServiceImplementationFactory.java",
"java/src/org/chromium/chrome/browser/widget/DateDividedAdapter.java",
]
......@@ -24,7 +24,7 @@ import org.chromium.chrome.browser.history.HistoryProvider.BrowsingHistoryObserv
import org.chromium.chrome.browser.preferences.Pref;
import org.chromium.chrome.browser.profiles.Profile;
import org.chromium.chrome.browser.ui.favicon.FaviconHelper.DefaultFaviconHelper;
import org.chromium.chrome.browser.widget.DateDividedAdapter;
import org.chromium.components.browser_ui.widget.DateDividedAdapter;
import org.chromium.components.browser_ui.widget.MoreProgressButton;
import org.chromium.components.browser_ui.widget.MoreProgressButton.State;
import org.chromium.components.browser_ui.widget.selectable_list.SelectableItemViewHolder;
......
......@@ -8,7 +8,7 @@ import android.text.TextUtils;
import org.chromium.base.ContextUtils;
import org.chromium.chrome.R;
import org.chromium.chrome.browser.widget.DateDividedAdapter.TimedItem;
import org.chromium.components.browser_ui.widget.DateDividedAdapter.TimedItem;
import java.util.Arrays;
......
twellington@chromium.org
per-file FeatureHighlightProvider.java=mdjones@chromium.org
per-file ToolbarProgressBar*=mdjones@chromium.org
per-file ScrimView.java=mdjones@chromium.org
......@@ -26,10 +26,10 @@ import org.chromium.base.test.util.Restriction;
import org.chromium.chrome.R;
import org.chromium.chrome.browser.flags.ChromeSwitches;
import org.chromium.chrome.browser.history.HistoryTestUtils.TestObserver;
import org.chromium.chrome.browser.widget.DateDividedAdapter.FooterItem;
import org.chromium.chrome.browser.widget.DateDividedAdapter.TimedItem;
import org.chromium.chrome.test.ChromeJUnit4RunnerDelegate;
import org.chromium.chrome.test.util.browser.signin.AccountManagerTestRule;
import org.chromium.components.browser_ui.widget.DateDividedAdapter.FooterItem;
import org.chromium.components.browser_ui.widget.DateDividedAdapter.TimedItem;
import org.chromium.components.browser_ui.widget.MoreProgressButton;
import org.chromium.components.browser_ui.widget.MoreProgressButton.State;
import org.chromium.components.browser_ui.widget.RecyclerViewTestUtils;
......
......@@ -46,10 +46,10 @@ import org.chromium.chrome.browser.preferences.Pref;
import org.chromium.chrome.browser.preferences.PrefChangeRegistrar;
import org.chromium.chrome.browser.profiles.Profile;
import org.chromium.chrome.browser.signin.IdentityServicesProvider;
import org.chromium.chrome.browser.widget.DateDividedAdapter;
import org.chromium.chrome.test.ChromeJUnit4ClassRunner;
import org.chromium.chrome.test.util.browser.signin.AccountManagerTestRule;
import org.chromium.chrome.test.util.browser.sync.SyncTestUtil;
import org.chromium.components.browser_ui.widget.DateDividedAdapter;
import org.chromium.components.browser_ui.widget.RecyclerViewTestUtils;
import org.chromium.components.browser_ui.widget.selectable_list.SelectableItemView;
import org.chromium.components.browser_ui.widget.selectable_list.SelectableItemViewHolder;
......
......@@ -14,7 +14,7 @@ import org.junit.Assert;
import org.chromium.base.test.util.CallbackHelper;
import org.chromium.chrome.browser.preferences.PrefChangeRegistrar.PrefObserver;
import org.chromium.chrome.browser.signin.SigninManager.SignInStateObserver;
import org.chromium.chrome.browser.widget.DateDividedAdapter.ItemViewType;
import org.chromium.components.browser_ui.widget.DateDividedAdapter.ItemViewType;
import org.chromium.components.browser_ui.widget.selectable_list.SelectionDelegate.SelectionObserver;
import org.chromium.content_public.browser.test.util.TestThreadUtils;
......
......@@ -12,6 +12,7 @@ android_library("java") {
"java/src/org/chromium/components/browser_ui/widget/CompositeTouchDelegate.java",
"java/src/org/chromium/components/browser_ui/widget/ContextMenuDialog.java",
"java/src/org/chromium/components/browser_ui/widget/CoordinatorLayoutForPointer.java",
"java/src/org/chromium/components/browser_ui/widget/DateDividedAdapter.java",
"java/src/org/chromium/components/browser_ui/widget/DualControlLayout.java",
"java/src/org/chromium/components/browser_ui/widget/FadingEdgeScrollView.java",
"java/src/org/chromium/components/browser_ui/widget/FadingShadow.java",
......@@ -100,6 +101,7 @@ android_library("java") {
deps = [
":java_resources",
"//base:base_java",
"//components/browser_ui/util/android:java",
"//components/embedder_support/android:util_java",
"//third_party/android_deps:android_support_v4_java",
"//third_party/android_deps:android_support_v7_appcompat_java",
......@@ -167,6 +169,7 @@ android_resources("java_resources") {
"java/res/drawable/search_toolbar_modern_bg.xml",
"java/res/layout/app_menu_divider.xml",
"java/res/layout/app_menu_layout.xml",
"java/res/layout/date_divided_adapter_header_view_holder.xml",
"java/res/layout/dialog_control_description.xml",
"java/res/layout/divider_preference.xml",
"java/res/layout/expand_arrow_with_separator.xml",
......
......@@ -2,7 +2,7 @@
// 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.widget;
package org.chromium.components.browser_ui.widget;
import android.util.Pair;
import android.view.LayoutInflater;
......@@ -19,7 +19,6 @@ import androidx.recyclerview.widget.RecyclerView.ViewHolder;
import org.chromium.base.Log;
import org.chromium.base.task.AsyncTask;
import org.chromium.base.task.BackgroundOnlyAsyncTask;
import org.chromium.chrome.R;
import org.chromium.components.browser_ui.util.date.StringUtils;
import java.lang.annotation.Retention;
......@@ -456,8 +455,8 @@ public abstract class DateDividedAdapter extends Adapter<RecyclerView.ViewHolder
* @see #onCreateViewHolder(ViewGroup, int)
*/
protected DateViewHolder createDateViewHolder(ViewGroup parent) {
return new DateViewHolder(LayoutInflater.from(parent.getContext()).inflate(
getTimedItemViewResId(), parent, false));
return new DateViewHolder(LayoutInflater.from(parent.getContext())
.inflate(getTimedItemViewResId(), parent, false));
}
/**
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment