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

Commit 12055474 authored by Steve McKay's avatar Steve McKay
Browse files

Show a drawer when in portrait mode. 

This makes more space available for content.
Rename all the "Standalone" stuff to just "Files".
Move layout inflation into base class.
Move backbutton > drawer interaction into BaseActivity.

Change-Id: Ie778b323c6e80122389f029be148dd9e0c4bfb6e
parent b347436a

packages/DocumentsUI/AndroidManifest.xml

+2 −2
Original line number Diff line number Diff line
@@ -48,8 +48,8 @@ 
        </activity>



        <activity

            android:name=".StandaloneActivity"

            android:theme="@style/StandaloneTheme"

            android:name=".FilesActivity"

            android:theme="@style/FilesTheme"

            android:icon="@drawable/ic_files_app"

            android:label="@string/files_label"

            android:enabled="@bool/productivity_device">

packages/DocumentsUI/res/layout-sw720dp-land/files_activity.xml

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

<!-- Copyright (C) 2015 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.

-->



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

    android:id="@+id/stub"

    android:inflatedId="@+id/fixed_layout"

    android:layout="@layout/fixed_layout"

    android:layout_width="match_parent"

    android:layout_height="match_parent" />

packages/DocumentsUI/res/layout-sw720dp/activity.xml

+5 −61
Original line number Diff line number Diff line
@@ -14,65 +14,9 @@ 
     limitations under the License.

-->



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

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

    android:id="@+id/stub"

    android:inflatedId="@+id/drawer_layout"

    android:layout="@layout/drawer_layout"

    android:layout_width="match_parent"

    android:layout_height="match_parent"

    android:orientation="vertical">



    <com.android.documentsui.DocumentsToolBar

        android:id="@+id/toolbar"

        android:layout_width="match_parent"

        android:layout_height="?android:attr/actionBarSize"

        android:background="?android:attr/colorPrimary"

        android:elevation="8dp"

        android:theme="?android:attr/actionBarTheme">



        <Spinner

            android:id="@+id/stack"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:layout_marginStart="4dp"

            android:overlapAnchor="true" />



    </com.android.documentsui.DocumentsToolBar>



    <LinearLayout

        android:layout_width="match_parent"

        android:layout_height="0dp"

        android:layout_weight="1"

        android:orientation="horizontal"

        android:baselineAligned="false"

        android:divider="?android:attr/dividerVertical"

        android:showDividers="middle">



        <FrameLayout

            android:id="@+id/container_roots"

            android:layout_width="256dp"

    android:layout_height="match_parent" />
 


        <LinearLayout

            android:layout_width="0dp"

            android:layout_height="match_parent"

            android:layout_weight="1"

            android:orientation="vertical"

            android:background="@color/material_grey_50"

            android:elevation="8dp">



            <com.android.documentsui.DirectoryContainerView

                android:id="@+id/container_directory"

                android:layout_width="match_parent"

                android:layout_height="0dp"

                android:layout_weight="1" />



            <FrameLayout

                android:id="@+id/container_save"

                android:layout_width="match_parent"

                android:layout_height="wrap_content"

                android:background="@color/material_grey_50"

                android:elevation="8dp" />



        </LinearLayout>



    </LinearLayout>



</LinearLayout>

packages/DocumentsUI/res/layout-sw720dp/files_activity.xml

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

<!-- Copyright (C) 2015 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.

-->



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

    android:id="@+id/stub"

    android:inflatedId="@+id/drawer_layout"

    android:layout="@layout/drawer_layout"

    android:layout_width="match_parent"

    android:layout_height="match_parent" />

packages/DocumentsUI/res/layout/activity.xml

+5 −67
Original line number Diff line number Diff line
@@ -14,71 +14,9 @@ 
     limitations under the License.

-->



<android.support.v4.widget.DrawerLayout xmlns:android="http://schemas.android.com/apk/res/android"

    android:id="@+id/drawer_layout"

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

    android:id="@+id/stub"

    android:inflatedId="@+id/drawer_layout"

    android:layout="@layout/drawer_layout"

    android:layout_width="match_parent"

    android:layout_height="match_parent">



    <LinearLayout

        android:layout_width="match_parent"

        android:layout_height="match_parent"

        android:orientation="vertical">



        <com.android.documentsui.DocumentsToolBar

            android:id="@+id/toolbar"

            android:layout_width="match_parent"

            android:layout_height="?android:attr/actionBarSize"

            android:background="?android:attr/colorPrimary"

            android:elevation="8dp"

            android:theme="?android:attr/actionBarTheme">



            <Spinner

                android:id="@+id/stack"

                android:layout_width="wrap_content"

                android:layout_height="wrap_content"

                android:layout_marginStart="4dp"

                android:overlapAnchor="true" />



        </com.android.documentsui.DocumentsToolBar>



        <com.android.documentsui.DirectoryContainerView

            android:id="@+id/container_directory"

            android:layout_width="match_parent"

            android:layout_height="0dp"

            android:layout_weight="1" />



        <FrameLayout

            android:id="@+id/container_save"

            android:layout_width="match_parent"

            android:layout_height="wrap_content"

            android:background="@color/material_grey_50"

            android:elevation="8dp" />



    </LinearLayout>



    <LinearLayout

        android:id="@+id/drawer_roots"

        android:layout_width="256dp"

        android:layout_height="match_parent"

        android:layout_gravity="start"

        android:orientation="vertical"

        android:elevation="16dp"

        android:background="@*android:color/white">



        <Toolbar

            android:id="@+id/roots_toolbar"

            android:layout_width="match_parent"

            android:layout_height="?android:attr/actionBarSize"

            android:background="?android:attr/colorPrimary"

            android:elevation="8dp"

            android:theme="?android:attr/actionBarTheme" />



        <FrameLayout

            android:id="@+id/container_roots"

            android:layout_width="match_parent"

            android:layout_height="0dp"

            android:layout_weight="1" />



    </LinearLayout>



</android.support.v4.widget.DrawerLayout>
 
    android:layout_height="match_parent" />