diff --git a/res/layout/preference_app.xml b/res/layout/preference_app.xml deleted file mode 100644 index f0adebffefa..00000000000 --- a/res/layout/preference_app.xml +++ /dev/null @@ -1,100 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - diff --git a/res/values/dimens.xml b/res/values/dimens.xml index e28bc98bc21..4d168518897 100755 --- a/res/values/dimens.xml +++ b/res/values/dimens.xml @@ -22,7 +22,6 @@ 16dip 40dip - 32dp 48dp 64dip 72dip diff --git a/res/xml/app_default_settings.xml b/res/xml/app_default_settings.xml index 54676679875..a993aa1803b 100644 --- a/res/xml/app_default_settings.xml +++ b/res/xml/app_default_settings.xml @@ -21,59 +21,59 @@ android:key="app_default_settings_screen" android:title="@string/app_default_dashboard_title"> - - - + - - - - - - - - + - - + diff --git a/src/com/android/settings/accounts/AccountTypePreference.java b/src/com/android/settings/accounts/AccountTypePreference.java index 54866eeaab2..c82a5990d53 100644 --- a/src/com/android/settings/accounts/AccountTypePreference.java +++ b/src/com/android/settings/accounts/AccountTypePreference.java @@ -30,7 +30,7 @@ import androidx.preference.Preference.OnPreferenceClickListener; import com.android.settings.Utils; import com.android.settings.core.SubSettingLauncher; -import com.android.settings.widget.AppPreference; +import com.android.settingslib.widget.apppreference.AppPreference; public class AccountTypePreference extends AppPreference implements OnPreferenceClickListener { /** diff --git a/src/com/android/settings/applications/ProcessStatsPreference.java b/src/com/android/settings/applications/ProcessStatsPreference.java index 64521984fc7..4249381732d 100644 --- a/src/com/android/settings/applications/ProcessStatsPreference.java +++ b/src/com/android/settings/applications/ProcessStatsPreference.java @@ -22,7 +22,7 @@ import android.text.TextUtils; import android.text.format.Formatter; import android.util.Log; -import com.android.settings.widget.AppPreference; +import com.android.settingslib.widget.apppreference.AppPreference; public class ProcessStatsPreference extends AppPreference { static final String TAG = "ProcessStatsPreference"; diff --git a/src/com/android/settings/applications/RecentAppsPreferenceController.java b/src/com/android/settings/applications/RecentAppsPreferenceController.java index c866474b5ae..b6e8f4c6071 100644 --- a/src/com/android/settings/applications/RecentAppsPreferenceController.java +++ b/src/com/android/settings/applications/RecentAppsPreferenceController.java @@ -42,11 +42,11 @@ import androidx.preference.PreferenceScreen; import com.android.settings.R; import com.android.settings.applications.appinfo.AppInfoDashboardFragment; import com.android.settings.core.PreferenceControllerMixin; -import com.android.settings.widget.AppPreference; import com.android.settingslib.applications.AppUtils; import com.android.settingslib.applications.ApplicationsState; import com.android.settingslib.core.AbstractPreferenceController; import com.android.settingslib.utils.StringUtil; +import com.android.settingslib.widget.apppreference.AppPreference; import java.util.ArrayList; import java.util.Arrays; diff --git a/src/com/android/settings/applications/managedomainurls/DomainAppPreference.java b/src/com/android/settings/applications/managedomainurls/DomainAppPreference.java index ef9d5d418a7..94d28181ea3 100644 --- a/src/com/android/settings/applications/managedomainurls/DomainAppPreference.java +++ b/src/com/android/settings/applications/managedomainurls/DomainAppPreference.java @@ -27,8 +27,8 @@ import androidx.preference.PreferenceViewHolder; import com.android.settings.R; import com.android.settings.Utils; -import com.android.settings.widget.AppPreference; import com.android.settingslib.applications.ApplicationsState.AppEntry; +import com.android.settingslib.widget.apppreference.AppPreference; public class DomainAppPreference extends AppPreference { diff --git a/src/com/android/settings/applications/specialaccess/pictureinpicture/PictureInPictureSettings.java b/src/com/android/settings/applications/specialaccess/pictureinpicture/PictureInPictureSettings.java index d6734b71f8d..d2cb2a7f1ac 100644 --- a/src/com/android/settings/applications/specialaccess/pictureinpicture/PictureInPictureSettings.java +++ b/src/com/android/settings/applications/specialaccess/pictureinpicture/PictureInPictureSettings.java @@ -42,9 +42,9 @@ import com.android.settings.R; import com.android.settings.applications.AppInfoBase; import com.android.settings.search.BaseSearchIndexProvider; import com.android.settings.search.Indexable; -import com.android.settings.widget.AppPreference; import com.android.settings.widget.EmptyTextSettings; import com.android.settingslib.search.SearchIndexable; +import com.android.settingslib.widget.apppreference.AppPreference; import java.text.Collator; import java.util.ArrayList; diff --git a/src/com/android/settings/datausage/AppDataUsagePreference.java b/src/com/android/settings/datausage/AppDataUsagePreference.java index 0eab5ab936b..f5a204a224f 100644 --- a/src/com/android/settings/datausage/AppDataUsagePreference.java +++ b/src/com/android/settings/datausage/AppDataUsagePreference.java @@ -20,11 +20,11 @@ import android.widget.ProgressBar; import androidx.preference.PreferenceViewHolder; -import com.android.settings.widget.AppPreference; import com.android.settingslib.AppItem; import com.android.settingslib.net.UidDetail; import com.android.settingslib.net.UidDetailProvider; import com.android.settingslib.utils.ThreadUtils; +import com.android.settingslib.widget.apppreference.AppPreference; public class AppDataUsagePreference extends AppPreference { diff --git a/src/com/android/settings/enterprise/ApplicationListPreferenceController.java b/src/com/android/settings/enterprise/ApplicationListPreferenceController.java index 3170dac364d..271981858b2 100644 --- a/src/com/android/settings/enterprise/ApplicationListPreferenceController.java +++ b/src/com/android/settings/enterprise/ApplicationListPreferenceController.java @@ -27,8 +27,8 @@ import com.android.settings.SettingsPreferenceFragment; import com.android.settings.applications.ApplicationFeatureProvider; import com.android.settings.applications.UserAppInfo; import com.android.settings.core.PreferenceControllerMixin; -import com.android.settings.widget.AppPreference; import com.android.settingslib.core.AbstractPreferenceController; +import com.android.settingslib.widget.apppreference.AppPreference; import java.util.List; @@ -80,6 +80,7 @@ public class ApplicationListPreferenceController extends AbstractPreferenceContr /** * Simple interface for building application list within { + * * @link ApplicationListPreferenceController} */ public interface ApplicationListBuilder { diff --git a/src/com/android/settings/fuelgauge/PowerGaugePreference.java b/src/com/android/settings/fuelgauge/PowerGaugePreference.java index 7c217744945..8cac2b24125 100644 --- a/src/com/android/settings/fuelgauge/PowerGaugePreference.java +++ b/src/com/android/settings/fuelgauge/PowerGaugePreference.java @@ -17,7 +17,6 @@ package com.android.settings.fuelgauge; import android.content.Context; -import android.graphics.drawable.ColorDrawable; import android.graphics.drawable.Drawable; import android.util.AttributeSet; import android.widget.TextView; @@ -26,7 +25,7 @@ import androidx.preference.PreferenceViewHolder; import com.android.settings.R; import com.android.settings.Utils; -import com.android.settings.widget.AppPreference; +import com.android.settingslib.widget.apppreference.AppPreference; /** * Custom preference for displaying battery usage info as a bar and an icon on diff --git a/src/com/android/settings/location/AppSettingsInjector.java b/src/com/android/settings/location/AppSettingsInjector.java index b8111f29c4e..812082122ac 100644 --- a/src/com/android/settings/location/AppSettingsInjector.java +++ b/src/com/android/settings/location/AppSettingsInjector.java @@ -21,10 +21,10 @@ import android.text.TextUtils; import androidx.preference.Preference; -import com.android.settings.widget.AppPreference; import com.android.settings.widget.RestrictedAppPreference; import com.android.settingslib.location.InjectedSetting; import com.android.settingslib.location.SettingsInjector; +import com.android.settingslib.widget.apppreference.AppPreference; /** * Adds the preferences specified by the {@link InjectedSetting} objects to a preference group. diff --git a/src/com/android/settings/location/RecentLocationRequestPreferenceController.java b/src/com/android/settings/location/RecentLocationRequestPreferenceController.java index 7660312f0eb..60374eb5dda 100644 --- a/src/com/android/settings/location/RecentLocationRequestPreferenceController.java +++ b/src/com/android/settings/location/RecentLocationRequestPreferenceController.java @@ -26,9 +26,9 @@ import com.android.settings.R; import com.android.settings.applications.appinfo.AppInfoDashboardFragment; import com.android.settings.core.SubSettingLauncher; import com.android.settings.dashboard.DashboardFragment; -import com.android.settings.widget.AppPreference; import com.android.settingslib.core.lifecycle.Lifecycle; import com.android.settingslib.location.RecentLocationApps; +import com.android.settingslib.widget.apppreference.AppPreference; import java.util.List; @@ -43,7 +43,7 @@ public class RecentLocationRequestPreferenceController extends LocationBasePrefe private PreferenceCategory mCategoryRecentLocationRequests; private Preference mSeeAllButton; - /** Used in this class and {@link RecentLocationRequestSeeAllPreferenceController}*/ + /** Used in this class and {@link RecentLocationRequestSeeAllPreferenceController} */ static class PackageEntryClickedListener implements Preference.OnPreferenceClickListener { private final DashboardFragment mFragment; private final String mPackage; @@ -111,7 +111,7 @@ public class RecentLocationRequestPreferenceController extends LocationBasePrefe if (recentLocationRequests.size() > 3) { // Display the top 3 preferences to container in original order. - for (int i = 0; i < 3; i ++) { + for (int i = 0; i < 3; i++) { mCategoryRecentLocationRequests.addPreference( createAppPreference(prefContext, recentLocationRequests.get(i))); } diff --git a/src/com/android/settings/location/RecentLocationRequestSeeAllPreferenceController.java b/src/com/android/settings/location/RecentLocationRequestSeeAllPreferenceController.java index 6a1ebd938f1..3fa0f00e610 100644 --- a/src/com/android/settings/location/RecentLocationRequestSeeAllPreferenceController.java +++ b/src/com/android/settings/location/RecentLocationRequestSeeAllPreferenceController.java @@ -23,9 +23,9 @@ import androidx.preference.Preference; import androidx.preference.PreferenceCategory; import androidx.preference.PreferenceScreen; -import com.android.settings.widget.AppPreference; import com.android.settingslib.core.lifecycle.Lifecycle; import com.android.settingslib.location.RecentLocationApps; +import com.android.settingslib.widget.apppreference.AppPreference; import java.util.List; diff --git a/src/com/android/settings/print/PrintSettingsFragment.java b/src/com/android/settings/print/PrintSettingsFragment.java index 2f1f63dcb5b..63ffe87f15a 100644 --- a/src/com/android/settings/print/PrintSettingsFragment.java +++ b/src/com/android/settings/print/PrintSettingsFragment.java @@ -55,8 +55,8 @@ import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; import com.android.settings.search.BaseSearchIndexProvider; import com.android.settings.search.Indexable; -import com.android.settings.widget.AppPreference; import com.android.settingslib.search.SearchIndexable; +import com.android.settingslib.widget.apppreference.AppPreference; import java.text.DateFormat; import java.util.ArrayList; @@ -356,7 +356,7 @@ public class PrintSettingsFragment extends ProfileSettingsPreferenceFragment printJob.getCreationTime(), printJob.getCreationTime(), DateFormat.SHORT, DateFormat.SHORT))); - TypedArray a = getActivity().obtainStyledAttributes(new int[] { + TypedArray a = getActivity().obtainStyledAttributes(new int[]{ android.R.attr.colorControlNormal}); int tintColor = a.getColor(0, 0); a.recycle(); diff --git a/src/com/android/settings/widget/AppPreference.java b/src/com/android/settings/widget/AppPreference.java deleted file mode 100644 index 91e700a0980..00000000000 --- a/src/com/android/settings/widget/AppPreference.java +++ /dev/null @@ -1,64 +0,0 @@ -/* - * Copyright (C) 2017 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package com.android.settings.widget; - -import android.content.Context; -import android.text.TextUtils; -import android.util.AttributeSet; -import android.view.View; -import android.widget.ProgressBar; - -import androidx.preference.Preference; -import androidx.preference.PreferenceViewHolder; - -import com.android.settings.R; - -public class AppPreference extends Preference { - - private int mProgress; - private boolean mProgressVisible; - - public AppPreference(Context context) { - super(context); - setLayoutResource(R.layout.preference_app); - } - - public AppPreference(Context context, AttributeSet attrs) { - super(context, attrs); - setLayoutResource(R.layout.preference_app); - } - - public void setProgress(int amount) { - mProgress = amount; - mProgressVisible = true; - notifyChanged(); - } - - @Override - public void onBindViewHolder(PreferenceViewHolder view) { - super.onBindViewHolder(view); - - view.findViewById(R.id.summary_container) - .setVisibility(TextUtils.isEmpty(getSummary()) ? View.GONE : View.VISIBLE); - final ProgressBar progress = (ProgressBar) view.findViewById(android.R.id.progress); - if (mProgressVisible) { - progress.setProgress(mProgress); - progress.setVisibility(View.VISIBLE); - } else { - progress.setVisibility(View.GONE); - } - } -} diff --git a/src/com/android/settings/widget/RestrictedAppPreference.java b/src/com/android/settings/widget/RestrictedAppPreference.java index e33c34287da..8a2cc91e7d1 100644 --- a/src/com/android/settings/widget/RestrictedAppPreference.java +++ b/src/com/android/settings/widget/RestrictedAppPreference.java @@ -28,6 +28,7 @@ import androidx.preference.PreferenceViewHolder; import com.android.settings.R; import com.android.settingslib.RestrictedLockUtils; import com.android.settingslib.RestrictedPreferenceHelper; +import com.android.settingslib.widget.apppreference.AppPreference; /** * {@link AppPreference} that implements user restriction utilities using diff --git a/tests/robotests/src/com/android/settings/location/RecentLocationRequestPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/location/RecentLocationRequestPreferenceControllerTest.java index 3d3dd28aa61..10e5681382d 100644 --- a/tests/robotests/src/com/android/settings/location/RecentLocationRequestPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/location/RecentLocationRequestPreferenceControllerTest.java @@ -42,10 +42,10 @@ import androidx.preference.PreferenceScreen; import com.android.settings.R; import com.android.settings.applications.appinfo.AppInfoDashboardFragment; import com.android.settings.testutils.SettingsRobolectricTestRunner; -import com.android.settings.widget.AppPreference; import com.android.settingslib.core.lifecycle.Lifecycle; import com.android.settingslib.location.RecentLocationApps; import com.android.settingslib.location.RecentLocationApps.Request; +import com.android.settingslib.widget.apppreference.AppPreference; import org.junit.Before; import org.junit.Test; @@ -173,7 +173,7 @@ public class RecentLocationRequestPreferenceControllerTest { @Test public void onPreferenceClick_shouldLaunchAppDetails() { - final Context context= mock(Context.class); + final Context context = mock(Context.class); when(mFragment.getContext()).thenReturn(context); final List requests = new ArrayList<>(); @@ -210,7 +210,7 @@ public class RecentLocationRequestPreferenceControllerTest { AppPreference appPreference = mock(AppPreference.class, "AppPreference" + i); doReturn(title).when(appPreference).getTitle(); doReturn(appPreference) - .when(mController).createAppPreference(any(Context.class), eq(req)); + .when(mController).createAppPreference(any(Context.class), eq(req)); } return requests; } diff --git a/tests/robotests/src/com/android/settings/location/RecentLocationRequestSeeAllPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/location/RecentLocationRequestSeeAllPreferenceControllerTest.java index a012c51c591..be56f96f83e 100644 --- a/tests/robotests/src/com/android/settings/location/RecentLocationRequestSeeAllPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/location/RecentLocationRequestSeeAllPreferenceControllerTest.java @@ -32,10 +32,10 @@ import androidx.preference.PreferenceCategory; import androidx.preference.PreferenceScreen; import com.android.settings.testutils.SettingsRobolectricTestRunner; -import com.android.settings.widget.AppPreference; import com.android.settingslib.core.lifecycle.Lifecycle; import com.android.settingslib.location.RecentLocationApps; import com.android.settingslib.location.RecentLocationApps.Request; +import com.android.settingslib.widget.apppreference.AppPreference; import org.junit.Before; import org.junit.Test; diff --git a/tests/robotests/src/com/android/settings/testutils/SettingsRobolectricTestRunner.java b/tests/robotests/src/com/android/settings/testutils/SettingsRobolectricTestRunner.java index 2e3a140dfed..008d7f7fb5d 100644 --- a/tests/robotests/src/com/android/settings/testutils/SettingsRobolectricTestRunner.java +++ b/tests/robotests/src/com/android/settings/testutils/SettingsRobolectricTestRunner.java @@ -75,6 +75,8 @@ public class SettingsRobolectricTestRunner extends RobolectricTestRunner { Fs.fromURL(new URL("file:packages/apps/Settings/res")), null)); paths.add(new ResourcePath(null, Fs.fromURL(new URL("file:frameworks/base/packages/SettingsLib/res")), null)); + paths.add(new ResourcePath(null, + Fs.fromURL(new URL("file:frameworks/base/packages/SettingsLib/AppPreference/res/")), null)); paths.add(new ResourcePath(null, Fs.fromURL(new URL("file:frameworks/base/packages/SettingsLib/HelpUtils/res/")), null)); paths.add(new ResourcePath(null, diff --git a/tests/robotests/src/com/android/settings/widget/AppPreferenceTest.java b/tests/robotests/src/com/android/settings/widget/AppPreferenceTest.java deleted file mode 100644 index c75d8fd463f..00000000000 --- a/tests/robotests/src/com/android/settings/widget/AppPreferenceTest.java +++ /dev/null @@ -1,82 +0,0 @@ -/* - * Copyright (C) 2017 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package com.android.settings.widget; - -import static com.google.common.truth.Truth.assertThat; - -import android.content.Context; -import android.view.View; - -import androidx.preference.PreferenceViewHolder; - -import com.android.settings.R; -import com.android.settings.testutils.SettingsRobolectricTestRunner; - -import org.junit.Before; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.robolectric.RuntimeEnvironment; - -@RunWith(SettingsRobolectricTestRunner.class) -public class AppPreferenceTest { - - private Context mContext; - private View mRootView; - private AppPreference mPref; - private PreferenceViewHolder mHolder; - - @Before - public void setUp() { - mContext = RuntimeEnvironment.application; - mRootView = View.inflate(mContext, R.layout.preference_app, null /* parent */); - mHolder = PreferenceViewHolder.createInstanceForTests(mRootView); - mPref = new AppPreference(mContext); - } - - @Test - public void setProgress_showProgress() { - mPref.setProgress(1); - mPref.onBindViewHolder(mHolder); - - assertThat(mHolder.findViewById(android.R.id.progress).getVisibility()) - .isEqualTo(View.VISIBLE); - } - - @Test - public void setSummary_showSummaryContainer() { - mPref.setSummary("test"); - mPref.onBindViewHolder(mHolder); - - assertThat(mHolder.findViewById(R.id.summary_container).getVisibility()) - .isEqualTo(View.VISIBLE); - } - - @Test - public void noSummary_hideSummaryContainer() { - mPref.setSummary(null); - mPref.onBindViewHolder(mHolder); - - assertThat(mHolder.findViewById(R.id.summary_container).getVisibility()) - .isEqualTo(View.GONE); - } - - @Test - public void foobar_testName() { - float iconSize = mContext.getResources().getDimension(R.dimen.secondary_app_icon_size); - assertThat(Float.floatToIntBits(iconSize)).isEqualTo(Float.floatToIntBits(32)); - } -}