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

Merge "Remove custom theme added for tooltip in captions toggle first run show. windowIsFloating is necessary to stop drawing system bar backgrounds on certain devices." into qt-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2019-04-28 20:10:49 +00:00
committed by Android (Google) Code Review
parent 05dc2a5744 477d097f79
commit a87fd73922
5 changed files with 5 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -22,7 +22,7 @@
android:gravity="right"
android:layout_gravity="right"
android:background="@android:color/transparent"
android:theme="@style/volume_dialog_theme">
android:theme="@style/qs_theme">
<FrameLayout
android:id="@+id/volume_dialog"

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

@@ -22,7 +22,7 @@
android:gravity="right"
android:layout_gravity="right"
android:background="@android:color/transparent"
android:theme="@style/volume_dialog_theme">
android:theme="@style/qs_theme">
<!-- right-aligned to be physically near volume button -->
<LinearLayout

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

@@ -20,7 +20,7 @@
android:layout_width="@dimen/volume_dialog_panel_width"
android:clipChildren="false"
android:clipToPadding="false"
android:theme="@style/volume_dialog_theme">
android:theme="@style/qs_theme">
<LinearLayout
android:layout_height="wrap_content"

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

@@ -318,10 +318,6 @@
<item name="android:windowIsFloating">true</item>
</style>
<style name="volume_dialog_theme" parent="qs_theme">
<item name="android:windowIsFloating">false</item>
</style>
<style name="systemui_theme_remote_input" parent="@android:style/Theme.DeviceDefault.Light">
<item name="android:colorAccent">@color/remote_input_accent</item>
</style>

4
packages/SystemUI/src/com/android/systemui/volume/VolumeDialogImpl.java
View File

@@ -166,7 +166,7 @@ public class VolumeDialogImpl implements VolumeDialog,
public VolumeDialogImpl(Context context) {
mContext =
new ContextThemeWrapper(context, com.android.systemui.R.style.volume_dialog_theme);
new ContextThemeWrapper(context, R.style.qs_theme);
mController = Dependency.get(VolumeDialogController.class);
mKeyguard = (KeyguardManager) mContext.getSystemService(Context.KEYGUARD_SERVICE);
mActivityManager = (ActivityManager) mContext.getSystemService(Context.ACTIVITY_SERVICE);
@@ -1337,7 +1337,7 @@ public class VolumeDialogImpl implements VolumeDialog,
private final class CustomDialog extends Dialog implements DialogInterface {
public CustomDialog(Context context) {
super(context, com.android.systemui.R.style.volume_dialog_theme);
super(context, R.style.qs_theme);
}
@Override