Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Rename qs_theme

Browse Source 
It's now called Theme.SystemUI.QuickSettings, which is a more standard
nomenclature

Test: make
Test: visual
Bug: 183953523
Change-Id: Ifc1be0270e9ec9ae6ae3ee5e703d273182dca138
This commit is contained in:
Lucas Dupin
2021-04-02 17:05:09 -07:00
parent 32d406516b
commit f1dd230df4
12 changed files with 15 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
packages/SystemUI/res/layout-land/global_actions_column.xml
View File

@@ -22,7 +22,7 @@
android:layout_height="match_parent"
android:orientation="horizontal"
android:clipToPadding="false"
android:theme="@style/qs_theme"
android:theme="@style/Theme.SystemUI.QuickSettings"
android:gravity="center_horizontal | top"
android:clipChildren="false"
>

2
packages/SystemUI/res/layout-land/global_actions_column_seascape.xml
View File

@@ -22,7 +22,7 @@
android:layout_height="match_parent"
android:orientation="horizontal"
android:clipToPadding="false"
android:theme="@style/qs_theme"
android:theme="@style/Theme.SystemUI.QuickSettings"
android:gravity="center_horizontal | bottom"
android:clipChildren="false"
>

2
packages/SystemUI/res/layout-land/global_actions_grid.xml
View File

@@ -5,7 +5,7 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="horizontal"
android:theme="@style/qs_theme"
android:theme="@style/Theme.SystemUI.QuickSettings"
android:gravity="right | center_vertical"
android:clipChildren="false"
android:clipToPadding="false"

2
packages/SystemUI/res/layout-land/global_actions_grid_seascape.xml
View File

@@ -5,7 +5,7 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="horizontal"
android:theme="@style/qs_theme"
android:theme="@style/Theme.SystemUI.QuickSettings"
android:gravity="left | center_vertical"
android:clipChildren="false"
android:clipToPadding="false"

2
packages/SystemUI/res/layout/global_actions_column.xml
View File

@@ -22,7 +22,7 @@
android:layout_height="match_parent"
android:orientation="vertical"
android:clipToPadding="false"
android:theme="@style/qs_theme"
android:theme="@style/Theme.SystemUI.QuickSettings"
android:gravity="center_vertical | right"
android:clipChildren="false"
>

2
packages/SystemUI/res/layout/global_actions_grid.xml
View File

@@ -23,7 +23,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal"
android:theme="@style/qs_theme"
android:theme="@style/Theme.SystemUI.QuickSettings"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintRight_toRightOf="parent"

2
packages/SystemUI/res/layout/global_actions_view.xml
View File

@@ -19,7 +19,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal"
android:theme="@style/qs_theme"
android:theme="@style/Theme.SystemUI.QuickSettings"
android:clipChildren="false"
android:clipToPadding="false"
android:layout_marginStart="@dimen/global_actions_side_margin"

2
packages/SystemUI/res/layout/status_bar_expanded_plugin_frame.xml
View File

@@ -18,7 +18,7 @@
<FrameLayout
xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/plugin_frame"
android:theme="@style/qs_theme"
android:theme="@style/Theme.SystemUI.QuickSettings"
android:layout_width="@dimen/qs_panel_width"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"

2
packages/SystemUI/res/values-television/styles.xml
View File

@@ -23,7 +23,7 @@
<item name="android:windowExitAnimation">@null</item>
</style>
<style name="volume_dialog_theme" parent="qs_theme">
<style name="volume_dialog_theme" parent="Theme.SystemUI">
<item name="android:colorAccent">@color/tv_volume_dialog_accent</item>
<item name="android:dialogCornerRadius">@dimen/volume_dialog_panel_width_half</item>
</style>

6
packages/SystemUI/res/values/styles.xml
View File

@@ -375,7 +375,7 @@
<item name="*android:dotColor">?android:attr/textColorSecondary</item>
</style>
<style name="qs_theme" parent="@*android:style/Theme.DeviceDefault.SystemUI">
<style name="Theme.SystemUI.QuickSettings" parent="@*android:style/Theme.DeviceDefault.SystemUI">
<item name="lightIconTheme">@style/QSIconTheme</item>
<item name="darkIconTheme">@style/QSIconTheme</item>
<item name="android:colorError">@*android:color/error_color_material_dark</item>
@@ -384,7 +384,7 @@
</style>
<!-- Overridden by values-television/styles.xml with tv-specific settings -->
<style name="volume_dialog_theme" parent="qs_theme"/>
<style name="volume_dialog_theme" parent="Theme.SystemUI"/>
<style name="Theme.SystemUI.Dialog" parent="@android:style/Theme.DeviceDefault.Light.Dialog" />
@@ -587,7 +587,7 @@
<item name="android:elevation">10dp</item>
</style>
<style name="edit_theme" parent="qs_theme">
<style name="Theme.SystemUI.QuickSettings.Edit">
<item name="android:colorBackground">?android:attr/colorSecondary</item>
</style>

3
packages/SystemUI/src/com/android/systemui/qs/QSFragment.java
View File

@@ -132,7 +132,8 @@ public class QSFragment extends LifecycleFragment implements QS, CommandQueue.Ca
public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container,
Bundle savedInstanceState) {
inflater = mInjectionInflater.injectable(
inflater.cloneInContext(new ContextThemeWrapper(getContext(), R.style.qs_theme)));
inflater.cloneInContext(new ContextThemeWrapper(getContext(),
R.style.Theme_SystemUI_QuickSettings)));
return inflater.inflate(R.layout.qs_panel, container, false);
}

2
packages/SystemUI/src/com/android/systemui/qs/customize/QSCustomizer.java
View File

@@ -63,7 +63,7 @@ public class QSCustomizer extends LinearLayout {
private boolean mIsShowingNavBackdrop;
public QSCustomizer(Context context, AttributeSet attrs) {
super(new ContextThemeWrapper(context, R.style.edit_theme), attrs);
super(new ContextThemeWrapper(context, R.style.Theme_SystemUI_QuickSettings_Edit), attrs);
LayoutInflater.from(getContext()).inflate(R.layout.qs_customize_panel_content, this);
mClipper = new QSDetailClipper(findViewById(R.id.customize_container));