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

Commit d5235843 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Create 2 pane layout for large screen displays."

parents d2007c37 4f3f64f5

packages/SystemUI/res/layout-sw600dp-land/global_actions_grid_v2.xml

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

<!--

  ~ Copyright (C) 2020 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.

  -->



<LinearLayout

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

    android:id="@+id/global_actions_container"

    android:layout_width="match_parent"

    android:layout_height="match_parent"

    android:orientation="horizontal">



  <LinearLayout

      android:layout_weight="1"

      android:layout_height="match_parent"

      android:layout_width="0dp"

      android:clipChildren="false"

      android:orientation="vertical"

      android:clipToPadding="false"

      android:id="@+id/controls_pane"

      >

        <LinearLayout

            android:id="@+id/global_actions_controls"

            android:layout_width="match_parent"

            android:layout_height="wrap_content"

            android:orientation="vertical"/>

  </LinearLayout>



  <LinearLayout

      android:layout_weight="1"

      android:layout_height="match_parent"

      android:layout_width="0dp"

      android:orientation="vertical"

      android:id="@+id/nfc_pane"

      >

    <include layout="@layout/global_actions_view" />



    <include layout="@layout/global_actions_lock_view" />



      <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">



        <FrameLayout

            android:id="@+id/global_actions_wallet"

            android:layout_width="match_parent"

            android:layout_height="wrap_content"/>



      </LinearLayout>



  </LinearLayout>

</LinearLayout>

packages/SystemUI/res/layout-sw600dp/global_actions_controls_list_view.xml

0 → 100644
+30 −0
Original line number Diff line number Diff line 
<!--

  ~ Copyright (C) 2020 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.

  -->



<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:orientation="vertical"

    android:scrollbars="none">

  <LinearLayout

      android:id="@+id/global_actions_controls_list"

      android:layout_width="match_parent"

      android:layout_height="wrap_content"

      android:orientation="vertical"

      android:layout_marginLeft="@dimen/global_actions_side_margin"

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

</com.android.systemui.globalactions.MinHeightScrollView>
 
 No newline at end of file

packages/SystemUI/res/layout-sw600dp/global_actions_grid_v2.xml

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

<!--

  ~ Copyright (C) 2020 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.

  -->



<LinearLayout

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

    android:id="@+id/global_actions_container"

    android:layout_width="match_parent"

    android:layout_height="match_parent"

    android:orientation="vertical">



  <LinearLayout

      android:layout_weight="1"

      android:layout_height="0dp"

      android:layout_width="match_parent"

      android:orientation="vertical"

      android:id="@+id/nfc_pane"

      >



    <include layout="@layout/global_actions_view" />



    <include layout="@layout/global_actions_lock_view" />





    <com.android.systemui.globalactions.MinHeightScrollView

        android:layout_width="match_parent"

        android:layout_height="match_parent"

        android:orientation="vertical"

        android:scrollbars="none">



      <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">



        <FrameLayout

            android:id="@+id/global_actions_wallet"

            android:layout_width="match_parent"

            android:layout_height="wrap_content"/>



      </LinearLayout>

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



  </LinearLayout>



  <LinearLayout

      android:layout_weight="1"

      android:layout_height="0dp"

      android:layout_width="match_parent"

      android:orientation="vertical"

      android:id="@+id/controls_pane"

      android:clipToPadding="false"

      android:clipChildren="false">

        <LinearLayout

            android:id="@+id/global_actions_controls"

            android:layout_width="match_parent"

            android:layout_height="wrap_content"

            android:orientation="vertical"/>

  </LinearLayout>

</LinearLayout>

packages/SystemUI/res/layout/controls_with_favorites.xml

+1 −7
Original line number Diff line number Diff line
@@ -58,11 +58,5 @@ 
        android:background="?android:attr/selectableItemBackgroundBorderless" />

  </LinearLayout>



  <LinearLayout

      android:id="@+id/global_actions_controls_list"

      android:layout_width="match_parent"

      android:layout_height="wrap_content"

      android:orientation="vertical"

      android:layout_marginLeft="@dimen/global_actions_side_margin"

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

  <include layout="@layout/global_actions_controls_list_view" />

</merge>

packages/SystemUI/res/layout/global_actions_controls_list_view.xml

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

<LinearLayout

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

    android:id="@+id/global_actions_controls_list"

    android:layout_width="match_parent"

    android:layout_height="wrap_content"

    android:orientation="vertical"

    android:layout_marginLeft="@dimen/global_actions_side_margin"

    android:layout_marginRight="@dimen/global_actions_side_margin" />
 
 No newline at end of file