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

Commit c75fa4a5 authored by Steve McKay's avatar Steve McKay Committed by Android (Google) Code Review
Browse files

Merge "Eliminate dialog mode from DocumentsUI."

parents 081dcb82 a8f03a2d

packages/DocumentsUI/AndroidManifest.xml

+2 −2
Original line number Original line Diff line number Diff line
@@ -40,7 +40,7 @@ 




        <activity

        <activity

            android:name=".DownloadsActivity"

            android:name=".DownloadsActivity"

            android:theme="@style/DocumentsFullScreenTheme"

            android:theme="@style/DocumentsTheme"

            android:label="@string/downloads_label"

            android:label="@string/downloads_label"

            android:icon="@drawable/ic_doc_text">

            android:icon="@drawable/ic_doc_text">

            <intent-filter>

            <intent-filter>
@@ -64,7 +64,7 @@ 




        <activity

        <activity

            android:name=".FilesActivity"

            android:name=".FilesActivity"

            android:theme="@style/DocumentsFullScreenTheme"

            android:theme="@style/DocumentsTheme"

            android:icon="@drawable/ic_files_app"

            android:icon="@drawable/ic_files_app"

            android:label="@string/files_label"

            android:label="@string/files_label"

            android:documentLaunchMode="intoExisting">

            android:documentLaunchMode="intoExisting">

packages/DocumentsUI/res/values-sw720dp/dimens.xml

+0 −4
Original line number Original line Diff line number Diff line
@@ -15,10 +15,6 @@ 
-->

-->





<resources>

<resources>

    <bool name="show_as_dialog">true</bool>



    <item type="dimen" name="dialog_width">85%</item>



    <dimen name="grid_padding_horiz">16dp</dimen>

    <dimen name="grid_padding_horiz">16dp</dimen>

    <dimen name="grid_padding_vert">16dp</dimen>

    <dimen name="grid_padding_vert">16dp</dimen>

packages/DocumentsUI/res/values-sw720dp/layouts.xml

deleted100644 → 0
+0 −19
Original line number Original line 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.

-->



<resources>

    <item name="docs_activity" type="layout">@layout/fixed_layout</item>

</resources>

packages/DocumentsUI/res/values-sw720dp/styles.xml

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

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

-->



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



    <style name="DocumentsBaseTheme" parent="@style/Theme.AppCompat.Light.Dialog">

        <!-- We do not specify width of window here because the max size of

             floating window specified by windowFixedWidthis is limited. -->

        <item name="*android:windowFixedHeightMajor">80%</item>

        <item name="*android:windowFixedHeightMinor">90%</item>

    </style>



</resources>

packages/DocumentsUI/res/values/attrs.xml

+1 −1
Original line number Original line Diff line number Diff line
@@ -14,7 +14,7 @@ 
     limitations under the License.

     limitations under the License.

-->

-->

<resources>

<resources>

    <declare-styleable name="DocumentsBaseTheme">

    <declare-styleable name="DocumentsTheme">

        <attr name="colorActionMode" format="color"/>

        <attr name="colorActionMode" format="color"/>

    </declare-styleable>

    </declare-styleable>

</resources>
 
</resources>