Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 62e66c9c authored by Fan Zhang's avatar Fan Zhang
Browse files

Move GearPreference to widget package. 

- This is step1 of making gear preference more flexible to use.

Bug: 33579296
Test: builds
Change-Id: I30ac6c75f7ad16ec5c732fbb93170e5fab0eacb7
parent 4be105e9

res/xml/security_settings_chooser.xml

+1 −1
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ 
        android:key="security_category"

        android:title="@string/lock_settings_title">



        <com.android.settings.GearPreference

        <com.android.settings.widget.GearPreference

            android:key="unlock_set_or_change"

            android:title="@string/unlock_set_unlock_launch_picker_title"

            android:summary="@string/unlock_set_unlock_mode_none"

res/xml/security_settings_password.xml

+1 −1
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ 
        android:key="security_category"

        android:title="@string/lock_settings_title">



        <com.android.settings.GearPreference

        <com.android.settings.widget.GearPreference

            android:key="unlock_set_or_change"

            android:title="@string/unlock_set_unlock_launch_picker_title"

            android:summary="@string/unlock_set_unlock_mode_password"

res/xml/security_settings_pattern.xml

+1 −1
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ 
        android:key="security_category"

        android:title="@string/lock_settings_title">



        <com.android.settings.GearPreference

        <com.android.settings.widget.GearPreference

            android:key="unlock_set_or_change"

            android:title="@string/unlock_set_unlock_launch_picker_title"

            android:summary="@string/unlock_set_unlock_mode_pattern"

res/xml/security_settings_pin.xml

+1 −1
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ 
        android:key="security_category"

        android:title="@string/lock_settings_title">



        <com.android.settings.GearPreference

        <com.android.settings.widget.GearPreference

            android:key="unlock_set_or_change"

            android:title="@string/unlock_set_unlock_launch_picker_title"

            android:summary="@string/unlock_set_unlock_mode_pin"

src/com/android/settings/SecuritySettings.java

+1 −1
Original line number Diff line number Diff line
@@ -68,9 +68,9 @@ import com.android.settings.search.Indexable; 
import com.android.settings.search.SearchIndexableRaw;

import com.android.settings.security.SecurityFeatureProvider;

import com.android.settings.trustagent.TrustAgentManager;

import com.android.settings.widget.GearPreference;

import com.android.settingslib.RestrictedLockUtils;

import com.android.settingslib.RestrictedPreference;

import com.android.settingslib.RestrictedSwitchPreference;

import com.android.settingslib.drawer.CategoryKey;

import com.android.settingslib.drawer.DashboardCategory;

import com.android.settingslib.drawer.Tile;