Snap for 5523284 from 9a4fa9bf0d8c6da8d27844b64042940f9a3b65cd to qt-release (a0a92911) · Commits · e / os / android_packages_apps_Settings

AndroidManifest.xml

+2 −0

Original line number	Diff line number	Diff line
		@@ -138,6 +138,7 @@
		<intent-filter android:priority="1">
		<action android:name="android.settings.NETWORK_OPERATOR_SETTINGS" />
		<action android:name="android.settings.DATA_ROAMING_SETTINGS" />
		<action android:name="android.settings.MMS_MESSAGE_SETTING" />
		<category android:name="android.intent.category.DEFAULT" />
		</intent-filter>
		</activity>
		@@ -2624,6 +2625,7 @@
		<receiver android:name=".sim.SimSelectNotification">
		<intent-filter>
		<action android:name="android.telephony.action.PRIMARY_SUBSCRIPTION_LIST_CHANGED"/>
		<action android:name="android.settings.ENABLE_MMS_DATA_REQUEST"/>
		</intent-filter>
		</receiver>

res/drawable/button_border_selected.xml

+2 −2

Original line number	Diff line number	Diff line
		@@ -18,6 +18,6 @@
		android:shape="rectangle">
		<stroke
		android:width="2dp"
		android:color="?android:attr/colorAccent"/>
		android:color="?android:attr/textColorSecondary"/>
		<corners android:radius="@dimen/rect_button_radius" />
		</shape>

res/drawable/button_border_unselected.xml

+2 −2

Original line number	Diff line number	Diff line
		@@ -18,7 +18,7 @@
		android:shape="rectangle">
		<stroke
		android:width="2dp"
		android:color="@color/notification_importance_button_unselected"/>
		android:color="?android:attr/textColorSecondary"/>

		<corners android:radius="@dimen/rect_button_radius" />
		</shape>

res/drawable/ic_settings_gestures.xml

+2 −5

Original line number	Diff line number	Diff line
		@@ -20,9 +20,6 @@
		android:viewportHeight="32.0"
		android:tint="?android:attr/colorControlNormal">
		<path
		android:fillColor="#FF000000"
		android:pathData="M20,20.2V24H6V5.3h8.7l2.4,-4H7.6c-2.2,0 -4,1.8 -4,4v21.3c0,2.2 1.8,4 4,4h10.7c2.2,0 4,-1.8 4,-4V14.9L20,20.2zM15.6,28h-5.3v-1.3h5.3V28z"/>
		<path
		android:fillColor="#FF000000"
		android:pathData="M28.5,7l1.1,-2.4L32,3.5l-2.4,-1.1L28.5,0l-1.1,2.4L25,3.5l2.4,1.1L28.5,7zM21,7.4l-2.2,-4.8l-2.2,4.8l-4.8,2.2l4.8,2.2l2.2,4.8l2.2,-4.8l4.8,-2.2L21,7.4zM28.5,12.2l-1.1,2.4L25,15.6l2.4,1.1l1.1,2.4l1.1,-2.4l2.4,-1.1l-2.4,-1.1L28.5,12.2z"/>
		android:fillColor="@android:color/white"
		android:pathData="M4.59 6.89c0.7-0.71 1.4-1.35 1.71-1.22 0.5 0.2 0 1.03-0.3 1.52-0.25 0.42 -2.86 3.89-2.86 6.31 0 1.28 0.48 2.34 1.34 2.98 0.75 0.56 1.74 0.73 2.64 0.46 1.07-0.31 1.95-1.4 3.06-2.77 1.21-1.49 2.83-3.44 4.08-3.44 1.63 0 1.65 1.01 1.76 1.79-3.78 0.64 -5.38 3.67-5.38 5.37 0 1.7 1.44 3.09 3.21 3.09 1.63 0 4.29-1.33 4.69-6.1H21v-2.5h-2.47c-0.15-1.65-1.09-4.2-4.03-4.2-2.25 0-4.18 1.91-4.94 2.84-0.58 0.73 -2.06 2.48-2.29 2.72-0.25 0.3 -0.68 0.84 -1.11 0.84 -0.45 0-0.72-0.83-0.36-1.92 0.35 -1.09 1.4-2.86 1.85-3.52 0.78 -1.14 1.3-1.92 1.3-3.28C8.95 3.69 7.31 3 6.44 3 5.12 3 3.97 4 3.72 4.25c-0.36 0.36 -0.66 0.66 -0.88 0.93 l1.75 1.71zm9.29 11.66c-0.31 0-0.74-0.26-0.74-0.72 0-0.6 0.73 -2.2 2.87-2.76-0.3 2.69-1.43 3.48-2.13 3.48z" />
		</vector>
		No newline at end of file

res/layout/notif_importance_preference.xml

+80 −41

Original line number	Diff line number	Diff line
		@@ -21,53 +21,92 @@
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:gravity="center"
		android:padding="@dimen/notification_importance_toggle_marginTop"
		android:orientation="vertical">

		<LinearLayout
		android:id="@+id/buttons"
		<RelativeLayout
		android:id="@+id/alert"
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:layout_marginTop="@dimen/notification_importance_toggle_marginTop"
		android:orientation="horizontal"
		android:gravity="center">

		<Button
		android:id="@+id/alert"
		android:padding="@dimen/notification_importance_button_padding"
		android:clickable="true"
		android:focusable="true">
		<ImageView
		android:id="@+id/alert_icon"
		android:src="@drawable/ic_notification_alert"
		android:background="@android:color/transparent"
		android:layout_gravity="center"
		android:layout_width="wrap_content"
		android:layout_height="@dimen/notification_importance_toggle_size"
		android:minWidth="@dimen/notification_importance_button_width"
		android:paddingStart="@dimen/notification_importance_button_horiz_padding"
		android:paddingEnd="@dimen/notification_importance_button_horiz_padding"
		android:drawablePadding="@dimen/notification_importance_drawable_padding"
		android:foreground="@drawable/button_ripple_radius"
		android:drawableLeft="@drawable/ic_notification_alert"
		android:layout_height="wrap_content"
		android:clickable="false"
		android:focusable="false"/>
		<TextView
		android:id="@+id/alert_label"
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:ellipsize="end"
		android:maxLines="1"
		android:clickable="false"
		android:focusable="false"
		android:layout_toEndOf="@id/alert_icon"
		android:layout_marginStart="@dimen/notification_importance_drawable_padding"
		android:textAppearance="@style/TextAppearance.NotificationImportanceButton.Unselected"
		android:text="@string/notification_alert_title"/>
		<TextView
		android:id="@+id/alert_summary"
		android:paddingTop="@dimen/notification_importance_button_padding"
		android:text="@string/notification_channel_summary_default"
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:clickable="false"
		android:focusable="false"
		android:ellipsize="end"
		android:maxLines="2"
		android:layout_below="@id/alert_icon"
		android:textAppearance="@style/TextAppearance.NotificationImportanceDetail"/>
		</RelativeLayout>

		<Button
		<RelativeLayout
		android:id="@+id/silence"
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:padding="@dimen/notification_importance_button_padding"
		android:layout_marginTop="@dimen/notification_importance_button_separation"
		android:clickable="true"
		android:focusable="true">
		<ImageView
		android:id="@+id/silence_icon"
		android:src="@drawable/ic_notification_silence"
		android:background="@android:color/transparent"
		android:layout_gravity="center"
		android:layout_width="wrap_content"
		android:layout_height="@dimen/notification_importance_toggle_size"
		android:minWidth="@dimen/notification_importance_button_width"
		android:paddingStart="@dimen/notification_importance_button_horiz_padding"
		android:paddingEnd="@dimen/notification_importance_button_horiz_padding"
		android:drawablePadding="@dimen/notification_importance_drawable_padding"
		android:foreground="@drawable/button_ripple_radius"
		android:layout_marginStart="@dimen/notification_importance_button_separation"
		android:drawableLeft="@drawable/ic_notification_silence"
		android:layout_height="wrap_content"
		android:clickable="false"
		android:focusable="false"/>
		<TextView
		android:id="@+id/silence_label"
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:ellipsize="end"
		android:maxLines="1"
		android:clickable="false"
		android:focusable="false"
		android:layout_toEndOf="@id/silence_icon"
		android:layout_marginStart="@dimen/notification_importance_drawable_padding"
		android:textAppearance="@style/TextAppearance.NotificationImportanceButton.Unselected"
		android:text="@string/notification_silence_title"/>

		</LinearLayout>

		<TextView
		android:id="@+id/description"
		android:id="@+id/silence_summary"
		android:paddingTop="@dimen/notification_importance_button_padding"
		android:text="@string/notification_channel_summary_default"
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:text="@string/notification_alert_title"
		android:gravity="center"
		android:layout_marginTop="@dimen/notification_importance_text_marginTop"
		android:layout_marginBottom="@dimen/notification_importance_toggle_marginBottom"
		android:paddingStart="@dimen/notification_importance_description_padding"
		android:paddingEnd="@dimen/notification_importance_description_padding"
		android:clickable="false"
		android:focusable="false"
		android:ellipsize="end"
		android:maxLines="2"
		android:layout_below="@id/silence_icon"
		android:textAppearance="@style/TextAppearance.NotificationImportanceDetail"/>
		</RelativeLayout>

		</LinearLayout>
		No newline at end of file