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

Commit b2ac0458 authored by android-build-team Robot's avatar android-build-team Robot
Browse files

Snap for 6535363 from 58a2b30e to mainline-release 

Change-Id: I2d8675af784b8fbfa07bd1869e3c8a14f45cac52
parents fe095e2b 58a2b30e

AndroidManifest.xml

+7 −2
Original line number Diff line number Diff line
@@ -51,7 +51,8 @@ 


        <activity

            android:name=".picker.PickActivity"

            android:theme="@style/DocumentsTheme"

            android:exported="true"

            android:theme="@style/LauncherTheme"

            android:visibleToInstantApps="true">

            <intent-filter android:priority="100">

                <action android:name="android.intent.action.OPEN_DOCUMENT" />
@@ -96,6 +97,7 @@ 
            android:name=".LauncherActivity"

            android:targetActivity=".files.LauncherActivity"

            android:label="@string/launcher_label"

            android:exported="true"

            android:icon="@drawable/launcher_icon" >

            <intent-filter>

                <action android:name="android.intent.action.MAIN" />
@@ -108,7 +110,8 @@ 
        <activity

            android:name=".files.FilesActivity"

            android:documentLaunchMode="intoExisting"

            android:theme="@style/DocumentsTheme">

            android:exported="true"

            android:theme="@style/LauncherTheme">

            <intent-filter>

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

            </intent-filter>
@@ -126,6 +129,7 @@ 


        <activity-alias android:name=".ViewDownloadsActivity"

                        android:targetActivity=".files.FilesActivity"

                        android:exported="true"

                        android:enabled="@bool/handle_view_downloads_intent">

            <intent-filter>

                <action android:name="android.intent.action.VIEW_DOWNLOADS" />
@@ -135,6 +139,7 @@ 


        <activity

            android:name=".ScopedAccessActivity"

            android:exported="true"

            android:theme="@android:style/Theme.Translucent.NoTitleBar">

            <intent-filter>

                <action android:name="android.os.storage.action.OPEN_EXTERNAL_DIRECTORY" />

res/drawable/launcher_screen.xml

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

<layer-list xmlns:android="http://schemas.android.com/apk/res/android" >

  <item android:drawable="@android:color/white"/>



  <item

      android:drawable="@drawable/app_icon"

      android:height="150dp"

      android:width="150dp"

      android:gravity="center"/>



</layer-list>

res/values/themes.xml

+3 −0
Original line number Diff line number Diff line
@@ -15,6 +15,9 @@ 
-->



<resources>

    <style name="LauncherTheme" parent="DocumentsTheme">

        <item name="android:windowBackground">@drawable/launcher_screen</item>

    </style>

    <!-- DocumentsTheme is allow customize by run time overlay -->

    <style name="DocumentsTheme" parent="@android:style/Theme.DeviceDefault.DocumentsUI">

src/com/android/documentsui/files/Config.java

+9 −2
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ package com.android.documentsui.files; 
import com.android.documentsui.ActivityConfig;

import com.android.documentsui.base.DocumentStack;

import com.android.documentsui.base.RootInfo;

import com.android.documentsui.util.VersionUtils;



/**

 * Provides support for Files activity specific specializations.
@@ -27,11 +28,17 @@ public final class Config extends ActivityConfig { 


    @Override

    public boolean managedModeEnabled(DocumentStack stack) {

        // This method helps us understand when to kick in special manage mode behaviors.

        final RootInfo root = stack.getRoot();



        // When in Files activity, allow External Storage provider to view

        // Android/[data|obb|sandbox] directories which are otherwise hidden for privacy reasons.

        if (VersionUtils.isAtLeastR() && root != null && root.isExternalStorage()) {

            return true;

        }

        // When in downloads top level directory, we also show active downloads.

        // And while we don't allow folders in Downloads, we do allow Zip files in

        // downloads that themselves can be opened and viewed like directories.

        // This method helps us understand when to kick in on those special behaviors.

        final RootInfo root = stack.getRoot();

        return root != null

                && root.isDownloads()

                && stack.size() == 1;

src/com/android/documentsui/files/FilesActivity.java

+1 −0
Original line number Diff line number Diff line
@@ -88,6 +88,7 @@ public class FilesActivity extends BaseActivity implements AbstractActionHandler 


    @Override

    public void onCreate(Bundle icicle) {

        setTheme(R.style.DocumentsTheme);



        MessageBuilder messages = new MessageBuilder(this);

        Features features = Features.create(this);