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

Commit 5df46d9c authored by The Android Open Source Project's avatar The Android Open Source Project
Browse files

Merge branch 'cupcake'

parents abc48f80 5962e18d

AndroidManifest.xml

+7 −0
Original line number Diff line number Diff line
@@ -407,6 +407,13 @@ 
            </intent-filter>

        </activity>



        <activity android:name="BatteryHistory" android:label="@string/battery_history_label">

            <intent-filter>

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

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

            </intent-filter>

        </activity>



        <activity android:name="Display" android:label="@string/display_label"

                android:configChanges="fontScale">

            <intent-filter>

res/drawable/ic_dialog_alert.png

deleted100644 → 0
−3.56 KiB
Loading image diff...

res/drawable/ic_menu_manage.png

deleted100644 → 0
−4.96 KiB
Loading image diff...

res/drawable/ic_menu_refresh.png

deleted100644 → 0
−2.39 KiB
Loading image diff...

res/drawable/ic_menu_sort_alphabetically.png

deleted100644 → 0
−2.03 KiB
Loading image diff...