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

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

Decouple SD card from ADVANCED storage toggle. 

A variety of related fixes:
- don't force size enable when browsing from device mounted notifications.
- don't show settings menu item as action (put in overflow).
- add sd card icon (not quite yet used, need to suss that out).

Bug:26880985,26883578,26771127
Change-Id: I36f153c42217f8092f157ded2a756c02525593ab
parent e909d94e

core/java/android/os/storage/VolumeInfo.java

+4 −1
Original line number Diff line number Diff line
@@ -438,8 +438,11 @@ public class VolumeInfo implements Parcelable { 
        final Intent intent = new Intent(DocumentsContract.ACTION_BROWSE);

        intent.addCategory(Intent.CATEGORY_DEFAULT);

        intent.setData(uri);



        // note that docsui treats this as *force* show advanced. So sending

        // false permits advanced to be shown based on user preferences.

        intent.putExtra(DocumentsContract.EXTRA_SHOW_ADVANCED, isPrimary());

        intent.putExtra(DocumentsContract.EXTRA_SHOW_FILESIZE, true);

        intent.putExtra(DocumentsContract.EXTRA_SHOW_ADVANCED, true);

        return intent;

    }

packages/DocumentsUI/res/drawable/ic_sd_storage.xml

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

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.

-->

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

        android:width="48dp"

        android:height="48dp"

        android:viewportWidth="24.0"

        android:viewportHeight="24.0">

    <path

        android:fillColor="#FF000000"

        android:pathData="M18 2h-8L4.02 8 4 20c0 1.1.9 2 2 2h12c1.1 0 2,-.9 2,-2V4c0,-1.1,-.9,-2,-2,-2zm-6 6h-2V4h2v4zm3 0h-2V4h2v4zm3 0h-2V4h2v4z"/>

</vector>

packages/DocumentsUI/res/menu/activity.xml

+2 −1
Original line number Diff line number Diff line
@@ -88,5 +88,6 @@ 
    <item

        android:id="@+id/menu_settings"

        android:title="@string/menu_settings"

        android:showAsAction="never" />

        android:showAsAction="never"

        android:visible="false" />

</menu>

packages/DocumentsUI/res/values/strings.xml

+2 −2
Original line number Diff line number Diff line
@@ -39,8 +39,8 @@ 
    <string name="menu_sort">Sort by</string>

    <!-- Menu item that enters a mode to search for documents [CHAR LIMIT=24] -->

    <string name="menu_search">Search</string>

    <!-- Menu item that enters activity to change settings [CHAR LIMIT=24] -->

    <string name="menu_settings">Settings</string>

    <!-- Menu item that enters activity to change settings for current root [CHAR LIMIT=24] -->

    <string name="menu_settings">Storage settings</string>



    <!-- Menu item title that opens the selected documents [CHAR LIMIT=24] -->

    <string name="menu_open">Open</string>

packages/DocumentsUI/src/com/android/documentsui/BaseActivity.java

+0 −2
Original line number Diff line number Diff line
@@ -150,7 +150,6 @@ public abstract class BaseActivity extends Activity implements SearchManagerList 
        final MenuItem list = menu.findItem(R.id.menu_list);

        final MenuItem advanced = menu.findItem(R.id.menu_advanced);

        final MenuItem fileSize = menu.findItem(R.id.menu_file_size);

        final MenuItem settings = menu.findItem(R.id.menu_settings);

        final MenuItem search = menu.findItem(R.id.menu_search);



        // I'm thinkin' this isn't necesary here. If it is...'cuz of a bug....
@@ -167,7 +166,6 @@ public abstract class BaseActivity extends Activity implements SearchManagerList 
        sortSize.setVisible(mState.showSize); // Only sort by size when visible

        fileSize.setVisible(!mState.forceSize);

        advanced.setVisible(!mState.forceAdvanced);

        settings.setVisible((root.flags & Root.FLAG_HAS_SETTINGS) != 0);

        search.setVisible(canSearchRoot());



        advanced.setTitle(LocalPreferences.getDisplayAdvancedDevices(this)