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

Commit 564751f1 authored by Adam Cohen's avatar Adam Cohen Committed by Automerger Merge Worker
Browse files

Merging from ub-launcher3-master @ build 6356169 am: 3ca04937 am: d1f865b1 am: d16dcd1f 

Change-Id: I54384d2cf1727cc1f2a430e0c7f1bfa0453b79d5
parents f9876207 d16dcd1f

res/color/option_title_color.xml

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

<!--

     Copyright (C) 2019 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.

-->

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

    <item

        android:state_activated="true"

        android:color="?android:colorAccent" />

    <item

        android:state_activated="false"

        android:alpha="0.54"

        android:color="?android:colorForeground" />

    <item

        android:color="?android:colorForeground"/>

</selector>

res/values/dimens.xml

+0 −1
Original line number Diff line number Diff line
@@ -45,7 +45,6 @@ 
    <!-- Note, using dp instead of sp as this text is more like a "snapshot" of the font -->

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

    <dimen name="theme_option_font_min_text_size">15dp</dimen>

    <dimen name="theme_option_title_font_text_size">12sp</dimen>



    <dimen name="option_tile_margin_horizontal">6dp</dimen>

    <dimen name="theme_option_label_margin">4dp</dimen>

res/values/styles.xml

+0 −7
Original line number Diff line number Diff line
@@ -69,13 +69,6 @@ 


    <style name="ActionSecondaryButton" parent="android:Widget.DeviceDefault.Button.Borderless.Colored"/>



    <!-- Option tiles -->

    <style name="OptionTitleTextAppearance" parent="TitleTextAppearance">

        <item name="android:textColor">@color/option_title_color</item>

        <item name="android:textAlignment">center</item>

        <item name="android:textSize">@dimen/theme_option_title_font_text_size</item>

    </style>



    <style name="CardTitleTextAppearance" parent="TitleTextAppearance">

        <item name="android:textStyle">bold</item>

        <item name="android:textSize">@dimen/card_title_text_size</item>

src/com/android/customization/model/theme/ThemeManager.java

+3 −1
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ import static com.android.customization.model.ResourceConstants.OVERLAY_CATEGORY 
import static com.android.customization.model.ResourceConstants.OVERLAY_CATEGORY_ICON_SYSUI;

import static com.android.customization.model.ResourceConstants.OVERLAY_CATEGORY_ICON_THEMEPICKER;

import static com.android.customization.model.ResourceConstants.OVERLAY_CATEGORY_SHAPE;



import android.graphics.Point;

import android.provider.Settings;

import android.text.TextUtils;
@@ -37,6 +38,7 @@ import com.android.customization.module.ThemesUserEventLogger; 
import com.android.wallpaper.R;

import com.android.wallpaper.asset.Asset;

import com.android.wallpaper.model.LiveWallpaperInfo;

import com.android.wallpaper.model.WallpaperInfo;

import com.android.wallpaper.module.WallpaperPersister.SetWallpaperCallback;

import com.android.wallpaper.module.WallpaperSetter;

import com.android.wallpaper.util.WallpaperCropUtils;
@@ -106,7 +108,7 @@ public class ThemeManager implements CustomizationManager<ThemeBundle> { 
    private SetWallpaperCallback createSetWallpaperCallback(ThemeBundle theme, Callback callback) {

        return new SetWallpaperCallback() {

            @Override

            public void onSuccess() {

            public void onSuccess(WallpaperInfo wallpaperInfo) {

                applyWallpaperOptions(theme);

                applyOverlays(theme, callback);

            }