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

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

Snap for 7286185 from 342d3f29 to sc-v2-release 

Change-Id: I5f1b536a5fcbaf4aa3b21288b861c50dd1c2804b
parents 56755cc3 342d3f29

AndroidManifest.xml

+25 −1
Original line number Diff line number Diff line
@@ -8,7 +8,31 @@ 
    <uses-permission android:name="android.permission.CHANGE_OVERLAY_PACKAGES"/>

    <uses-permission android:name="android.permission.WRITE_SECURE_SETTINGS"/>

    <uses-permission android:name="android.permission.SET_WALLPAPER_COMPONENT" />

    <uses-permission android:name="android.permission.QUERY_ALL_PACKAGES" />



    <queries>

        <!-- Specific intents Wallpaper picker query for -->

        <!-- Intent filter with action SET_WALLPAPER -->

        <intent>

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

        </intent>

        <!-- Intent filter with action GET_CONTENT and data's mimeType as "image/*" -->

        <intent>

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

            <data android:mimeType="image/*" />

        </intent>

        <!-- Intent filter with action VIEW -->

        <intent>

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

        </intent>

        <!-- Intent filter with action WallpaperService (live wallpaper interface) -->

        <intent>

            <action android:name="android.service.wallpaper.WallpaperService" />

        </intent>

        <!-- Intent filter with action used to discover partner -->

        <intent>

            <action android:name="com.android.launcher3.action.PARTNER_CUSTOMIZATION" />

        </intent>

    </queries>



    <application

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

res/layout/fragment_grid_picker.xml

+1 −1
Original line number Diff line number Diff line
@@ -51,7 +51,7 @@ 
                android:id="@+id/options_container"

                android:layout_width="match_parent"

                android:layout_height="@dimen/options_container_height"



                android:layout_marginBottom="@dimen/options_container_bottom_margin"

                app:layout_constraintBottom_toBottomOf="parent"

                app:layout_constraintEnd_toEndOf="parent"

                app:layout_constraintStart_toStartOf="parent" />

res/values/dimens.xml

+1 −0
Original line number Diff line number Diff line
@@ -31,6 +31,7 @@ 
    <!-- Dimensions for the customization option tiles -->

    <dimen name="options_container_height">124dp</dimen>

    <dimen name="options_container_width">0dp</dimen>

    <dimen name="options_container_bottom_margin">12dp</dimen>

    <dimen name="option_tile_width">88dp</dimen>

    <dimen name="option_icon_size">16dp</dimen>

    <dimen name="theme_option_icon_sample_height">22dp</dimen>

res/values/styles.xml

+1 −0
Original line number Diff line number Diff line
@@ -32,6 +32,7 @@ 
    </style>



    <style name="CustomizationTheme.NoActionBar">

        <item name="android:navigationBarColor">@android:color/transparent</item>

        <item name="android:windowActionBar">false</item>

        <item name="android:windowNoTitle">true</item>

        <item name="android:fitsSystemWindows">false</item>

src/com/android/customization/picker/CustomizationPickerActivity.java

+1 −6
Original line number Diff line number Diff line
@@ -410,14 +410,9 @@ public class CustomizationPickerActivity extends FragmentActivity implements Wal 
        mDelegate.show(collectionId);

    }



    @Override

    public boolean isNavigationTabsContained() {

        return true;

    }



    @Override

    public void fetchCategories() {

        mDelegate.initialize(false);

        mDelegate.initialize(!mDelegate.getCategoryProvider().isCategoriesFetched());

    }



    @Override