diff options
11 files changed, 10 insertions, 15 deletions
diff --git a/packages/SettingsLib/ActionBarShadow/AndroidManifest.xml b/packages/SettingsLib/ActionBarShadow/AndroidManifest.xml index 4b9f1ab8d6cc..98c4cb4b2766 100644 --- a/packages/SettingsLib/ActionBarShadow/AndroidManifest.xml +++ b/packages/SettingsLib/ActionBarShadow/AndroidManifest.xml @@ -18,6 +18,4 @@ <manifest xmlns:android="http://schemas.android.com/apk/res/android" package="com.android.settingslib.widget"> - <uses-sdk android:minSdkVersion="21" /> - </manifest> diff --git a/packages/SettingsLib/AndroidManifest.xml b/packages/SettingsLib/AndroidManifest.xml index 3873593236b1..a3473459948d 100644 --- a/packages/SettingsLib/AndroidManifest.xml +++ b/packages/SettingsLib/AndroidManifest.xml @@ -18,7 +18,4 @@ <manifest xmlns:android="http://schemas.android.com/apk/res/android" package="com.android.settingslib"> - <uses-sdk - android:minSdkVersion="21" /> - </manifest> diff --git a/packages/SettingsLib/AppPreference/AndroidManifest.xml b/packages/SettingsLib/AppPreference/AndroidManifest.xml index 7e71308444cd..4b9f1ab8d6cc 100644 --- a/packages/SettingsLib/AppPreference/AndroidManifest.xml +++ b/packages/SettingsLib/AppPreference/AndroidManifest.xml @@ -16,7 +16,7 @@ --> <manifest xmlns:android="http://schemas.android.com/apk/res/android" - package="com.android.settingslib.widget.apppreference"> + package="com.android.settingslib.widget"> <uses-sdk android:minSdkVersion="21" /> diff --git a/packages/SettingsLib/AppPreference/src/com/android/settingslib/widget/apppreference/AppPreference.java b/packages/SettingsLib/AppPreference/src/com/android/settingslib/widget/apppreference/AppPreference.java index 593b6f5b35f4..ab51a346dc6f 100644 --- a/packages/SettingsLib/AppPreference/src/com/android/settingslib/widget/apppreference/AppPreference.java +++ b/packages/SettingsLib/AppPreference/src/com/android/settingslib/widget/apppreference/AppPreference.java @@ -25,6 +25,8 @@ import android.widget.ProgressBar; import androidx.preference.Preference; import androidx.preference.PreferenceViewHolder; +import com.android.settingslib.widget.R; + public class AppPreference extends Preference { private int mProgress; diff --git a/packages/SettingsLib/HelpUtils/AndroidManifest.xml b/packages/SettingsLib/HelpUtils/AndroidManifest.xml index 35b3933e379c..5240ce44c9d9 100644 --- a/packages/SettingsLib/HelpUtils/AndroidManifest.xml +++ b/packages/SettingsLib/HelpUtils/AndroidManifest.xml @@ -18,6 +18,4 @@ <manifest xmlns:android="http://schemas.android.com/apk/res/android" package="com.android.settingslib.helputils"> - <uses-sdk android:minSdkVersion="21" /> - </manifest> diff --git a/packages/SettingsLib/RestrictedLockUtils/AndroidManifest.xml b/packages/SettingsLib/RestrictedLockUtils/AndroidManifest.xml index d7b323a533fa..d19a02238628 100644 --- a/packages/SettingsLib/RestrictedLockUtils/AndroidManifest.xml +++ b/packages/SettingsLib/RestrictedLockUtils/AndroidManifest.xml @@ -18,6 +18,4 @@ <manifest xmlns:android="http://schemas.android.com/apk/res/android" package="com.android.settingslib.restrictedlockutils"> - <uses-sdk android:minSdkVersion="21" /> - </manifest>
\ No newline at end of file diff --git a/packages/SettingsLib/SearchWidget/AndroidManifest.xml b/packages/SettingsLib/SearchWidget/AndroidManifest.xml index b86544ec68c1..5798801fe5fa 100644 --- a/packages/SettingsLib/SearchWidget/AndroidManifest.xml +++ b/packages/SettingsLib/SearchWidget/AndroidManifest.xml @@ -18,6 +18,4 @@ <manifest xmlns:android="http://schemas.android.com/apk/res/android" package="com.android.settingslib.search"> - <uses-sdk android:minSdkVersion="21" /> - </manifest> diff --git a/packages/SettingsLib/SettingsSpinner/AndroidManifest.xml b/packages/SettingsLib/SettingsSpinner/AndroidManifest.xml index 5db93357baa9..4b9f1ab8d6cc 100644 --- a/packages/SettingsLib/SettingsSpinner/AndroidManifest.xml +++ b/packages/SettingsLib/SettingsSpinner/AndroidManifest.xml @@ -16,7 +16,7 @@ --> <manifest xmlns:android="http://schemas.android.com/apk/res/android" - package="com.android.settingslib.widget.settingsspinner"> + package="com.android.settingslib.widget"> <uses-sdk android:minSdkVersion="21" /> diff --git a/packages/SettingsLib/SettingsSpinner/src/com/android/settingslib/widget/settingsspinner/SettingsSpinner.java b/packages/SettingsLib/SettingsSpinner/src/com/android/settingslib/widget/settingsspinner/SettingsSpinner.java index 130cef2089d4..5ef8f7ac792b 100644 --- a/packages/SettingsLib/SettingsSpinner/src/com/android/settingslib/widget/settingsspinner/SettingsSpinner.java +++ b/packages/SettingsLib/SettingsSpinner/src/com/android/settingslib/widget/settingsspinner/SettingsSpinner.java @@ -20,6 +20,8 @@ import android.content.Context; import android.util.AttributeSet; import android.widget.Spinner; +import com.android.settingslib.widget.R; + /** * A {@link Spinner} with settings style. * diff --git a/packages/SettingsLib/SettingsSpinner/src/com/android/settingslib/widget/settingsspinner/SettingsSpinnerAdapter.java b/packages/SettingsLib/SettingsSpinner/src/com/android/settingslib/widget/settingsspinner/SettingsSpinnerAdapter.java index 8bf8fce4e36d..f9aedd9c07a4 100644 --- a/packages/SettingsLib/SettingsSpinner/src/com/android/settingslib/widget/settingsspinner/SettingsSpinnerAdapter.java +++ b/packages/SettingsLib/SettingsSpinner/src/com/android/settingslib/widget/settingsspinner/SettingsSpinnerAdapter.java @@ -17,10 +17,10 @@ package com.android.settingslib.widget.settingsspinner; import android.content.Context; -import android.view.View; -import android.view.ViewGroup; import android.widget.ArrayAdapter; +import com.android.settingslib.widget.R; + /** * An ArrayAdapter which was used by {@link SettingsSpinner} with settings style. */ diff --git a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/widget/apppreference/AppPreferenceTest.java b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/widget/apppreference/AppPreferenceTest.java index da97cc8b74dd..042616aa2015 100644 --- a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/widget/apppreference/AppPreferenceTest.java +++ b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/widget/apppreference/AppPreferenceTest.java @@ -23,6 +23,8 @@ import android.view.View; import androidx.preference.PreferenceViewHolder; +import com.android.settingslib.widget.R; + import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; |