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

Commit e730ef41 authored by Steve McKay's avatar Steve McKay Committed by android-build-merger
Browse files

Merge "Massage code to better support Files overlay." into nyc-dev am: 3855e9ce 

am: fd220cfc

* commit 'fd220cfc':
  Massage code to better support Files overlay.

Change-Id: Ic4b18dd3a4e7e0fd01ed658d0a468f47932feaea
parents cbd3c79f fd220cfc

packages/DocumentsUI/AndroidManifest.xml

+9 −9
Original line number Diff line number Diff line
@@ -43,9 +43,9 @@ 


        <activity

            android:name=".LauncherActivity"

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

            android:icon="@mipmap/ic_launcher_download"

            android:label="@string/downloads_label">

            android:label="@string/downloads_label"

            android:icon="@mipmap/ic_launcher_downloads"

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

            <intent-filter>

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

                <category android:name="android.intent.category.LAUNCHER" />
@@ -54,21 +54,21 @@ 


        <activity

            android:name=".FilesActivity"

            android:theme="@style/DocumentsTheme"

            android:icon="@mipmap/ic_launcher_download"

            android:label="@string/downloads_label"

            android:documentLaunchMode="intoExisting">

            android:icon="@mipmap/ic_launcher_downloads"

            android:documentLaunchMode="intoExisting"

            android:theme="@style/DocumentsTheme">

            <intent-filter>

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

            </intent-filter>

            <intent-filter>

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

                <action android:name="android.provider.action.BROWSE" />

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

                <data android:mimeType="vnd.android.document/root" />

            </intent-filter>

            <intent-filter>

                <action android:name="android.provider.action.BROWSE" />

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

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

                <data android:mimeType="vnd.android.document/root" />

            </intent-filter>

            <intent-filter>

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