diff options
5 files changed, 6 insertions, 7 deletions
diff --git a/core/res/res/layout/global_actions_item.xml b/core/res/res/layout/global_actions_item.xml index e5a9854d50c7..6ac0b1756234 100644 --- a/core/res/res/layout/global_actions_item.xml +++ b/core/res/res/layout/global_actions_item.xml @@ -13,6 +13,7 @@ See the License for the specific language governing permissions and limitations under the License. --> +<!-- Used with LegacyGlobalActions. --> <!-- RelativeLayouts have an issue enforcing minimum heights, so just work around this for now with LinearLayouts. --> diff --git a/packages/SystemUI/res/layout/global_actions_item.xml b/packages/SystemUI/res/layout/global_actions_item.xml index bf3aea8ab6dd..66a4b737d09b 100644 --- a/packages/SystemUI/res/layout/global_actions_item.xml +++ b/packages/SystemUI/res/layout/global_actions_item.xml @@ -25,8 +25,8 @@ android:minHeight="92dp" android:gravity="center" android:orientation="vertical" - android:paddingEnd="0dip" - android:paddingStart="0dip"> + android:paddingEnd="4dip" + android:paddingStart="4dip"> <ImageView android:id="@*android:id/icon" diff --git a/packages/SystemUI/res/layout/global_actions_wrapped.xml b/packages/SystemUI/res/layout/global_actions_wrapped.xml index 4a6af9e139d5..b715def73294 100644 --- a/packages/SystemUI/res/layout/global_actions_wrapped.xml +++ b/packages/SystemUI/res/layout/global_actions_wrapped.xml @@ -17,7 +17,7 @@ android:layout_gravity="top|right" android:gravity="center" android:orientation="vertical" - android:padding="16dp" + android:padding="12dp" android:translationZ="9dp" /> </com.android.systemui.HardwareUiLayout> diff --git a/packages/SystemUI/res/values/dimens.xml b/packages/SystemUI/res/values/dimens.xml index a1e5b0e6e5e2..875000c84260 100644 --- a/packages/SystemUI/res/values/dimens.xml +++ b/packages/SystemUI/res/values/dimens.xml @@ -899,8 +899,6 @@ <dimen name="default_gear_space">18dp</dimen> <dimen name="cell_overlay_padding">18dp</dimen> - <dimen name="hwui_edge_margin">16dp</dimen> - <dimen name="global_actions_panel_width">120dp</dimen> <dimen name="global_actions_top_padding">120dp</dimen> @@ -916,7 +914,7 @@ <dimen name="corner_size">8dp</dimen> <dimen name="top_padding">0dp</dimen> <dimen name="bottom_padding">48dp</dimen> - <dimen name="edge_margin">16dp</dimen> + <dimen name="edge_margin">8dp</dimen> <dimen name="rounded_corner_radius">0dp</dimen> <dimen name="rounded_corner_content_padding">0dp</dimen> diff --git a/packages/SystemUI/src/com/android/systemui/HardwareUiLayout.java b/packages/SystemUI/src/com/android/systemui/HardwareUiLayout.java index 3bdb247b64c2..98dc3219acc6 100644 --- a/packages/SystemUI/src/com/android/systemui/HardwareUiLayout.java +++ b/packages/SystemUI/src/com/android/systemui/HardwareUiLayout.java @@ -89,7 +89,7 @@ public class HardwareUiLayout extends FrameLayout implements Tunable { mEdgeBleed = Settings.Secure.getInt(getContext().getContentResolver(), EDGE_BLEED, 0) != 0; mRoundedDivider = Settings.Secure.getInt(getContext().getContentResolver(), - ROUNDED_DIVIDER, 1) != 0; + ROUNDED_DIVIDER, 0) != 0; updateEdgeMargin(mEdgeBleed ? 0 : getEdgePadding()); mBackground = new HardwareBgDrawable(mRoundedDivider, !mEdgeBleed, getContext()); if (mChild != null) { |