Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e9fed77d authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Align power menu items, for portrait and landscape" into rvc-dev am:... 

Merge "Align power menu items, for portrait and landscape" into rvc-dev am: 8a9ab840 am: 12296cf7

Change-Id: Id73c616da5b084e32556749b42bd74fa4725580e
parents 76cc7fac 12296cf7

packages/SystemUI/res/layout/controls_with_favorites.xml

+2 −2
Original line number Diff line number Diff line
@@ -72,6 +72,6 @@ 
      android:layout_height="wrap_content"

      android:orientation="vertical"

      android:paddingTop="30dp"

      android:layout_marginLeft="@dimen/controls_list_side_margin"

      android:layout_marginRight="@dimen/controls_list_side_margin" />

      android:layout_marginLeft="@dimen/global_actions_side_margin"

      android:layout_marginRight="@dimen/global_actions_side_margin" />

</merge>

packages/SystemUI/res/layout/global_actions_grid_item_v2.xml

+4 −3
Original line number Diff line number Diff line
@@ -18,15 +18,16 @@ 
     work around this for now with LinearLayouts. -->

<LinearLayout

    xmlns:android="http://schemas.android.com/apk/res/android"

    android:layout_width="wrap_content"

    android:layout_width="0dp"

    android:layout_weight="1"

    android:layout_height="wrap_content"

    android:gravity="center"

    android:paddingTop="@dimen/global_actions_grid_item_vertical_margin"

    android:paddingBottom="@dimen/global_actions_grid_item_vertical_margin"

    android:paddingLeft="@dimen/global_actions_grid_item_side_margin"

    android:paddingRight="@dimen/global_actions_grid_item_side_margin"

    android:layout_marginRight="3dp"

    android:layout_marginLeft="3dp"

    android:layout_marginRight="@dimen/control_base_item_margin"

    android:layout_marginLeft="@dimen/control_base_item_margin"

    android:background="@drawable/control_background">

    <LinearLayout

        android:layout_width="@dimen/global_actions_grid_item_width"

packages/SystemUI/res/layout/global_actions_grid_v2.xml

+4 −4
Original line number Diff line number Diff line
@@ -12,17 +12,17 @@ 
      android:layout_height="wrap_content"

      android:orientation="horizontal"

      android:theme="@style/qs_theme"

      android:gravity="top | center_horizontal"

      android:gravity="top"

      android:clipChildren="false"

      android:clipToPadding="false"

      android:layout_marginTop="@dimen/global_actions_top_margin"

  >

    <LinearLayout

        android:id="@android:id/list"

        android:layout_width="wrap_content"

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:layout_marginLeft="@dimen/global_actions_grid_side_margin"

        android:layout_marginRight="@dimen/global_actions_grid_side_margin"

        android:layout_marginLeft="@dimen/global_actions_side_margin"

        android:layout_marginRight="@dimen/global_actions_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"

packages/SystemUI/res/values-sw320dp/dimens.xml

+1 −1
Original line number Diff line number Diff line
@@ -31,6 +31,6 @@ 
    <dimen name="global_actions_grid_item_icon_bottom_margin">4dp</dimen>



    <!-- Home Controls -->

    <dimen name="controls_list_side_margin">10dp</dimen>

    <dimen name="global_actions_side_margin">10dp</dimen>

</resources>

packages/SystemUI/res/values-sw360dp/dimens.xml

+1 −1
Original line number Diff line number Diff line
@@ -27,6 +27,6 @@ 
    <dimen name="navigation_side_padding">40dip</dimen>



    <!-- Home Controls -->

    <dimen name="controls_list_side_margin">12dp</dimen>

    <dimen name="global_actions_side_margin">12dp</dimen>

</resources>