Snap for 6392464 from c858484fe6033efc335cc44036659b5dbe2c97c2 to rvc-release (030e6d9a) · Commits · e / os / android_packages_apps_Settings

res/layout/notification_history.xml

+7 −21

Original line number	Diff line number	Diff line
		@@ -14,7 +14,7 @@
		limitations under the License.
		-->

		<ScrollView
		<androidx.core.widget.NestedScrollView
		xmlns:android="http://schemas.android.com/apk/res/android"
		android:id="@+id/scroll"
		android:layout_width="match_parent"
		@@ -124,22 +124,15 @@
		android:textColor="?android:attr/textColorPrimary"
		android:textAppearance="?android:attr/textAppearanceMedium"
		android:paddingBottom="16dp" />
		<androidx.constraintlayout.widget.ConstraintLayout
		android:id="@+id/list_container"
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:clipChildren="true"
		android:elevation="3dp"
		android:background="@drawable/rounded_bg">

		<androidx.recyclerview.widget.RecyclerView
		android:id="@+id/notification_list"
		android:elevation="3dp"
		android:background="@drawable/rounded_bg"
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:clipChildren="true"
		android:scrollbars="none"/>

		</androidx.constraintlayout.widget.ConstraintLayout>
		</LinearLayout>

		<LinearLayout
		@@ -156,21 +149,14 @@
		android:textColor="?android:attr/textColorPrimary"
		android:textAppearance="?android:attr/textAppearanceMedium"
		android:paddingBottom="16dp" />
		<androidx.constraintlayout.widget.ConstraintLayout
		android:id="@+id/list_container"
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:elevation="3dp"
		android:clipChildren="true"
		android:background="@drawable/rounded_bg">
		<androidx.recyclerview.widget.RecyclerView
		android:id="@+id/notification_list"
		android:elevation="3dp"
		android:background="@drawable/rounded_bg"
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:clipChildren="true"
		android:scrollbars="none"/>

		</androidx.constraintlayout.widget.ConstraintLayout>
		</LinearLayout>

		<LinearLayout
		@@ -198,4 +184,4 @@
		</LinearLayout>

		</LinearLayout>
		</ScrollView>
		No newline at end of file
		</androidx.core.widget.NestedScrollView>
		No newline at end of file

res/layout/notification_history_app_layout.xml

+1 −7

Original line number	Diff line number	Diff line
		@@ -73,18 +73,12 @@
		android:layout_height="1dp"
		android:background="?android:attr/listDivider"/>

		<androidx.constraintlayout.widget.ConstraintLayout
		android:id="@+id/list_container"
		android:layout_width="match_parent"
		android:clipChildren="true"
		android:layout_height="wrap_content">
		<com.android.settings.notification.history.NotificationHistoryRecyclerView
		android:id="@+id/notification_list"
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:clipChildren="true"
		android:importantForAccessibility="yes"
		android:scrollbars="none"/>

		</androidx.constraintlayout.widget.ConstraintLayout>

		</LinearLayout>
		No newline at end of file

res/values/strings.xml

+2 −0

Original line number	Diff line number	Diff line
		@@ -7438,6 +7438,8 @@
		<string name="connected_devices_dashboard_no_driving_mode_no_nfc_summary">Bluetooth</string>
		<!-- Summary for Tap & pay settings, explaning a few important settings under it [CHAR LIMIT=NONE]-->
		<string name="nfc_and_payment_settings_payment_off_nfc_off_summary">Unavailable because NFC is off</string>
		<!-- Summary for Tap & pay settings, explaning a few important settings under it [CHAR LIMIT=NONE]-->
		<string name="nfc_and_payment_settings_no_payment_installed_summary">To use, first install a payment app</string>
		<!-- Title for setting tile leading to Apps & Notification settings [CHAR LIMIT=40]-->
		<string name="app_and_notification_dashboard_title">Apps & notifications</string>
		<!-- Summary for Apps & Notification settings, explaining a few important settings under it [CHAR LIMIT=NONE]-->

src/com/android/settings/accessibility/AccessibilityControlTimeoutPreferenceFragment.java

+2 −1

Original line number	Diff line number	Diff line
		@@ -32,7 +32,8 @@ import com.android.settingslib.search.SearchIndexable;
		import java.util.ArrayList;
		import java.util.List;

		@SearchIndexable
		/** Settings fragment containing accessibility control timeout preference. */
		@SearchIndexable(forTarget = SearchIndexable.ALL & ~SearchIndexable.ARC)
		public final class AccessibilityControlTimeoutPreferenceFragment extends DashboardFragment
		implements AccessibilityTimeoutController.OnChangeListener {

src/com/android/settings/accessibility/AccessibilitySettings.java

+2 −4

Original line number	Diff line number	Diff line
		@@ -65,10 +65,8 @@ import java.util.List;
		import java.util.Map;
		import java.util.Set;

		/**
		* Activity with the accessibility settings.
		*/
		@SearchIndexable
		/** Activity with the accessibility settings. */
		@SearchIndexable(forTarget = SearchIndexable.ALL & ~SearchIndexable.ARC)
		public class AccessibilitySettings extends DashboardFragment {

		private static final String TAG = "AccessibilitySettings";