Snap for 5434517 from 14b8b27f1c7cd17e24146e5c925c384b0f8639b6 to qt-release (2604451a) · Commits · e / os / android_packages_apps_Settings

AndroidManifest.xml

+9 −1

Original line number	Diff line number	Diff line
		@@ -1032,7 +1032,8 @@
		<activity
		android:name=".slices.SliceDeepLinkSpringBoard"
		android:excludeFromRecents="true"
		android:theme="@android:style/Theme.NoDisplay">
		android:theme="@android:style/Theme.NoDisplay"
		android:permission="android.permission.MODIFY_PHONE_STATE">
		<intent-filter>
		<action android:name="android.intent.action.VIEW" />
		<category android:name="android.intent.category.DEFAULT" />
		@@ -2674,6 +2675,13 @@
		</intent-filter>
		</activity>

		<activity
		android:name=".flashlight.FlashlightHandleActivity"
		android:theme="@android:style/Theme.NoDisplay"
		android:excludeFromRecents="true"
		android:exported="true"
		android:label="@string/power_flashlight"/>

		<activity
		android:name="Settings$WifiCallingSettingsActivity"
		android:label="@string/wifi_calling_settings_title">

res/drawable/ic_qrcode_24dp.xml

+1 −31

Original line number	Diff line number	Diff line
		@@ -6,35 +6,5 @@
		android:tint="?android:attr/colorAccent">
		<path
		android:fillColor="#FF000000"
		android:pathData="M7,4v3H4V4H7M9,2H2v7h7V2L9,2z"/>
		<path
		android:fillColor="#FF000000"
		android:pathData="M15,11l-8,0l0,2l8,0l0,-2z"/>
		<path
		android:fillColor="#FF000000"
		android:pathData="M13,2l-2,0l0,11l2,0l0,-11z"/>
		<path
		android:fillColor="#FF000000"
		android:pathData="M22,15l-11,0l0,2l11,0l0,-2z"/>
		<path
		android:fillColor="#FF000000"
		android:pathData="M13,17l-2,0l0,5l2,0l0,-5z"/>
		<path
		android:fillColor="#FF000000"
		android:pathData="M17,13l-2,0l0,9l2,0l0,-9z"/>
		<path
		android:fillColor="#FF000000"
		android:pathData="M22,19l-3,0l0,3l3,0l0,-3z"/>
		<path
		android:fillColor="#FF000000"
		android:pathData="M5,11l-3,0l0,2l3,0l0,-2z"/>
		<path
		android:fillColor="#FF000000"
		android:pathData="M22,11l-5,0l0,2l5,0l0,-2z"/>
		<path
		android:fillColor="#FF000000"
		android:pathData="M20,4v3h-3V4H20M22,2h-7v7h7V2L22,2z"/>
		<path
		android:fillColor="#FF000000"
		android:pathData="M7,17v3H4v-3H7M9,15H2v7h7V15L9,15z"/>
		android:pathData="M3,9h6V3H3V9zM5,5h2v2H5V5zM15,3v6h6V3H15zM19,7h-2V5h2V7zM3,21h6v-6H3V21zM5,17h2v2H5V17zM13,15v2h-2v-2v-2v-2h2v2h2v-2h2v2v2H13zM17,19h4v2h-4h-2v-2v-2h2V19zM19,11h2v6h-2V11zM7,11h2v2H7V11zM11,19h2v2h-2V19zM5,13H3v-2h2V13zM13,9h-2V3h2V9z"/>
		</vector>

res/drawable/ic_scan_24dp.xml

+1 −25

Original line number	Diff line number	Diff line
		@@ -6,29 +6,5 @@
		android:tint="?android:attr/colorAccent">
		<path
		android:fillColor="#FF000000"
		android:pathData="M9,2l-7,0l0,2l7,0l0,-2z"/>
		<path
		android:fillColor="#FF000000"
		android:pathData="M22,2l-7,0l0,2l7,0l0,-2z"/>
		<path
		android:fillColor="#FF000000"
		android:pathData="M22,11l-20,0l0,2l20,0l0,-2z"/>
		<path
		android:fillColor="#FF000000"
		android:pathData="M22,2l-2,0l0,7l2,0l0,-7z"/>
		<path
		android:fillColor="#FF000000"
		android:pathData="M4,2l-2,0l0,7l2,0l0,-7z"/>
		<path
		android:fillColor="#FF000000"
		android:pathData="M9,20l-7,0l0,2l7,0l0,-2z"/>
		<path
		android:fillColor="#FF000000"
		android:pathData="M22,20l-7,0l0,2l7,0l0,-2z"/>
		<path
		android:fillColor="#FF000000"
		android:pathData="M22,15l-2,0l0,7l2,0l0,-7z"/>
		<path
		android:fillColor="#FF000000"
		android:pathData="M4,15l-2,0l0,7l2,0l0,-7z"/>
		android:pathData="M3,9h6V3H3V9zM5,5h2v2H5V5zM15,3v6h6V3H15zM19,7h-2V5h2V7zM3,21h6v-6H3V21zM5,17h2v2H5V17zM17,15h4v2h-4v4h-2v-4h-4v-2h4v-4h2V15zM7,11h2v2H7V11zM5,13H3v-2h2V13zM13,9h-2V3h2V9z"/>
		</vector>

res/values/attrs.xml

+0 −2

Original line number	Diff line number	Diff line
		@@ -72,8 +72,6 @@
		<attr name="controller" format="string" />
		<!-- {@code true} when the controller declared represents a slice from {@link android.app.SettingsSliceContract} -->
		<attr name="platform_slice" format="boolean" />
		<!-- Whether or not dynamic summary text from PreferenceController is allowed when creating slice object, by default it's false. -->
		<attr name="allowDynamicSummaryInSlice" format="boolean" />
		<!-- customized subtitle if it's an unavailable slice -->
		<attr name="unavailableSliceSubtitle" format="string" />
		</declare-styleable>

res/values/dimens.xml

+0 −16

Original line number	Diff line number	Diff line
		@@ -319,14 +319,6 @@
		<dimen name="screen_pinning_padding_start">64dp</dimen>
		<dimen name="screen_pinning_padding_end">64dp</dimen>

		<!-- Suggestion/condition header padding -->
		<dimen name="suggestion_condition_header_padding_collapsed">10dp</dimen>
		<dimen name="suggestion_condition_header_padding_expanded">5dp</dimen>
		<dimen name="condition_header_height">36dp</dimen>

		<!-- Condition cards size and padding -->
		<dimen name="condition_card_elevation">2dp</dimen>

		<!-- Padding for the reset screens -->
		<dimen name="reset_checkbox_padding_end">8dp</dimen>
		<dimen name="reset_checkbox_title_padding_top">12dp</dimen>
		@@ -334,12 +326,6 @@
		<dimen name="reset_checkbox_title_text_size">18sp</dimen>
		<dimen name="reset_checkbox_summary_text_size">14sp</dimen>

		<!-- Bottombar size and padding -->
		<dimen name="homepage_bottomsheet_height">90dp</dimen>
		<dimen name="homepage_bottombar_height">56dp</dimen>
		<dimen name="homepage_bottombar_top_margin">34dp</dimen>
		<dimen name="homepage_bottombar_fab_cradle">68dp</dimen>

		<!-- Homepage cards size and padding -->
		<dimen name="homepage_card_icon_size">24dp</dimen>
		<dimen name="homepage_card_vertical_margin">8dp</dimen>
		@@ -369,8 +355,6 @@
		<dimen name="homepage_card_dismissal_button_margin_end">6dp</dimen>

		<!-- Horizontal divider size and margin -->
		<dimen name="horizontal_divider_margin_top">4dp</dimen>
		<dimen name="horizontal_divider_margin_bottom">8dp</dimen>
		<dimen name="horizontal_divider_height">.75dp</dimen>

		<!-- Vertical divider size -->