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

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

Merge "Files always visible, same for new window menu."

parents aad7f349 5fe5c458

packages/DocumentsUI/AndroidManifest.xml

+1 −2
Original line number Original line Diff line number Diff line
@@ -54,8 +54,7 @@ 
            android:name=".LauncherActivity"

            android:name=".LauncherActivity"

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

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

            android:icon="@drawable/ic_files_app"

            android:icon="@drawable/ic_files_app"

            android:label="@string/files_label"

            android:label="@string/files_label">

            android:enabled="@bool/productivity_device">

            <intent-filter>

            <intent-filter>

                <action android:name="android.intent.action.MAIN" />

                <action android:name="android.intent.action.MAIN" />

                <category android:name="android.intent.category.LAUNCHER" />

                <category android:name="android.intent.category.LAUNCHER" />

packages/DocumentsUI/res/values/config.xml

+0 −1
Original line number Original line Diff line number Diff line
@@ -18,7 +18,6 @@ 
    <!-- Allow Advanced Devices default value to be customised -->

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

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

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





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

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

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

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

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

</resources>
 
</resources>

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

+0 −1
Original line number Original line Diff line number Diff line
@@ -104,7 +104,6 @@ public abstract class BaseActivity extends Activity implements SearchManagerList 
    public void onCreate(Bundle icicle) {

    public void onCreate(Bundle icicle) {

        super.onCreate(icicle);

        super.onCreate(icicle);





        mProductivityDevice = getResources().getBoolean(R.bool.productivity_device);

        mState = (icicle != null)

        mState = (icicle != null)

                ? icicle.<State>getParcelable(EXTRA_STATE)

                ? icicle.<State>getParcelable(EXTRA_STATE)

                        : buildState();

                        : buildState();

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

+0 −3
Original line number Original line Diff line number Diff line
@@ -256,9 +256,6 @@ public class FilesActivity extends BaseActivity { 




        pasteFromCb.setEnabled(mClipper.hasItemsToPaste());

        pasteFromCb.setEnabled(mClipper.hasItemsToPaste());





        newWindow.setShowAsAction(MenuItem.SHOW_AS_ACTION_NEVER);

        newWindow.setVisible(mProductivityDevice);



        Menus.disableHiddenItems(menu, pasteFromCb);

        Menus.disableHiddenItems(menu, pasteFromCb);

        return true;

        return true;

    }

    }