Merge "Merge sub pages for lock/unlock into 1 xml." (b8b9b283) · Commits · e / os / android_packages_apps_Settings

res/layout/preference_category_no_title.xml

+1 −1

Original line number	Diff line number	Diff line
		@@ -18,7 +18,7 @@
		set height to 0. This will be used in preference category without title in order to remove
		extra 32dp blank -->
		<TextView xmlns:android="http://schemas.android.com/apk/res/android"
		android:id="@+android:id/title"
		android:id="@android:id/title"
		android:layout_width="match_parent"
		android:layout_height="0dp"
		android:textAppearance="@android:style/TextAppearance.Material.Body2"

res/xml/security_settings_v2.xml

+74 −22

Original line number	Diff line number	Diff line
		@@ -24,29 +24,71 @@

		<!-- security_settings_status.xml -->
		<PreferenceCategory
		android:order="-10"
		android:key="security_status"
		android:title="@string/security_status_title" />

		<!-- TODO Need security section -->
		<PreferenceCategory
		android:order="1"
		android:key="dashboard_tile_placeholder" />

		<!-- security section -->
		<PreferenceCategory
		android:order="10"
		android:key="security_category"
		android:title="@string/lock_settings_title">

		<!-- security_settings_chooser -->
		<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"
		settings:keywords="@string/keywords_lockscreen" />

		<Preference android:key="lockscreen_preferences"
		<Preference
		android:key="lockscreen_preferences"
		android:title="@string/lockscreen_settings_title"
		android:fragment="com.android.settings.security.LockscreenDashboardFragment" />

		<Preference
		android:key="fingerprint_settings"
		android:title="@string/security_settings_fingerprint_preference_title"
		android:summary="@string/summary_placeholder" />

		</PreferenceCategory>

		<!-- work profile security section -->
		<PreferenceCategory
		android:order="20"
		android:key="security_category_profile"
		android:title="@string/lock_settings_profile_title">

		<!-- security_settings_unification -->
		<com.android.settingslib.RestrictedSwitchPreference
		android:key="unification"
		android:title="@string/lock_settings_profile_unification_title"
		android:summary="@string/lock_settings_profile_unification_summary"
		settings:keywords="@string/keywords_unification" />

		<com.android.settingslib.RestrictedPreference
		android:key="unlock_set_or_change_profile"
		android:title="@string/unlock_set_unlock_launch_picker_title_profile"
		android:summary="@string/unlock_set_unlock_mode_pattern"
		settings:keywords="@string/keywords_lockscreen" />

		<SwitchPreference
		android:key="visiblepattern_profile"
		android:title="@string/lockpattern_settings_enable_visible_pattern_title_profile" />

		<Preference
		android:key="fingerprint_settings_profile"
		android:title="@string/security_settings_fingerprint_preference_title"
		android:summary="@string/summary_placeholder" />

		</PreferenceCategory>

		<!-- security_settings_misc.xml -->
		<PreferenceCategory
		android:order="30"
		android:key="security_settings_misc_category"
		android:title="@string/security_passwords_title">

		@@ -64,6 +106,7 @@
		</PreferenceCategory>

		<PreferenceCategory
		android:order="40"
		android:key="security_settings_device_admin_category">

		<Preference android:key="manage_device_admin"
		@@ -78,33 +121,42 @@

		</PreferenceCategory>

		<Preference android:key="sim_lock_settings"
		<Preference
		android:order="50"
		android:key="sim_lock_settings"
		android:title="@string/sim_lock_settings_category">

		<intent android:action="android.intent.action.MAIN"
		<intent
		android:action="android.intent.action.MAIN"
		android:targetPackage="com.android.settings"
		android:targetClass="com.android.settings.Settings$IccLockSettingsActivity" />

		</Preference>

		<Preference
		android:order="60"
		android:key="encryption_and_credential"
		android:title="@string/encryption_and_credential_settings_title"
		android:summary="@string/encryption_and_credential_settings_summary"
		android:fragment="com.android.settings.security.EncryptionAndCredential" />

		<Preference android:key="manage_trust_agents"
		<Preference
		android:order="70"
		android:key="manage_trust_agents"
		android:title="@string/manage_trust_agents"
		android:persistent="false"
		android:fragment="com.android.settings.security.trustagent.TrustAgentSettings" />

		<Preference
		android:order="80"
		android:key="screen_pinning_settings"
		android:title="@string/screen_pinning_title"
		android:summary="@string/summary_placeholder"
		android:fragment="com.android.settings.security.ScreenPinningSettings" />

		<Preference android:key="security_misc_usage_access"
		<Preference
		android:order="90"
		android:key="security_misc_usage_access"
		android:title="@string/usage_access_title"
		android:fragment="com.android.settings.applications.manageapplications.ManageApplications">
		<extra

src/com/android/settings/bluetooth/BluetoothSwitchPreferenceController.java

+2 −1

Original line number	Diff line number	Diff line
		@@ -98,10 +98,11 @@ public class BluetoothSwitchPreferenceController extends TogglePreferenceControl
		}

		@Override
		public void setChecked(boolean isChecked) {
		public boolean setChecked(boolean isChecked) {
		if (mBluetoothAdapter != null) {
		mBluetoothAdapter.setBluetoothEnabled(isChecked);
		}
		return true;
		}

		/**

src/com/android/settings/core/TogglePreferenceController.java

+3 −4

Original line number	Diff line number	Diff line
		@@ -40,8 +40,9 @@ public abstract class TogglePreferenceController extends BasePreferenceControlle
		* Set the Setting to {@param isChecked}
		*
		* @param isChecked Is {@true} when the setting should be enabled.
		* @return {@true} if the underlying setting is updated.
		*/
		public abstract void setChecked(boolean isChecked);
		public abstract boolean setChecked(boolean isChecked);

		@Override
		public final void updateState(Preference preference) {
		@@ -50,8 +51,6 @@ public abstract class TogglePreferenceController extends BasePreferenceControlle

		@Override
		public final boolean onPreferenceChange(Preference preference, Object newValue) {
		boolean auto = (Boolean) newValue;
		setChecked(auto);
		return true;
		return setChecked((Boolean) newValue);
		}
		}
		No newline at end of file

src/com/android/settings/display/AutoBrightnessPreferenceController.java

+2 −1

Original line number	Diff line number	Diff line
		@@ -45,9 +45,10 @@ public class AutoBrightnessPreferenceController extends TogglePreferenceControll
		}

		@Override
		public void setChecked(boolean isChecked) {
		public boolean setChecked(boolean isChecked) {
		Settings.System.putInt(mContext.getContentResolver(), SYSTEM_KEY,
		isChecked ? SCREEN_BRIGHTNESS_MODE_AUTOMATIC : DEFAULT_VALUE);
		return true;
		}

		@Override