diff options
11 files changed, 104 insertions, 112 deletions
diff --git a/packages/SystemUI/res/layout-land/global_actions_grid.xml b/packages/SystemUI/res/layout-land/global_actions_grid.xml index 4619430d6b47..6a1081239302 100644 --- a/packages/SystemUI/res/layout-land/global_actions_grid.xml +++ b/packages/SystemUI/res/layout-land/global_actions_grid.xml @@ -28,10 +28,10 @@ android:orientation="vertical" android:layout_marginTop="@dimen/global_actions_grid_side_margin" android:translationZ="@dimen/global_actions_translate" - android:paddingLeft="@dimen/global_actions_grid_horizontal_padding" - android:paddingRight="@dimen/global_actions_grid_horizontal_padding" - android:paddingTop="@dimen/global_actions_grid_vertical_padding" - android:paddingBottom="@dimen/global_actions_grid_vertical_padding" + android:paddingLeft="@dimen/global_actions_grid_vertical_padding" + android:paddingRight="@dimen/global_actions_grid_vertical_padding" + android:paddingTop="@dimen/global_actions_grid_horizontal_padding" + android:paddingBottom="@dimen/global_actions_grid_horizontal_padding" android:background="?android:attr/colorBackgroundFloating" > <LinearLayout @@ -60,10 +60,10 @@ android:layout_height="wrap_content" android:layout_marginTop="@dimen/global_actions_grid_side_margin" android:layout_marginBottom="@dimen/global_actions_grid_side_margin" - android:paddingLeft="@dimen/global_actions_grid_horizontal_padding" - android:paddingRight="@dimen/global_actions_grid_horizontal_padding" - android:paddingTop="@dimen/global_actions_grid_vertical_padding" - android:paddingBottom="@dimen/global_actions_grid_vertical_padding" + android:paddingLeft="@dimen/global_actions_grid_vertical_padding" + android:paddingRight="@dimen/global_actions_grid_vertical_padding" + android:paddingTop="@dimen/global_actions_grid_horizontal_padding" + android:paddingBottom="@dimen/global_actions_grid_horizontal_padding" android:orientation="horizontal" android:layoutDirection="ltr" android:background="?android:attr/colorBackgroundFloating" diff --git a/packages/SystemUI/res/layout-land/global_actions_grid_item.xml b/packages/SystemUI/res/layout-land/global_actions_grid_item.xml new file mode 100644 index 000000000000..bc1233828b4d --- /dev/null +++ b/packages/SystemUI/res/layout-land/global_actions_grid_item.xml @@ -0,0 +1,71 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- + ~ Copyright (C) 2019 The Android Open Source Project + ~ + ~ Licensed under the Apache License, Version 2.0 (the "License"); + ~ you may not use this file except in compliance with the License. + ~ You may obtain a copy of the License at + ~ + ~ http://www.apache.org/licenses/LICENSE-2.0 + ~ + ~ Unless required by applicable law or agreed to in writing, software + ~ distributed under the License is distributed on an "AS IS" BASIS, + ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + ~ See the License for the specific language governing permissions and + ~ limitations under the License + --> + +<!-- RelativeLayouts have an issue enforcing minimum heights, so just + work around this for now with LinearLayouts. --> +<LinearLayout + xmlns:android="http://schemas.android.com/apk/res/android" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:gravity="center" + android:layout_marginTop="@dimen/global_actions_grid_item_side_margin" + android:layout_marginBottom="@dimen/global_actions_grid_item_side_margin" + android:layout_marginLeft="@dimen/global_actions_grid_item_vertical_margin" + android:layout_marginRight="@dimen/global_actions_grid_item_vertical_margin" +> + <LinearLayout + android:layout_width="@dimen/global_actions_grid_item_height" + android:layout_height="@dimen/global_actions_grid_item_width" + android:gravity="top|center_horizontal" + android:orientation="vertical" + > + <ImageView + android:id="@*android:id/icon" + android:layout_width="@dimen/global_actions_grid_item_icon_width" + android:layout_height="@dimen/global_actions_grid_item_icon_height" + android:layout_marginTop="@dimen/global_actions_grid_item_icon_top_margin" + android:layout_marginBottom="@dimen/global_actions_grid_item_icon_bottom_margin" + android:layout_marginLeft="@dimen/global_actions_grid_item_icon_side_margin" + android:layout_marginRight="@dimen/global_actions_grid_item_icon_side_margin" + android:scaleType="centerInside" + android:tint="@color/global_actions_text" + /> + + <TextView + android:id="@*android:id/message" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:ellipsize="marquee" + android:marqueeRepeatLimit="marquee_forever" + android:singleLine="true" + android:gravity="center" + android:textSize="12dp" + android:textColor="@color/global_actions_text" + android:textAppearance="?android:attr/textAppearanceSmall" + /> + + <TextView + android:visibility="gone" + android:id="@*android:id/status" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:gravity="center" + android:textColor="@color/global_actions_text" + android:textAppearance="?android:attr/textAppearanceSmall" + /> + </LinearLayout> +</LinearLayout> diff --git a/packages/SystemUI/res/layout-land/global_actions_grid_seascape.xml b/packages/SystemUI/res/layout-land/global_actions_grid_seascape.xml index 4ece03b9b8e3..79c51d9576da 100644 --- a/packages/SystemUI/res/layout-land/global_actions_grid_seascape.xml +++ b/packages/SystemUI/res/layout-land/global_actions_grid_seascape.xml @@ -29,10 +29,10 @@ android:layout_height="wrap_content" android:layout_marginTop="@dimen/global_actions_grid_side_margin" android:layout_marginBottom="@dimen/global_actions_grid_side_margin" - android:paddingLeft="@dimen/global_actions_grid_horizontal_padding" - android:paddingRight="@dimen/global_actions_grid_horizontal_padding" - android:paddingTop="@dimen/global_actions_grid_vertical_padding" - android:paddingBottom="@dimen/global_actions_grid_vertical_padding" + android:paddingLeft="@dimen/global_actions_grid_vertical_padding" + android:paddingRight="@dimen/global_actions_grid_vertical_padding" + android:paddingTop="@dimen/global_actions_grid_horizontal_padding" + android:paddingBottom="@dimen/global_actions_grid_horizontal_padding" android:orientation="horizontal" android:layoutDirection="rtl" android:background="?android:attr/colorBackgroundFloating" @@ -49,10 +49,10 @@ android:orientation="vertical" android:layout_marginBottom="@dimen/global_actions_grid_side_margin" android:translationZ="@dimen/global_actions_translate" - android:paddingLeft="@dimen/global_actions_grid_horizontal_padding" - android:paddingRight="@dimen/global_actions_grid_horizontal_padding" - android:paddingTop="@dimen/global_actions_grid_vertical_padding" - android:paddingBottom="@dimen/global_actions_grid_vertical_padding" + android:paddingLeft="@dimen/global_actions_grid_vertical_padding" + android:paddingRight="@dimen/global_actions_grid_vertical_padding" + android:paddingTop="@dimen/global_actions_grid_horizontal_padding" + android:paddingBottom="@dimen/global_actions_grid_horizontal_padding" android:background="?android:attr/colorBackgroundFloating" > <LinearLayout diff --git a/packages/SystemUI/res/layout/global_actions_grid_item.xml b/packages/SystemUI/res/layout/global_actions_grid_item.xml index 3cefce071a1e..4404c87432fe 100644 --- a/packages/SystemUI/res/layout/global_actions_grid_item.xml +++ b/packages/SystemUI/res/layout/global_actions_grid_item.xml @@ -18,8 +18,8 @@ work around this for now with LinearLayouts. --> <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:layout_width="@dimen/global_actions_grid_item_width" - android:layout_height="@dimen/global_actions_grid_item_height" + android:layout_width="wrap_content" + android:layout_height="wrap_content" android:gravity="center" android:layout_marginTop="@dimen/global_actions_grid_item_vertical_margin" android:layout_marginBottom="@dimen/global_actions_grid_item_vertical_margin" @@ -41,7 +41,7 @@ android:layout_marginLeft="@dimen/global_actions_grid_item_icon_side_margin" android:layout_marginRight="@dimen/global_actions_grid_item_icon_side_margin" android:scaleType="centerInside" - android:alpha="?android:attr/primaryContentAlpha" + android:tint="@color/global_actions_text" /> <TextView @@ -53,6 +53,7 @@ android:singleLine="true" android:gravity="center" android:textSize="12dp" + android:textColor="@color/global_actions_text" android:textAppearance="?android:attr/textAppearanceSmall" /> @@ -62,7 +63,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:gravity="center" - android:textColor="?android:attr/textColorTertiary" + android:textColor="@color/global_actions_text" android:textAppearance="?android:attr/textAppearanceSmall" /> </LinearLayout> diff --git a/packages/SystemUI/res/values-sw320dp-land/dimens.xml b/packages/SystemUI/res/values-sw320dp-land/dimens.xml deleted file mode 100644 index 2ec5abd673cb..000000000000 --- a/packages/SystemUI/res/values-sw320dp-land/dimens.xml +++ /dev/null @@ -1,27 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- - ~ Copyright (C) 2019 The Android Open Source Project - ~ - ~ Licensed under the Apache License, Version 2.0 (the "License"); - ~ you may not use this file except in compliance with the License. - ~ You may obtain a copy of the License at - ~ - ~ http://www.apache.org/licenses/LICENSE-2.0 - ~ - ~ Unless required by applicable law or agreed to in writing, software - ~ distributed under the License is distributed on an "AS IS" BASIS, - ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - ~ See the License for the specific language governing permissions and - ~ limitations under the License - --> -<resources> - - <!-- Global actions grid --> - <dimen name="global_actions_grid_vertical_padding">3dp</dimen> - <dimen name="global_actions_grid_horizontal_padding">0dp</dimen> - - <dimen name="global_actions_grid_item_side_margin">4dp</dimen> - <dimen name="global_actions_grid_item_vertical_margin">5dp</dimen> - -</resources> - diff --git a/packages/SystemUI/res/values-sw320dp/dimens.xml b/packages/SystemUI/res/values-sw320dp/dimens.xml index 4390d35e2ad2..2774554ec642 100644 --- a/packages/SystemUI/res/values-sw320dp/dimens.xml +++ b/packages/SystemUI/res/values-sw320dp/dimens.xml @@ -16,7 +16,7 @@ --> <resources> <!-- Global actions grid --> - <dimen name="global_actions_grid_vertical_padding">0dp</dimen> + <dimen name="global_actions_grid_vertical_padding">3dp</dimen> <dimen name="global_actions_grid_horizontal_padding">3dp</dimen> <dimen name="global_actions_grid_item_side_margin">5dp</dimen> @@ -24,9 +24,9 @@ <dimen name="global_actions_grid_item_width">64dp</dimen> <dimen name="global_actions_grid_item_height">64dp</dimen> - <dimen name="global_actions_grid_item_icon_width">18dp</dimen> - <dimen name="global_actions_grid_item_icon_height">18dp</dimen> - <dimen name="global_actions_grid_item_icon_top_margin">10dp</dimen> + <dimen name="global_actions_grid_item_icon_width">20dp</dimen> + <dimen name="global_actions_grid_item_icon_height">20dp</dimen> + <dimen name="global_actions_grid_item_icon_top_margin">12dp</dimen> <dimen name="global_actions_grid_item_icon_side_margin">22dp</dimen> <dimen name="global_actions_grid_item_icon_bottom_margin">4dp</dimen> diff --git a/packages/SystemUI/res/values-sw392dp-land/dimens.xml b/packages/SystemUI/res/values-sw392dp-land/dimens.xml deleted file mode 100644 index c718614d3958..000000000000 --- a/packages/SystemUI/res/values-sw392dp-land/dimens.xml +++ /dev/null @@ -1,27 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- - ~ Copyright (C) 2019 The Android Open Source Project - ~ - ~ Licensed under the Apache License, Version 2.0 (the "License"); - ~ you may not use this file except in compliance with the License. - ~ You may obtain a copy of the License at - ~ - ~ http://www.apache.org/licenses/LICENSE-2.0 - ~ - ~ Unless required by applicable law or agreed to in writing, software - ~ distributed under the License is distributed on an "AS IS" BASIS, - ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - ~ See the License for the specific language governing permissions and - ~ limitations under the License - --> -<resources> - - <!-- Global actions grid --> - <dimen name="global_actions_grid_vertical_padding">3dp</dimen> - <dimen name="global_actions_grid_horizontal_padding">0dp</dimen> - - <dimen name="global_actions_grid_item_side_margin">6dp</dimen> - <dimen name="global_actions_grid_item_vertical_margin">10dp</dimen> - -</resources> - diff --git a/packages/SystemUI/res/values-sw392dp/dimens.xml b/packages/SystemUI/res/values-sw392dp/dimens.xml index 2557ff4bb578..be1d9528db1d 100644 --- a/packages/SystemUI/res/values-sw392dp/dimens.xml +++ b/packages/SystemUI/res/values-sw392dp/dimens.xml @@ -16,7 +16,7 @@ --> <resources> <!-- Global actions grid --> - <dimen name="global_actions_grid_vertical_padding">0dp</dimen> + <dimen name="global_actions_grid_vertical_padding">6dp</dimen> <dimen name="global_actions_grid_horizontal_padding">3dp</dimen> <dimen name="global_actions_grid_item_side_margin">10dp</dimen> @@ -26,7 +26,7 @@ <dimen name="global_actions_grid_item_icon_width">22dp</dimen> <dimen name="global_actions_grid_item_icon_height">22dp</dimen> - <dimen name="global_actions_grid_item_icon_top_margin">12dp</dimen> + <dimen name="global_actions_grid_item_icon_top_margin">14dp</dimen> <dimen name="global_actions_grid_item_icon_side_margin">22dp</dimen> <dimen name="global_actions_grid_item_icon_bottom_margin">4dp</dimen> diff --git a/packages/SystemUI/res/values-sw410dp-land/dimens.xml b/packages/SystemUI/res/values-sw410dp-land/dimens.xml deleted file mode 100644 index 61ba2d02da9e..000000000000 --- a/packages/SystemUI/res/values-sw410dp-land/dimens.xml +++ /dev/null @@ -1,27 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- - ~ Copyright (C) 2019 The Android Open Source Project - ~ - ~ Licensed under the Apache License, Version 2.0 (the "License"); - ~ you may not use this file except in compliance with the License. - ~ You may obtain a copy of the License at - ~ - ~ http://www.apache.org/licenses/LICENSE-2.0 - ~ - ~ Unless required by applicable law or agreed to in writing, software - ~ distributed under the License is distributed on an "AS IS" BASIS, - ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - ~ See the License for the specific language governing permissions and - ~ limitations under the License - --> -<resources> - - <!-- Global actions grid --> - <dimen name="global_actions_grid_vertical_padding">4dp</dimen> - <dimen name="global_actions_grid_horizontal_padding">8dp</dimen> - - <dimen name="global_actions_grid_item_side_margin">8dp</dimen> - <dimen name="global_actions_grid_item_vertical_margin">12dp</dimen> - -</resources> - diff --git a/packages/SystemUI/res/values/colors.xml b/packages/SystemUI/res/values/colors.xml index 811f1a3a864b..f41566178d33 100644 --- a/packages/SystemUI/res/values/colors.xml +++ b/packages/SystemUI/res/values/colors.xml @@ -39,16 +39,16 @@ <color name="qs_customize_decoration">@color/GM2_grey_100</color> <!-- The color of the background in the separated list of the Global Actions menu --> - <color name="global_actions_separated_background">@color/GM2_grey_300</color> + <color name="global_actions_separated_background">#F5F5F5</color> <!-- The color of the background in the grid of the Global Actions menu --> - <color name="global_actions_grid_background">@color/GM2_grey_200</color> + <color name="global_actions_grid_background">#F1F3F4</color> <!-- The color of the text in the Global Actions menu --> - <color name="global_actions_text">@color/GM2_grey_900</color> + <color name="global_actions_text">@color/GM2_grey_700</color> <!-- The color of the text in the Global Actions menu --> - <color name="global_actions_alert_text">@color/GM2_red_500</color> + <color name="global_actions_alert_text">@color/GM2_red_700</color> <!-- Tint color for the content on the notification overflow card. --> <color name="keyguard_overflow_content_color">#ff686868</color> @@ -185,6 +185,7 @@ <color name="GM2_red_300">#F28B82</color> <color name="GM2_red_500">#B71C1C</color> + <color name="GM2_red_700">#C5221F</color> <color name="GM2_blue_200">#AECBFA</color> <color name="GM2_blue_700">#1967D2</color> diff --git a/packages/SystemUI/res/values/dimens.xml b/packages/SystemUI/res/values/dimens.xml index ec538ffec921..b27836d640d8 100644 --- a/packages/SystemUI/res/values/dimens.xml +++ b/packages/SystemUI/res/values/dimens.xml @@ -950,7 +950,7 @@ <!-- Global actions grid layout --> <dimen name="global_actions_grid_side_margin">4dp</dimen> - <dimen name="global_actions_grid_container_bottom_margin">4dp</dimen> + <dimen name="global_actions_grid_container_bottom_margin">8dp</dimen> <!-- Used to workaround a bug where shadows are clipped during animations by expanding the bounds of the parent view. --> |