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

Commit dd36961f authored by Romain Hunault's avatar Romain Hunault 💻
Browse files

Merge branch 'v1-nougat-sprint_hobart' into 'v1-nougat'

[RELEASE] Sprint Hobart

See merge request e/os/android_frameworks_base!46
parents 331566ce 50d4f784
Loading
Loading
Loading
Loading
+3 −3
Original line number Diff line number Diff line
@@ -11,7 +11,7 @@
    <application
        android:name=".DocumentsApplication"
        android:label="@string/app_label"
        android:icon="@mipmap/ic_launcher_filemanager"
        android:icon="@mipmap/ic_launcher"
        android:roundIcon="@drawable/app_icon"
        android:supportsRtl="true">

@@ -46,7 +46,7 @@
        <activity
            android:name=".LauncherActivity"
            android:label="@string/app_label"
            android:icon="@mipmap/ic_launcher_filemanager"
            android:icon="@mipmap/ic_launcher"
            android:theme="@android:style/Theme.NoDisplay">
            <intent-filter>
                <action android:name="android.intent.action.MAIN" />
@@ -57,7 +57,7 @@
        <activity
            android:name=".FilesActivity"
            android:label="@string/app_label"
            android:icon="@mipmap/ic_launcher_filemanager"
            android:icon="@mipmap/ic_launcher"
            android:documentLaunchMode="intoExisting"
            android:theme="@style/DocumentsTheme">
            <intent-filter>
−4.25 KiB
Loading image diff...
+2.78 KiB
Loading image diff...
−4.37 KiB
Loading image diff...
−1.31 KiB
Loading image diff...
Loading