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

Commit 5fe26a76 authored by Nishith Khanna's avatar Nishith Khanna
Browse files

Merge branch 'epic340-a15-a15_bringup' into 'a15' 

Port theme picker changes from A14

See merge request !9
parents 346e7fa2 7f2cd8c8

AndroidManifest.xml

+2 −2
Original line number Diff line number Diff line
@@ -61,8 +61,8 @@ 
        </intent>

    </queries>



    <uses-permission android:name="com.android.launcher3.permission.READ_SETTINGS" />

    <uses-permission android:name="com.android.launcher3.permission.WRITE_SETTINGS" />

    <uses-permission android:name="foundation.e.blisslauncher.permission.READ_SETTINGS" />

    <uses-permission android:name="foundation.e.blisslauncher.permission.WRITE_SETTINGS" />



    <application

        tools:replace="android:icon,android:name"

src/com/android/customization/module/DefaultCustomizationSections.java

+7 −17
Original line number Diff line number Diff line
@@ -158,23 +158,13 @@ public final class DefaultCustomizationSections implements CustomizationSections 
                                customizationPickerViewModel));



        sectionControllers.add(

                new ConnectedSectionController(

                        // Theme color section.

                        new ColorSectionController(

                                sectionNavigationController,

                                new ViewModelProvider(

                                        activity,

                                        mColorPickerViewModelFactory)

                                        .get(ColorPickerViewModel.class),

                                lifecycleOwner),

                // Wallpaper quick switch section.

                new WallpaperQuickSwitchSectionController(

                        customizationPickerViewModel.getWallpaperQuickSwitchViewModel(

                                screen),

                        lifecycleOwner,

                        sectionNavigationController,

                                savedInstanceState == null),

                        /* reverseOrderWhenHorizontal= */ true));

                        savedInstanceState == null));



        switch (screen) {

            case LOCK_SCREEN: