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

Merge "Global actions visuals - color and ordering changes." into pi-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2018-03-08 15:01:46 +00:00
committed by Android (Google) Code Review
parent db66bede99 3be52dbfa6
commit 4a28bbaf8f
7 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
core/res/res/values/config.xml
View File

@@ -2513,9 +2513,8 @@
<item>restart</item> <item>restart</item>
<item>lockdown</item> <item>lockdown</item>
<item>logout</item> <item>logout</item>
<item>screenshot</item>
<item>bugreport</item> <item>bugreport</item>
<item>users</item> <item>screenshot</item>
</string-array> </string-array>
<!-- Number of milliseconds to hold a wake lock to ensure that drawing is fully <!-- Number of milliseconds to hold a wake lock to ensure that drawing is fully

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="?android:attr/colorPrimary" /> <solid android:color="?android:attr/colorBackgroundFloating" />
<corners <corners
android:bottomLeftRadius="@dimen/corner_size" android:bottomLeftRadius="@dimen/corner_size"
android:topLeftRadius="@dimen/corner_size" android:topLeftRadius="@dimen/corner_size"

4
packages/SystemUI/res/layout/global_actions_item.xml
View File

@@ -33,7 +33,9 @@
android:layout_width="24dp" android:layout_width="24dp"
android:layout_height="24dp" android:layout_height="24dp"
android:layout_gravity="center" android:layout_gravity="center"
android:scaleType="center"/> android:scaleType="center"
android:alpha="?android:attr/primaryContentAlpha"
/>
<TextView <TextView
android:id="@*android:id/message" android:id="@*android:id/message"

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

@@ -17,7 +17,7 @@
android:layout_gravity="top|right" android:layout_gravity="top|right"
android:gravity="center" android:gravity="center"
android:orientation="vertical" android:orientation="vertical"
android:padding="12dp" android:padding="16dp"
android:translationZ="8dp" /> android:translationZ="9dp" />
</com.android.systemui.HardwareUiLayout> </com.android.systemui.HardwareUiLayout>

2
packages/SystemUI/res/values/dimens.xml
View File

@@ -882,7 +882,7 @@
burn-in on AOD --> burn-in on AOD -->
<dimen name="burn_in_prevention_offset_y">50dp</dimen> <dimen name="burn_in_prevention_offset_y">50dp</dimen>
<dimen name="corner_size">16dp</dimen> <dimen name="corner_size">8dp</dimen>
<dimen name="top_padding">0dp</dimen> <dimen name="top_padding">0dp</dimen>
<dimen name="bottom_padding">48dp</dimen> <dimen name="bottom_padding">48dp</dimen>
<dimen name="edge_margin">16dp</dimen> <dimen name="edge_margin">16dp</dimen>

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

@@ -61,7 +61,7 @@ public class HardwareBgDrawable extends LayerDrawable {
: R.drawable.rounded_bg_bottom).mutate(), : R.drawable.rounded_bg_bottom).mutate(),
}; };
} }
layers[1].setTint(Utils.getColorAttr(context, android.R.attr.colorPrimaryDark)); layers[1].setTint(Utils.getColorAttr(context, android.R.attr.colorPrimary));
return layers; return layers;
} }

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

@@ -877,9 +877,8 @@ class GlobalActionsDialog implements DialogInterface.OnDismissListener,
public View getView(int position, View convertView, ViewGroup parent) { public View getView(int position, View convertView, ViewGroup parent) {
Action action = getItem(position); Action action = getItem(position);
View view = action.create(mContext, convertView, parent, LayoutInflater.from(mContext)); View view = action.create(mContext, convertView, parent, LayoutInflater.from(mContext));
// Power off, restart, logout (if present) and lockdown (if present) should be in white // Everything but screenshot, the last item, gets white background.
// background. Set the division based on which buttons are currently being displayed. if (position == getCount() - 1) {
if (position == 2 + (mHasLogoutButton ? 1 : 0) + (mHasLockdownButton ? 1 : 0)) {
HardwareUiLayout.get(parent).setDivisionView(view); HardwareUiLayout.get(parent).setDivisionView(view);
} }
return view; return view;