From 506c0cfab42ff7e212a7cae530324d23cc88ae20 Mon Sep 17 00:00:00 2001 From: Edgar Wang Date: Sat, 13 Feb 2021 12:28:26 +0800 Subject: [PATCH] Create SettingsLibTwoTargetPreference Bug: 180156703 Test: robotest Change-Id: I4a9958efa47ac24f88e06c8fdb1c9d0a5542e360 --- packages/SettingsLib/Android.bp | 10 +++++--- .../TwoTargetPreference/Android.bp | 13 +++++++++++ .../TwoTargetPreference/AndroidManifest.xml | 23 +++++++++++++++++++ .../res/layout/preference_two_target.xml | 2 +- .../layout/preference_two_target_divider.xml | 2 +- .../TwoTargetPreference/res/values/dimens.xml | 21 +++++++++++++++++ .../widget}/TwoTargetPreference.java | 9 +++++--- packages/SettingsLib/res/values/dimens.xml | 3 --- .../settingslib/RestrictedPreference.java | 2 ++ .../{ => widget}/TwoTargetPreferenceTest.java | 12 ++++++---- 10 files changed, 81 insertions(+), 16 deletions(-) create mode 100644 packages/SettingsLib/TwoTargetPreference/Android.bp create mode 100644 packages/SettingsLib/TwoTargetPreference/AndroidManifest.xml rename packages/SettingsLib/{ => TwoTargetPreference}/res/layout/preference_two_target.xml (98%) rename packages/SettingsLib/{ => TwoTargetPreference}/res/layout/preference_two_target_divider.xml (94%) create mode 100644 packages/SettingsLib/TwoTargetPreference/res/values/dimens.xml rename packages/SettingsLib/{src/com/android/settingslib => TwoTargetPreference/src/com/android/settingslib/widget}/TwoTargetPreference.java (94%) rename packages/SettingsLib/tests/robotests/src/com/android/settingslib/{ => widget}/TwoTargetPreferenceTest.java (92%) diff --git a/packages/SettingsLib/Android.bp b/packages/SettingsLib/Android.bp index f2a0e1cb83bd8..68ce7d9632426 100644 --- a/packages/SettingsLib/Android.bp +++ b/packages/SettingsLib/Android.bp @@ -17,8 +17,8 @@ android_library { // TODO(b/149540986): revert this change. static_libs: [ - // All other dependent components should be put in - // "SettingsLibDependenciesWithoutWifiTracker". + // All other dependent components should be put in + // "SettingsLibDependenciesWithoutWifiTracker". "WifiTrackerLib", ], @@ -27,7 +27,10 @@ android_library { resource_dirs: ["res"], - srcs: ["src/**/*.java", "src/**/*.kt"], + srcs: [ + "src/**/*.java", + "src/**/*.kt", + ], min_sdk_version: "21", @@ -67,6 +70,7 @@ java_defaults { "SettingsLibFooterPreference", "SettingsLibUsageProgressBarPreference", "SettingsLibCollapsingToolbarBaseActivity", + "SettingsLibTwoTargetPreference", ], } diff --git a/packages/SettingsLib/TwoTargetPreference/Android.bp b/packages/SettingsLib/TwoTargetPreference/Android.bp new file mode 100644 index 0000000000000..f2e79b9ab53b9 --- /dev/null +++ b/packages/SettingsLib/TwoTargetPreference/Android.bp @@ -0,0 +1,13 @@ +android_library { + name: "SettingsLibTwoTargetPreference", + + srcs: ["src/**/*.java"], + resource_dirs: ["res"], + + static_libs: [ + "androidx.annotation_annotation", + "androidx.preference_preference", + ], + sdk_version: "system_current", + min_sdk_version: "21", +} diff --git a/packages/SettingsLib/TwoTargetPreference/AndroidManifest.xml b/packages/SettingsLib/TwoTargetPreference/AndroidManifest.xml new file mode 100644 index 0000000000000..120b0859a70aa --- /dev/null +++ b/packages/SettingsLib/TwoTargetPreference/AndroidManifest.xml @@ -0,0 +1,23 @@ + + + + + + + + diff --git a/packages/SettingsLib/res/layout/preference_two_target.xml b/packages/SettingsLib/TwoTargetPreference/res/layout/preference_two_target.xml similarity index 98% rename from packages/SettingsLib/res/layout/preference_two_target.xml rename to packages/SettingsLib/TwoTargetPreference/res/layout/preference_two_target.xml index ff6a22d5523c4..21fcedcc01b6d 100644 --- a/packages/SettingsLib/res/layout/preference_two_target.xml +++ b/packages/SettingsLib/TwoTargetPreference/res/layout/preference_two_target.xml @@ -1,6 +1,6 @@ + + + 24dp + 32dp + diff --git a/packages/SettingsLib/src/com/android/settingslib/TwoTargetPreference.java b/packages/SettingsLib/TwoTargetPreference/src/com/android/settingslib/widget/TwoTargetPreference.java similarity index 94% rename from packages/SettingsLib/src/com/android/settingslib/TwoTargetPreference.java rename to packages/SettingsLib/TwoTargetPreference/src/com/android/settingslib/widget/TwoTargetPreference.java index 02895a4793520..9130662021d54 100644 --- a/packages/SettingsLib/src/com/android/settingslib/TwoTargetPreference.java +++ b/packages/SettingsLib/TwoTargetPreference/src/com/android/settingslib/widget/TwoTargetPreference.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2017 The Android Open Source Project + * Copyright (C) 2021 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. @@ -14,21 +14,24 @@ * limitations under the License. */ -package com.android.settingslib; +package com.android.settingslib.widget; -import android.annotation.IntDef; import android.content.Context; import android.util.AttributeSet; import android.view.View; import android.widget.ImageView; import android.widget.LinearLayout; +import androidx.annotation.IntDef; import androidx.preference.Preference; import androidx.preference.PreferenceViewHolder; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; +/** + * The Base preference with two target areas divided by a vertical divider + */ public class TwoTargetPreference extends Preference { @IntDef({ICON_SIZE_DEFAULT, ICON_SIZE_MEDIUM, ICON_SIZE_SMALL}) diff --git a/packages/SettingsLib/res/values/dimens.xml b/packages/SettingsLib/res/values/dimens.xml index ef4b97f7743fa..9d5b231661906 100644 --- a/packages/SettingsLib/res/values/dimens.xml +++ b/packages/SettingsLib/res/values/dimens.xml @@ -32,9 +32,6 @@ 20dp 56dp - 24dp - 32dp - 4dp diff --git a/packages/SettingsLib/src/com/android/settingslib/RestrictedPreference.java b/packages/SettingsLib/src/com/android/settingslib/RestrictedPreference.java index ad7e995412aa3..fc8b5879c5fa1 100644 --- a/packages/SettingsLib/src/com/android/settingslib/RestrictedPreference.java +++ b/packages/SettingsLib/src/com/android/settingslib/RestrictedPreference.java @@ -27,6 +27,8 @@ import androidx.core.content.res.TypedArrayUtils; import androidx.preference.PreferenceManager; import androidx.preference.PreferenceViewHolder; +import com.android.settingslib.widget.TwoTargetPreference; + /** * Preference class that supports being disabled by a user restriction * set by a device admin. diff --git a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/TwoTargetPreferenceTest.java b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/widget/TwoTargetPreferenceTest.java similarity index 92% rename from packages/SettingsLib/tests/robotests/src/com/android/settingslib/TwoTargetPreferenceTest.java rename to packages/SettingsLib/tests/robotests/src/com/android/settingslib/widget/TwoTargetPreferenceTest.java index 3f0ba13ce50a7..aaec909aa335c 100644 --- a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/TwoTargetPreferenceTest.java +++ b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/widget/TwoTargetPreferenceTest.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2017 The Android Open Source Project + * Copyright (C) 2021 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. @@ -14,11 +14,11 @@ * limitations under the License. */ -package com.android.settingslib; +package com.android.settingslib.widget; -import static com.android.settingslib.TwoTargetPreference.ICON_SIZE_DEFAULT; -import static com.android.settingslib.TwoTargetPreference.ICON_SIZE_MEDIUM; -import static com.android.settingslib.TwoTargetPreference.ICON_SIZE_SMALL; +import static com.android.settingslib.widget.TwoTargetPreference.ICON_SIZE_DEFAULT; +import static com.android.settingslib.widget.TwoTargetPreference.ICON_SIZE_MEDIUM; +import static com.android.settingslib.widget.TwoTargetPreference.ICON_SIZE_SMALL; import static com.google.common.truth.Truth.assertThat; @@ -32,6 +32,8 @@ import android.widget.LinearLayout; import androidx.preference.PreferenceViewHolder; +import com.android.settingslib.R; + import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith;