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

Merge "Themable volume and power dialogs" into oc-dr1-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2017-07-26 02:18:10 +00:00
committed by Android (Google) Code Review
parent 192e7ccf45 448786cc5f
commit 59aadea809
11 changed files with 26 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
packages/SystemUI/res/drawable/rounded_bg.xml
View File

@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android" <shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle"> android:shape="rectangle">
<solid android:color="#ffffffff" /> <solid android:color="?android:attr/colorPrimary" />
<corners <corners
android:bottomLeftRadius="@dimen/corner_size" android:bottomLeftRadius="@dimen/corner_size"
android:topLeftRadius="@dimen/corner_size" android:topLeftRadius="@dimen/corner_size"

2
packages/SystemUI/res/drawable/rounded_bg_bottom.xml
View File

@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android" <shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle"> android:shape="rectangle">
<solid android:color="#ffeeeeee" /> <solid android:color="?android:attr/colorPrimaryDark" />
<corners <corners
android:bottomLeftRadius="@dimen/corner_size" android:bottomLeftRadius="@dimen/corner_size"
android:topLeftRadius="0dp" android:topLeftRadius="0dp"

2
packages/SystemUI/res/drawable/rounded_bg_full.xml
View File

@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android" <shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle"> android:shape="rectangle">
<solid android:color="#ffffffff" /> <solid android:color="?android:attr/colorPrimary" />
<corners <corners
android:bottomLeftRadius="@dimen/corner_size" android:bottomLeftRadius="@dimen/corner_size"
android:topLeftRadius="@dimen/corner_size" android:topLeftRadius="@dimen/corner_size"

2
packages/SystemUI/res/drawable/rounded_full_bg_bottom.xml
View File

@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android" <shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle"> android:shape="rectangle">
<solid android:color="#ffeeeeee" /> <solid android:color="?android:attr/colorPrimaryDark" />
<corners <corners
android:bottomLeftRadius="@dimen/corner_size" android:bottomLeftRadius="@dimen/corner_size"
android:topLeftRadius="0dp" android:topLeftRadius="0dp"

2
packages/SystemUI/res/drawable/volume_dialog_background.xml
View File

@@ -14,5 +14,5 @@
limitations under the License. limitations under the License.
--> -->
<shape xmlns:android="http://schemas.android.com/apk/res/android" > <shape xmlns:android="http://schemas.android.com/apk/res/android" >
<solid android:color="?android:attr/colorPrimary" /> <solid android:color="?android:attr/colorBackgroundFloating" />
</shape> </shape>

1
packages/SystemUI/res/layout/global_actions_wrapped.xml
View File

@@ -6,6 +6,7 @@
android:layout_marginBottom="0dp" android:layout_marginBottom="0dp"
android:paddingTop="@dimen/global_actions_top_padding" android:paddingTop="@dimen/global_actions_top_padding"
android:clipToPadding="false" android:clipToPadding="false"
android:theme="@style/qs_theme"
android:clipChildren="false"> android:clipChildren="false">
<LinearLayout <LinearLayout

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

@@ -21,6 +21,7 @@
android:layout_marginBottom="@dimen/volume_dialog_margin_bottom" android:layout_marginBottom="@dimen/volume_dialog_margin_bottom"
android:background="@drawable/volume_dialog_background" android:background="@drawable/volume_dialog_background"
android:paddingTop="@dimen/volume_dialog_padding_top" android:paddingTop="@dimen/volume_dialog_padding_top"
android:theme="@style/qs_theme"
android:translationZ="4dp" > android:translationZ="4dp" >
<LinearLayout <LinearLayout

20
packages/SystemUI/src/com/android/systemui/HardwareBgDrawable.java
View File

@@ -22,7 +22,8 @@ import android.graphics.PixelFormat;
import android.graphics.Rect; import android.graphics.Rect;
import android.graphics.drawable.Drawable; import android.graphics.drawable.Drawable;
import android.graphics.drawable.LayerDrawable; import android.graphics.drawable.LayerDrawable;
import android.util.Log;
import com.android.settingslib.Utils;
public class HardwareBgDrawable extends LayerDrawable { public class HardwareBgDrawable extends LayerDrawable {
@@ -43,22 +44,25 @@ public class HardwareBgDrawable extends LayerDrawable {
} }
mRoundTop = roundTop; mRoundTop = roundTop;
mLayers = layers; mLayers = layers;
mLayers[1].setTint(0xffeeeeee);
} }
private static Drawable[] getLayers(Context context, boolean roundTop, boolean roundEnd) { private static Drawable[] getLayers(Context context, boolean roundTop, boolean roundEnd) {
int drawable = roundEnd ? R.drawable.rounded_bg_full : R.drawable.rounded_bg; int drawable = roundEnd ? R.drawable.rounded_bg_full : R.drawable.rounded_bg;
final Drawable[] layers;
if (roundTop) { if (roundTop) {
return new Drawable[]{ layers = new Drawable[]{
context.getDrawable(drawable).mutate(), context.getDrawable(drawable).mutate(),
context.getDrawable(drawable).mutate(), context.getDrawable(drawable).mutate(),
}; };
} else {
layers = new Drawable[]{
context.getDrawable(drawable).mutate(),
context.getDrawable(roundEnd ? R.drawable.rounded_full_bg_bottom
: R.drawable.rounded_bg_bottom).mutate(),
};
} }
return new Drawable[]{ layers[1].setTint(Utils.getColorAttr(context, android.R.attr.colorPrimaryDark));
context.getDrawable(drawable).mutate(), return layers;
context.getDrawable(roundEnd ? R.drawable.rounded_full_bg_bottom
: R.drawable.rounded_bg_bottom).mutate(),
};
} }
public void setCutPoint(int point) { public void setCutPoint(int point) {

5
packages/SystemUI/src/com/android/systemui/globalactions/GlobalActionsDialog.java
View File

@@ -68,6 +68,7 @@ import android.text.TextUtils;
import android.util.ArraySet; import android.util.ArraySet;
import android.util.Log; import android.util.Log;
import android.util.MathUtils; import android.util.MathUtils;
import android.view.ContextThemeWrapper;
import android.view.LayoutInflater; import android.view.LayoutInflater;
import android.view.View; import android.view.View;
import android.view.ViewGroup; import android.view.ViewGroup;
@@ -143,7 +144,7 @@ class GlobalActionsDialog implements DialogInterface.OnDismissListener, DialogIn
* @param context everything needs a context :( * @param context everything needs a context :(
*/ */
public GlobalActionsDialog(Context context, GlobalActionsManager windowManagerFuncs) { public GlobalActionsDialog(Context context, GlobalActionsManager windowManagerFuncs) {
mContext = context; mContext = new ContextThemeWrapper(context, com.android.systemui.R.style.qs_theme);
mWindowManagerFuncs = windowManagerFuncs; mWindowManagerFuncs = windowManagerFuncs;
mAudioManager = (AudioManager) mContext.getSystemService(Context.AUDIO_SERVICE); mAudioManager = (AudioManager) mContext.getSystemService(Context.AUDIO_SERVICE);
mDreamManager = IDreamManager.Stub.asInterface( mDreamManager = IDreamManager.Stub.asInterface(
@@ -1226,7 +1227,7 @@ class GlobalActionsDialog implements DialogInterface.OnDismissListener, DialogIn
public ActionsDialog(Context context, OnClickListener clickListener, MyAdapter adapter, public ActionsDialog(Context context, OnClickListener clickListener, MyAdapter adapter,
OnItemLongClickListener longClickListener) { OnItemLongClickListener longClickListener) {
super(context, com.android.systemui.R.style.Theme_SystemUI_Dialog_GlobalActions); super(context, com.android.systemui.R.style.Theme_SystemUI_Dialog_GlobalActions);
mContext = getContext(); mContext = context;
mAdapter = adapter; mAdapter = adapter;
mClickListener = clickListener; mClickListener = clickListener;
mLongClickListener = longClickListener; mLongClickListener = longClickListener;

5
packages/SystemUI/src/com/android/systemui/globalactions/GlobalActionsImpl.java
View File

@@ -15,6 +15,7 @@
package com.android.systemui.globalactions; package com.android.systemui.globalactions;
import com.android.systemui.Dependency; import com.android.systemui.Dependency;
import com.android.systemui.R;
import com.android.systemui.plugins.GlobalActions; import com.android.systemui.plugins.GlobalActions;
import com.android.systemui.statusbar.policy.DeviceProvisionedController; import com.android.systemui.statusbar.policy.DeviceProvisionedController;
import com.android.systemui.statusbar.policy.KeyguardMonitor; import com.android.systemui.statusbar.policy.KeyguardMonitor;
@@ -38,9 +39,7 @@ public class GlobalActionsImpl implements GlobalActions {
@Override @Override
public void showGlobalActions(GlobalActionsManager manager) { public void showGlobalActions(GlobalActionsManager manager) {
if (mGlobalActions == null) { if (mGlobalActions == null) {
final ContextThemeWrapper context = new ContextThemeWrapper(mContext, mGlobalActions = new GlobalActionsDialog(mContext, manager);
android.R.style.Theme_Material_Light);
mGlobalActions = new GlobalActionsDialog(context, manager);
} }
mGlobalActions.showDialog(mKeyguardMonitor.isShowing(), mGlobalActions.showDialog(mKeyguardMonitor.isShowing(),
mDeviceProvisionedController.isDeviceProvisioned()); mDeviceProvisionedController.isDeviceProvisioned());

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

@@ -53,6 +53,7 @@ import android.util.DisplayMetrics;
import android.util.Log; import android.util.Log;
import android.util.Slog; import android.util.Slog;
import android.util.SparseBooleanArray; import android.util.SparseBooleanArray;
import android.view.ContextThemeWrapper;
import android.view.Gravity; import android.view.Gravity;
import android.view.MotionEvent; import android.view.MotionEvent;
import android.view.View; import android.view.View;
@@ -151,7 +152,7 @@ public class VolumeDialogImpl implements VolumeDialog, TunerService.Tunable {
private TunerZenModePanel mZenPanel; private TunerZenModePanel mZenPanel;
public VolumeDialogImpl(Context context) { public VolumeDialogImpl(Context context) {
mContext = context; mContext = new ContextThemeWrapper(context, com.android.systemui.R.style.qs_theme);
mZenModeController = Dependency.get(ZenModeController.class); mZenModeController = Dependency.get(ZenModeController.class);
mController = Dependency.get(VolumeDialogController.class); mController = Dependency.get(VolumeDialogController.class);
mKeyguard = (KeyguardManager) mContext.getSystemService(Context.KEYGUARD_SERVICE); mKeyguard = (KeyguardManager) mContext.getSystemService(Context.KEYGUARD_SERVICE);