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

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

Merge "Rechristen Downloads > Files." into nyc-andromeda-dev

parents 5a1c7b0e a0b52655

AndroidManifest.xml

+3 −3
Original line number Diff line number Diff line
@@ -44,7 +44,7 @@ 


        <activity

            android:name=".files.LauncherActivity"

            android:label="@string/downloads_label"

            android:label="@string/app_label"

            android:icon="@drawable/files_icon"

            android:theme="@android:style/Theme.NoDisplay">

        </activity>
@@ -53,7 +53,7 @@ 
        <activity-alias

            android:name=".Launcher"

            android:targetActivity=".files.LauncherActivity"

            android:label="@string/downloads_label"

            android:label="@string/app_label"

            android:icon="@drawable/files_icon" >

            <intent-filter>

                <action android:name="android.intent.action.MAIN" />
@@ -63,7 +63,7 @@ 


        <activity

            android:name=".files.FilesActivity"

            android:label="@string/downloads_label"

            android:label="@string/app_label"

            android:icon="@drawable/files_icon"

            android:documentLaunchMode="intoExisting"

            android:theme="@style/DocumentsTheme">

res/values/config.xml

+4 −7
Original line number Diff line number Diff line
@@ -15,16 +15,13 @@ 
-->



<resources>

    <!-- Allow Advanced Devices default value to be customised -->

    <bool name="config_defaultAdvancedDevices">false</bool>



    <!-- Intentionally unset. Vendors should set this in an overlay. -->

    <string name="trusted_quick_viewer_package" translatable="false"></string>



    <!-- Flags setup as productivity oriented in which case Downloads app will be presented

             as Files app. Including showing of the Documents and "advanced" roots. -->

    <bool name="productivity_device">false</bool>

    <!-- Enable productivity oriented features like "Documents" root, and new window view. -->

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



    <!-- Indicates if search view is taking the whole toolbar space -->

    <!-- Indicates if search view is taking the whole toolbar space. On larger

         layouts we reduce this to an input-box adjacent to menu actions. -->

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

</resources>

res/values/drawables.xml

+1 −1
Original line number Diff line number Diff line
@@ -16,6 +16,6 @@ 


<resources>

    <item name="app_icon" type="drawable">@mipmap/ic_app_icon</item>

    <item name="files_icon" type="drawable">@mipmap/ic_launcher_downloads</item>

    <item name="files_icon" type="drawable">@mipmap/ic_app_icon</item>

    <item name="picker_icon" type="drawable">@drawable/ic_doc_text</item>

</resources>

res/values/strings.xml

+0 −3
Original line number Diff line number Diff line
@@ -18,9 +18,6 @@ 
    <!-- Title of the documents application [CHAR LIMIT=32] -->

    <string name="app_label">Files</string>



    <!-- Title of the standalone downloads activity. [CHAR LIMIT=32] -->

    <string name="downloads_label">Downloads</string>



    <!-- Action bar title prompting user to choose a location to open a document from [CHAR LIMIT=32] -->

    <string name="title_open">Open from</string>

    <!-- Action bar title prompting user to choose a location to save a document to [CHAR LIMIT=32] -->

src/com/android/documentsui/MenuManager.java

+4 −2
Original line number Diff line number Diff line
@@ -303,8 +303,10 @@ public abstract class MenuManager { 
            mActivity = activity;

        }



        public boolean shouldShowFancyFeatures() {

            return Shared.shouldShowFancyFeatures(mActivity);

        // TODO: Inject necessary deps directly into MenuManager, rather than

        // getting this info indirectly via DirectoryDetails.

        public boolean isProductivityModeEnabled() {

            return Shared.isProductivityMode(mActivity);

        }



        public boolean hasRootSettings() {