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

Unverified Commit 8553d516 authored by Michael Bestas's avatar Michael Bestas
Browse files

Squashed revert of customization changes 

These changes no longer work since ThemePicker switched to the new UI.
They will have to be reimplemented in the new code.

Revert "ThemePicker: Allow text scroll in options title"

This reverts commit 78101bd6.

Revert "ThemePicker: Use the new material switch to match with settings"

This reverts commit 80a03b39.

Revert "ThemePicker: Many UI / layout consistency fixes & improvements"

This reverts commit effcdd3d.

Revert "ThemePicker: Show our apps in icon previews"

This reverts commit 7d7505ce.

Revert "ThemePicker: Vertically center the text of customization options"

This reverts commit 921a622d.

Revert "ThemePicker: Bring back fonts, icon pack, shape customization"

This reverts commit 8d4c0a3b.

Change-Id: I41200d9152f6f772e09ead2afdc0bb7d8166c37e
parent 34978482

AndroidManifest.xml

+0 −1
Original line number Diff line number Diff line
@@ -21,7 +21,6 @@ 
    <uses-permission android:name="android.permission.READ_WALLPAPER_INTERNAL"/>

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

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

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



    <queries>

        <package android:name="android"/>

res/drawable/check_circle_accent_24dp.xml

deleted100644 → 0
+0 −24
Original line number Diff line number Diff line 
<!--

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

-->

<layer-list xmlns:android="http://schemas.android.com/apk/res/android">

    <item>

        <shape android:shape="oval">

            <size android:width="24dp" android:height="24dp" />

            <solid android:color="@color/color_accent_primary" />

        </shape>

    </item>

    <item android:drawable="@drawable/ic_check_24dp" android:gravity="fill" />

</layer-list>

res/drawable/check_circle_grey_large.xml

deleted100644 → 0
+0 −31
Original line number Diff line number Diff line 
<!--

     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.

-->

<layer-list xmlns:android="http://schemas.android.com/apk/res/android">

    <item>

        <shape android:shape="oval">

            <size android:width="@dimen/center_check_size"

                android:height="@dimen/center_check_size" />

            <solid android:color="@color/color_accent_primary_variant" />

        </shape>

    </item>

    <item>

        <inset android:drawable="@drawable/ic_check_24dp"

            android:insetTop="@dimen/center_check_padding"

            android:insetRight="@dimen/center_check_padding"

            android:insetBottom="@dimen/center_check_padding"

            android:insetLeft="@dimen/center_check_padding"/>

    </item>

</layer-list>

res/drawable/ic_check_24dp.xml

deleted100644 → 0
+0 −9
Original line number Diff line number Diff line 
<vector xmlns:android="http://schemas.android.com/apk/res/android"

    android:width="24dp"

    android:height="24dp"

    android:viewportWidth="24"

    android:viewportHeight="24">

  <path

      android:fillColor="?android:textColorPrimaryInverse"

      android:pathData="M9,16.17L4.83,12l-1.42,1.41L9,19 21,7l-1.41,-1.41L9,16.17z"/>

</vector>

res/layout/dark_mode_section_view.xml

+2 −5
Original line number Diff line number Diff line
@@ -33,17 +33,14 @@ 
        android:text="@string/mode_title"

        style="@style/SectionTitleTextStyle" />



    <com.google.android.material.materialswitch.MaterialSwitch

    <Switch

        android:id="@+id/dark_mode_toggle"

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:background="@null"

        android:clickable="false"

        android:focusable="false"

        android:theme="@style/Theme.Material3.DynamicColors.DayNight"

        android:minHeight="0dp"

        android:text=""

        android:textOn=""

        android:textOff="" />

        style="@style/Switch.SettingsLib" />



</com.android.customization.picker.mode.DarkModeSectionView>