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

Commit 00b8648e authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

Merge "Scroll wallet and controls under power menu." into rvc-dev am: 61278391 

Change-Id: I86145fbc6c13a746801d06e90b478f6e4dba6133
parents 98cb4cce 61278391

packages/SystemUI/res/layout/global_actions_grid_v2.xml

+58 −54
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<ScrollView

<LinearLayout

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

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

    android:id="@+id/global_actions_container"

    android:layout_width="match_parent"

    android:layout_height="match_parent">



  <androidx.constraintlayout.widget.ConstraintLayout

      android:id="@+id/global_actions_grid_root"

      android:layout_width="match_parent"

    android:layout_height="match_parent"

      android:clipChildren="false"

      android:clipToPadding="false"

      android:paddingBottom="@dimen/global_actions_grid_container_shadow_offset"

      android:layout_marginBottom="@dimen/global_actions_grid_container_negative_shadow_offset">



    android:orientation="vertical"

>

  <com.android.systemui.globalactions.GlobalActionsFlatLayout

      android:id="@id/global_actions_view"

      android:layout_width="match_parent"

      android:layout_height="wrap_content"

      android:orientation="horizontal"

      android:theme="@style/qs_theme"

        app:layout_constraintTop_toTopOf="parent"

        app:layout_constraintLeft_toLeftOf="parent"

        app:layout_constraintRight_toRightOf="parent"

      android:gravity="top | center_horizontal"

      android:clipChildren="false"

      android:clipToPadding="false"

        android:layout_marginTop="@dimen/global_actions_top_margin">

      android:layout_marginTop="@dimen/global_actions_top_margin"

  >

    <LinearLayout

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

        android:layout_width="wrap_content"
@@ -40,22 +29,37 @@ 
        android:paddingBottom="@dimen/global_actions_grid_vertical_padding"

        android:orientation="horizontal"

        android:gravity="left"

          android:translationZ="@dimen/global_actions_translate" />

        android:translationZ="@dimen/global_actions_translate"

    />

  </com.android.systemui.globalactions.GlobalActionsFlatLayout>



  <com.android.systemui.globalactions.MinHeightScrollView

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

    android:layout_width="match_parent"

    android:layout_height="match_parent"

    android:paddingBottom="@dimen/global_actions_grid_container_shadow_offset"

    android:layout_marginBottom="@dimen/global_actions_grid_container_negative_shadow_offset"

    android:orientation="vertical"

  >

    <LinearLayout

        android:id="@+id/global_actions_grid_root"

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:clipChildren="false"

        android:orientation="vertical"

        android:clipToPadding="false"

    >

      <LinearLayout

          android:id="@+id/global_actions_panel"

          android:layout_width="match_parent"

          android:layout_height="wrap_content"

          android:orientation="vertical"

        app:layout_constraintLeft_toLeftOf="parent"

        app:layout_constraintRight_toRightOf="parent"

        app:layout_constraintTop_toBottomOf="@id/global_actions_view">



      >

        <FrameLayout

            android:id="@+id/global_actions_panel_container"

            android:layout_width="match_parent"

          android:layout_height="wrap_content" />

            android:layout_height="wrap_content"

        />

      </LinearLayout>



      <LinearLayout
@@ -63,9 +67,9 @@ 
          android:layout_width="match_parent"

          android:layout_height="wrap_content"

          android:orientation="vertical"

        app:layout_constraintLeft_toLeftOf="parent"

        app:layout_constraintRight_toRightOf="parent"

        app:layout_constraintTop_toBottomOf="@id/global_actions_panel"

        app:layout_constraintBottom_toBottomOf="parent" />

  </androidx.constraintlayout.widget.ConstraintLayout>

</ScrollView>
 
          android:layout_marginRight="@dimen/global_actions_grid_horizontal_padding"

          android:layout_marginLeft="@dimen/global_actions_grid_horizontal_padding"

      />

    </LinearLayout>

  </com.android.systemui.globalactions.MinHeightScrollView>

</LinearLayout>
 
 No newline at end of file

packages/SystemUI/res/layout/global_actions_wrapped.xml

deleted100644 → 0
+0 −38
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<com.android.systemui.HardwareUiLayout

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

    android:id="@id/global_actions_view"

    android:layout_width="match_parent"

    android:layout_height="match_parent"

    android:layout_gravity="top|right"

    android:layout_marginBottom="0dp"

    android:orientation="vertical"

    android:paddingTop="@dimen/global_actions_top_padding"

    android:clipToPadding="false"

    android:theme="@style/qs_theme"

    android:clipChildren="false">



    <!-- Global actions is right-aligned to be physically near power button -->

    <LinearLayout

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

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:layout_gravity="top|right"

        android:gravity="center"

        android:orientation="vertical"

        android:padding="@dimen/global_actions_padding"

        android:translationZ="@dimen/global_actions_translate" />



    <!-- For separated button-->

    <FrameLayout

        android:id="@+id/separated_button"

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:layout_gravity="top|right"

        android:layout_marginTop="6dp"

        android:gravity="center"

        android:orientation="vertical"

        android:padding="@dimen/global_actions_padding"

        android:translationZ="@dimen/global_actions_translate" />



</com.android.systemui.HardwareUiLayout>