Merge "[PM] Update TextAppearance and remove local style" into main (9d1ee9be) · Commits · e / os / android_frameworks_base

packages/PackageInstaller/res/layout/install_content_view.xml

+10 −10

Original line number	Diff line number	Diff line
		@@ -34,7 +34,7 @@
		<TextView
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		style="@android:style/TextAppearance.Material.Subhead"
		style="@android:style/TextAppearance.DeviceDefault.SearchResult.Subtitle"
		android:text="@string/message_staging" />

		<ProgressBar
		@@ -57,7 +57,7 @@
		<TextView
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		style="@android:style/TextAppearance.Material.Subhead"
		style="@android:style/TextAppearance.DeviceDefault.SearchResult.Subtitle"
		android:text="@string/installing" />

		<ProgressBar
		@@ -74,7 +74,7 @@
		android:id="@+id/install_confirm_question"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		style="@android:style/TextAppearance.Material.Subhead"
		style="@android:style/TextAppearance.DeviceDefault.SearchResult.Subtitle"
		android:text="@string/install_confirm_question"
		android:visibility="invisible"
		android:scrollbars="vertical" />
		@@ -83,7 +83,7 @@
		android:id="@+id/install_confirm_question_update"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		style="@android:style/TextAppearance.Material.Subhead"
		style="@android:style/TextAppearance.DeviceDefault.SearchResult.Subtitle"
		android:text="@string/install_confirm_question_update"
		android:visibility="invisible"
		android:scrollbars="vertical" />
		@@ -92,7 +92,7 @@
		android:id="@+id/install_success"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		style="@android:style/TextAppearance.Material.Subhead"
		style="@android:style/TextAppearance.DeviceDefault.SearchResult.Subtitle"
		android:text="@string/install_done"
		android:visibility="invisible" />

		@@ -100,7 +100,7 @@
		android:id="@+id/install_failed"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		style="@android:style/TextAppearance.Material.Subhead"
		style="@android:style/TextAppearance.DeviceDefault.SearchResult.Subtitle"
		android:text="@string/install_failed"
		android:visibility="invisible" />

		@@ -108,7 +108,7 @@
		android:id="@+id/install_failed_blocked"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		style="@android:style/TextAppearance.Material.Subhead"
		style="@android:style/TextAppearance.DeviceDefault.SearchResult.Subtitle"
		android:text="@string/install_failed_blocked"
		android:visibility="invisible" />

		@@ -116,7 +116,7 @@
		android:id="@+id/install_failed_conflict"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		style="@android:style/TextAppearance.Material.Subhead"
		style="@android:style/TextAppearance.DeviceDefault.SearchResult.Subtitle"
		android:text="@string/install_failed_conflict"
		android:visibility="invisible" />

		@@ -124,7 +124,7 @@
		android:id="@+id/install_failed_incompatible"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		style="@android:style/TextAppearance.Material.Subhead"
		style="@android:style/TextAppearance.DeviceDefault.SearchResult.Subtitle"
		android:text="@string/install_failed_incompatible"
		android:visibility="invisible" />

		@@ -132,7 +132,7 @@
		android:id="@+id/install_failed_invalid_apk"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		style="@android:style/TextAppearance.Material.Subhead"
		style="@android:style/TextAppearance.DeviceDefault.SearchResult.Subtitle"
		android:text="@string/install_failed_invalid_apk"
		android:visibility="invisible" />

packages/PackageInstaller/res/layout/uninstall_content_view.xml

+25 −25

Original line number	Diff line number	Diff line
		@@ -23,7 +23,6 @@
		android:layout_height="wrap_content">

		<LinearLayout
		xmlns:android="http://schemas.android.com/apk/res/android"
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:theme="?android:attr/alertDialogTheme"
		@@ -37,7 +36,7 @@
		android:id="@+id/message"
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		style="@android:style/TextAppearance.Material.Subhead" />
		style="@android:style/TextAppearance.DeviceDefault.SearchResult.Subtitle" />

		<CheckBox
		android:id="@+id/keepData"
		@@ -45,9 +44,10 @@
		android:layout_height="wrap_content"
		android:layout_marginTop="8dp"
		android:layout_marginStart="-8dp"
		android:paddingLeft="8sp"
		android:paddingStart="8sp"
		android:paddingEnd="0sp"
		android:visibility="gone"
		style="@android:style/TextAppearance.Material.Subhead" />
		style="@android:style/TextAppearance.DeviceDefault.SearchResult.Subtitle" />

		</LinearLayout>
		</ScrollView>

packages/PackageInstaller/res/values-night/themes.xml

+0 −1

Original line number	Diff line number	Diff line
		@@ -19,7 +19,6 @@

		<style name="Theme.AlertDialogActivity"
		parent="@android:style/Theme.DeviceDefault.Dialog.Alert">
		<item name="alertDialogStyle">@style/AlertDialog</item>
		<item name="android:windowActionBar">false</item>
		<item name="android:windowNoTitle">true</item>
		<item name="android:windowAnimationStyle">@null</item>

packages/PackageInstaller/res/values/themes.xml

+0 −1

Original line number	Diff line number	Diff line
		@@ -19,7 +19,6 @@

		<style name="Theme.AlertDialogActivity"
		parent="@android:style/Theme.DeviceDefault.Light.Dialog.Alert">
		<item name="alertDialogStyle">@style/AlertDialog</item>
		<item name="android:windowActionBar">false</item>
		<item name="android:windowNoTitle">true</item>
		<item name="android:windowAnimationStyle">@null</item>