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

Commit 69b19abe authored by Android Build Coastguard Worker's avatar Android Build Coastguard Worker
Browse files

Snap for 9371302 from 839e75c5 to tm-qpr2-release 

Change-Id: I87300c3c6fb51c1dc8de7132dfb92ae05bf2ae79
parents 5055dd8a 839e75c5

res/drawable/horizontal_divider_14dp.xml

0 → 100644
+21 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!--

     Copyright (C) 2021 The Android Open Source Project



     Licensed under the Apache License, Version 2.0 (the "License");

     you may not use this file except in compliance with the License.

     You may obtain a copy of the License at



          http://www.apache.org/licenses/LICENSE-2.0



     Unless required by applicable law or agreed to in writing, software

     distributed under the License is distributed on an "AS IS" BASIS,

     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

     See the License for the specific language governing permissions and

     limitations under the License.

-->

<shape xmlns:android="http://schemas.android.com/apk/res/android">

    <size

        android:width="14dp"

        android:height="0dp" />

</shape>

res/layout/clock_section_view.xml

+2 −1
Original line number Diff line number Diff line
@@ -49,6 +49,7 @@ 
        android:scaleType="center"

        android:src="@drawable/ic_clock_24px"

        android:background="@drawable/option_border_color"

        android:contentDescription="@string/clock_picker_entry_content_description" />

        android:contentDescription="@string/clock_picker_entry_content_description"

        android:tint="@color/text_color_primary" />



</com.android.customization.picker.clock.ClockSectionView>
 
 No newline at end of file

res/layout/keyguard_quick_affordance_section_view.xml

+7 −9
Original line number Diff line number Diff line
@@ -49,25 +49,23 @@ 
        android:orientation="horizontal"

        android:background="@drawable/option_border_color"

        android:importantForAccessibility="noHideDescendants"

        android:gravity="center">

        android:gravity="center"

        android:divider="@drawable/horizontal_divider_14dp"

        android:showDividers="middle">



        <ImageView

            android:id="@+id/icon_1"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:visibility="gone" />



        <View

            android:id="@+id/icon_spacer"

            android:layout_width="14dp"

            android:layout_height="0dp"

            android:visibility="gone" />

            android:visibility="gone"

            android:tint="@color/text_color_primary" />



        <ImageView

            android:id="@+id/icon_2"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:visibility="gone" />

            android:visibility="gone"

            android:tint="@color/text_color_primary" />



    </LinearLayout>

src/com/android/customization/module/ThemePickerFragmentFactory.kt

0 → 100644
+33 −0
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2022 The Android Open Source Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.

 * You may obtain a copy of the License at

 *

 *      http://www.apache.org/licenses/LICENSE-2.0

 *

 * Unless required by applicable law or agreed to in writing, software

 * distributed under the License is distributed on an "AS IS" BASIS,

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * See the License for the specific language governing permissions and

 * limitations under the License.

 *

 */



package com.android.customization.module



import androidx.fragment.app.Fragment

import com.android.customization.picker.quickaffordance.ui.fragment.KeyguardQuickAffordancePickerFragment

import com.android.wallpaper.module.FragmentFactory



class ThemePickerFragmentFactory : FragmentFactory {



    override fun create(id: String): Fragment? {

        return when (id) {

            KeyguardQuickAffordancePickerFragment.DESTINATION_ID ->

                KeyguardQuickAffordancePickerFragment.newInstance()

            else -> null

        }

    }

}

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

+10 −0
Original line number Diff line number Diff line
@@ -41,6 +41,7 @@ import com.android.systemui.shared.quickaffordance.data.content.KeyguardQuickAff 
import com.android.wallpaper.model.LiveWallpaperInfo;

import com.android.wallpaper.model.WallpaperInfo;

import com.android.wallpaper.module.CustomizationSections;

import com.android.wallpaper.module.FragmentFactory;

import com.android.wallpaper.module.WallpaperPicker2Injector;

import com.android.wallpaper.module.WallpaperPreferences;

import com.android.wallpaper.picker.CustomizationPickerActivity;
@@ -61,6 +62,7 @@ public class ThemePickerInjector extends WallpaperPicker2Injector 
    private KeyguardQuickAffordancePickerInteractor mKeyguardQuickAffordancePickerInteractor;

    private KeyguardQuickAffordancePickerViewModel.Factory

            mKeyguardQuickAffordancePickerViewModelFactory;

    private FragmentFactory mFragmentFactory;



    @Override

    public CustomizationSections getCustomizationSections(Activity activity) {
@@ -160,4 +162,12 @@ public class ThemePickerInjector extends WallpaperPicker2Injector 
        }

        return mKeyguardQuickAffordancePickerViewModelFactory;

    }



    @Override

    public FragmentFactory getFragmentFactory() {

        if (mFragmentFactory == null) {

            mFragmentFactory = new ThemePickerFragmentFactory();

        }

        return mFragmentFactory;

    }

}