Snap for 6406367 from f43cf08634013fbc132b18d8be1e145bed276d5d to rvc-release (860aac51) · Commits · e / os / android_packages_apps_Settings

res/xml/accessibility_settings.xml

+1 −0

Original line number	Diff line number	Diff line
		@@ -154,6 +154,7 @@
		android:persistent="false"
		android:summary="@string/live_caption_summary"
		android:title="@string/live_caption_title"
		settings:searchable="false"
		settings:controller="com.android.settings.accessibility.LiveCaptionPreferenceController"/>

		<SwitchPreference

res/xml/configure_notification_settings.xml

+32 −30

Original line number	Diff line number	Diff line
		@@ -25,16 +25,41 @@
		settings:controller="com.android.settings.widget.VideoPreferenceController"
		android:persistent="false" />

		<!-- Empty category to draw divider -->
		<PreferenceCategory
		android:key="all_notifications_divider"
		android:order="2"/>
		<Preference
		android:key="notification_history"
		android:title="@string/notification_history"
		android:summary="@string/notification_history_summary"
		settings:allowDividerAbove="true"
		settings:allowDividerBelow="false"
		android:order="2">
		<intent
		android:action="android.intent.action.MAIN"
		android:targetPackage="com.android.settings"
		android:targetClass="com.android.settings.notification.history.NotificationHistoryActivity" />
		</Preference>

		<Preference
		android:key="conversations"
		android:title="@string/conversations_category_title"
		android:summary="@string/manage_conversations"
		android:order="3"
		android:fragment="com.android.settings.notification.app.ConversationListSettings"
		/>

		<Preference
		android:key="notification_bubbles"
		android:title="@string/notification_bubbles_title"
		android:summary="@string/notifications_bubble_setting_on_summary"
		android:order="4"
		settings:controller="com.android.settings.notification.BubbleSummaryNotificationPreferenceController"
		android:fragment="com.android.settings.notification.BubbleNotificationSettings"
		/>

		<PreferenceCategory
		android:key="recent_notifications_category"
		android:title="@string/recent_notifications"
		settings:allowDividerAbove="false"
		android:order="3">
		settings:allowDividerAbove="true"
		android:order="5">
		<!-- Placeholder for a list of recent apps -->

		<!-- See all apps button -->
		@@ -42,7 +67,7 @@
		android:key="all_notifications"
		android:title="@string/notifications_title"
		android:fragment="com.android.settings.applications.manageapplications.ManageApplications"
		android:order="4"
		android:order="6"
		settings:searchable="false">
		<extra
		android:name="classname"
		@@ -50,23 +75,6 @@
		</Preference>
		</PreferenceCategory>

		<Preference
		android:key="conversations"
		android:title="@string/conversations_category_title"
		settings:allowDividerAbove="true"
		android:summary="@string/manage_conversations"
		android:order="6"
		android:fragment="com.android.settings.notification.app.ConversationListSettings"
		/>

		<Preference
		android:key="notification_bubbles"
		android:title="@string/notification_bubbles_title"
		android:summary="@string/notifications_bubble_setting_on_summary"
		android:order="7"
		settings:controller="com.android.settings.notification.BubbleSummaryNotificationPreferenceController"
		android:fragment="com.android.settings.notification.BubbleNotificationSettings"
		/>

		<PreferenceCategory
		android:key="configure_notifications_lock"
		@@ -105,12 +113,6 @@
		android:order="15"
		settings:initialExpandedChildrenCount="0">

		<SwitchPreference
		android:key="notification_history"
		android:title="@string/notification_history"
		android:summary="@string/notification_history_summary"
		settings:controller="com.android.settings.notification.NotificationHistoryPreferenceController"/>

		<SwitchPreference
		android:key="silent_icons"
		android:title="@string/silent_notifications_status_bar"

src/com/android/settings/TetherSettings.java

+6 −4

Original line number	Diff line number	Diff line
		@@ -172,7 +172,7 @@ public class TetherSettings extends RestrictedSettingsFragment
		com.android.internal.R.string.config_ethernet_iface_regex);

		final boolean usbAvailable = mUsbRegexs.length != 0;
		final boolean bluetoothAvailable = mBluetoothRegexs.length != 0;
		final boolean bluetoothAvailable = adapter != null && mBluetoothRegexs.length != 0;
		final boolean ethernetAvailable = !TextUtils.isEmpty(mEthernetRegex);

		if (!usbAvailable \|\| Utils.isMonkeyRunning()) {
		@@ -326,6 +326,7 @@ public class TetherSettings extends RestrictedSettingsFragment
		if (intent != null) mTetherChangeReceiver.onReceive(activity, intent);

		mEthernetListener = new EthernetListener();
		if (mEm != null)
		mEm.addListener(mEthernetListener);

		updateState();
		@@ -340,6 +341,7 @@ public class TetherSettings extends RestrictedSettingsFragment
		}
		getActivity().unregisterReceiver(mTetherChangeReceiver);
		mTm.unregisterTetheringEventCallback(mTetheringEventCallback);
		if (mEm != null)
		mEm.removeListener(mEthernetListener);
		mTetherChangeReceiver = null;
		mStartTetheringCallback = null;
		@@ -438,7 +440,7 @@ public class TetherSettings extends RestrictedSettingsFragment
		if (isTethered) {
		mEthernetTether.setEnabled(!mDataSaverEnabled);
		mEthernetTether.setChecked(true);
		} else if (isAvailable \|\| mEm.isAvailable()) {
		} else if (isAvailable \|\| (mEm != null && mEm.isAvailable())) {
		mEthernetTether.setEnabled(!mDataSaverEnabled);
		mEthernetTether.setChecked(false);
		} else {

src/com/android/settings/applications/SpecialAppAccessPreferenceController.java

+2 −1

Original line number	Diff line number	Diff line
		@@ -144,10 +144,11 @@ public class SpecialAppAccessPreferenceController extends BasePreferenceControll

		@Override
		public void onLauncherInfoChanged() {
		// when the value of the AppEntry.hasLauncherEntry was changed.
		updateSummary();
		}

		@Override
		public void onLoadEntriesCompleted() {
		}

		}

src/com/android/settings/deviceinfo/BuildNumberPreferenceController.java

+0 −15

Original line number	Diff line number	Diff line
		@@ -97,21 +97,6 @@ public class BuildNumberPreferenceController extends BasePreferenceController im
		return AVAILABLE;
		}

		@Override
		public boolean isSliceable() {
		return true;
		}

		@Override
		public boolean isPublicSlice() {
		return true;
		}

		@Override
		public boolean isCopyableSlice() {
		return true;
		}

		@Override
		public boolean useDynamicSliceSummary() {
		return true;