Move GearPreference to widget package.
- This is step1 of making gear preference more flexible to use. Bug: 33579296 Test: builds Change-Id: I30ac6c75f7ad16ec5c732fbb93170e5fab0eacb7
This commit is contained in:
@@ -22,7 +22,7 @@
|
|||||||
android:key="security_category"
|
android:key="security_category"
|
||||||
android:title="@string/lock_settings_title">
|
android:title="@string/lock_settings_title">
|
||||||
|
|
||||||
<com.android.settings.GearPreference
|
<com.android.settings.widget.GearPreference
|
||||||
android:key="unlock_set_or_change"
|
android:key="unlock_set_or_change"
|
||||||
android:title="@string/unlock_set_unlock_launch_picker_title"
|
android:title="@string/unlock_set_unlock_launch_picker_title"
|
||||||
android:summary="@string/unlock_set_unlock_mode_none"
|
android:summary="@string/unlock_set_unlock_mode_none"
|
||||||
|
@@ -22,7 +22,7 @@
|
|||||||
android:key="security_category"
|
android:key="security_category"
|
||||||
android:title="@string/lock_settings_title">
|
android:title="@string/lock_settings_title">
|
||||||
|
|
||||||
<com.android.settings.GearPreference
|
<com.android.settings.widget.GearPreference
|
||||||
android:key="unlock_set_or_change"
|
android:key="unlock_set_or_change"
|
||||||
android:title="@string/unlock_set_unlock_launch_picker_title"
|
android:title="@string/unlock_set_unlock_launch_picker_title"
|
||||||
android:summary="@string/unlock_set_unlock_mode_password"
|
android:summary="@string/unlock_set_unlock_mode_password"
|
||||||
|
@@ -22,7 +22,7 @@
|
|||||||
android:key="security_category"
|
android:key="security_category"
|
||||||
android:title="@string/lock_settings_title">
|
android:title="@string/lock_settings_title">
|
||||||
|
|
||||||
<com.android.settings.GearPreference
|
<com.android.settings.widget.GearPreference
|
||||||
android:key="unlock_set_or_change"
|
android:key="unlock_set_or_change"
|
||||||
android:title="@string/unlock_set_unlock_launch_picker_title"
|
android:title="@string/unlock_set_unlock_launch_picker_title"
|
||||||
android:summary="@string/unlock_set_unlock_mode_pattern"
|
android:summary="@string/unlock_set_unlock_mode_pattern"
|
||||||
|
@@ -22,7 +22,7 @@
|
|||||||
android:key="security_category"
|
android:key="security_category"
|
||||||
android:title="@string/lock_settings_title">
|
android:title="@string/lock_settings_title">
|
||||||
|
|
||||||
<com.android.settings.GearPreference
|
<com.android.settings.widget.GearPreference
|
||||||
android:key="unlock_set_or_change"
|
android:key="unlock_set_or_change"
|
||||||
android:title="@string/unlock_set_unlock_launch_picker_title"
|
android:title="@string/unlock_set_unlock_launch_picker_title"
|
||||||
android:summary="@string/unlock_set_unlock_mode_pin"
|
android:summary="@string/unlock_set_unlock_mode_pin"
|
||||||
|
@@ -68,9 +68,9 @@ import com.android.settings.search.Indexable;
|
|||||||
import com.android.settings.search.SearchIndexableRaw;
|
import com.android.settings.search.SearchIndexableRaw;
|
||||||
import com.android.settings.security.SecurityFeatureProvider;
|
import com.android.settings.security.SecurityFeatureProvider;
|
||||||
import com.android.settings.trustagent.TrustAgentManager;
|
import com.android.settings.trustagent.TrustAgentManager;
|
||||||
|
import com.android.settings.widget.GearPreference;
|
||||||
import com.android.settingslib.RestrictedLockUtils;
|
import com.android.settingslib.RestrictedLockUtils;
|
||||||
import com.android.settingslib.RestrictedPreference;
|
import com.android.settingslib.RestrictedPreference;
|
||||||
import com.android.settingslib.RestrictedSwitchPreference;
|
|
||||||
import com.android.settingslib.drawer.CategoryKey;
|
import com.android.settingslib.drawer.CategoryKey;
|
||||||
import com.android.settingslib.drawer.DashboardCategory;
|
import com.android.settingslib.drawer.DashboardCategory;
|
||||||
import com.android.settingslib.drawer.Tile;
|
import com.android.settingslib.drawer.Tile;
|
||||||
|
@@ -23,7 +23,7 @@ import android.os.UserManager;
|
|||||||
import android.text.TextUtils;
|
import android.text.TextUtils;
|
||||||
import android.util.AttributeSet;
|
import android.util.AttributeSet;
|
||||||
|
|
||||||
import com.android.settings.GearPreference;
|
import com.android.settings.widget.GearPreference;
|
||||||
import com.android.settings.R;
|
import com.android.settings.R;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@@ -23,8 +23,8 @@ import android.content.Context;
|
|||||||
import android.content.Intent;
|
import android.content.Intent;
|
||||||
import android.content.pm.PackageInfo;
|
import android.content.pm.PackageInfo;
|
||||||
import android.content.pm.PackageManager;
|
import android.content.pm.PackageManager;
|
||||||
import android.net.ConnectivityManager.NetworkCallback;
|
|
||||||
import android.net.ConnectivityManager;
|
import android.net.ConnectivityManager;
|
||||||
|
import android.net.ConnectivityManager.NetworkCallback;
|
||||||
import android.net.IConnectivityManager;
|
import android.net.IConnectivityManager;
|
||||||
import android.net.Network;
|
import android.net.Network;
|
||||||
import android.net.NetworkCapabilities;
|
import android.net.NetworkCapabilities;
|
||||||
@@ -41,7 +41,6 @@ import android.security.Credentials;
|
|||||||
import android.security.KeyStore;
|
import android.security.KeyStore;
|
||||||
import android.support.v7.preference.Preference;
|
import android.support.v7.preference.Preference;
|
||||||
import android.support.v7.preference.PreferenceGroup;
|
import android.support.v7.preference.PreferenceGroup;
|
||||||
import android.support.v7.preference.PreferenceScreen;
|
|
||||||
import android.util.ArrayMap;
|
import android.util.ArrayMap;
|
||||||
import android.util.ArraySet;
|
import android.util.ArraySet;
|
||||||
import android.util.Log;
|
import android.util.Log;
|
||||||
@@ -56,11 +55,12 @@ import com.android.internal.net.LegacyVpnInfo;
|
|||||||
import com.android.internal.net.VpnConfig;
|
import com.android.internal.net.VpnConfig;
|
||||||
import com.android.internal.net.VpnProfile;
|
import com.android.internal.net.VpnProfile;
|
||||||
import com.android.internal.util.ArrayUtils;
|
import com.android.internal.util.ArrayUtils;
|
||||||
import com.android.settings.GearPreference;
|
|
||||||
import com.android.settings.GearPreference.OnGearClickListener;
|
|
||||||
import com.android.settings.R;
|
import com.android.settings.R;
|
||||||
import com.android.settings.RestrictedSettingsFragment;
|
import com.android.settings.RestrictedSettingsFragment;
|
||||||
|
import com.android.settings.widget.GearPreference;
|
||||||
|
import com.android.settings.widget.GearPreference.OnGearClickListener;
|
||||||
import com.android.settingslib.RestrictedLockUtils;
|
import com.android.settingslib.RestrictedLockUtils;
|
||||||
|
|
||||||
import com.google.android.collect.Lists;
|
import com.google.android.collect.Lists;
|
||||||
|
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
|
@@ -1,5 +1,5 @@
|
|||||||
/*
|
/*
|
||||||
* Copyright (C) 2016 The Android Open Source Project
|
* Copyright (C) 2017 The Android Open Source Project
|
||||||
*
|
*
|
||||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
* you may not use this file except in compliance with the License.
|
* you may not use this file except in compliance with the License.
|
||||||
@@ -11,16 +11,17 @@
|
|||||||
* distributed under the License is distributed on an "AS IS" BASIS,
|
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||||
* See the License for the specific language governing permissions and
|
* See the License for the specific language governing permissions and
|
||||||
* limitations under the License
|
* limitations under the License.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
package com.android.settings;
|
package com.android.settings.widget;
|
||||||
|
|
||||||
import android.content.Context;
|
import android.content.Context;
|
||||||
import android.support.v7.preference.PreferenceViewHolder;
|
import android.support.v7.preference.PreferenceViewHolder;
|
||||||
import android.util.AttributeSet;
|
import android.util.AttributeSet;
|
||||||
import android.view.View;
|
import android.view.View;
|
||||||
|
|
||||||
|
import com.android.settings.R;
|
||||||
import com.android.settingslib.RestrictedPreference;
|
import com.android.settingslib.RestrictedPreference;
|
||||||
|
|
||||||
/**
|
/**
|
Reference in New Issue
Block a user