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

Commit 98e5b2a5 authored by George Lin's avatar George Lin Committed by Android (Google) Code Review
Browse files

Merge "[WPPG] Separate files of overriding for building different variant" into tm-qpr-dev

parents 3629e45a 621fb8ff

Android.bp

+5 −1
Original line number Diff line number Diff line
@@ -54,7 +54,7 @@ genrule { 
    name: "ThemePicker_res",

    tools: ["soong_zip"],

    srcs: [

        "res/**/*"

        "res/**/*",

    ],

    out: ["ThemePicker_res.zip"],

    cmd: "INPUTS=($(in)) && "
@@ -89,6 +89,10 @@ android_app { 
        "src_override/**/*.kt",

    ],



    resource_dirs: [

        "res_override",

    ],



    use_embedded_native_libs: true,



    resource_zips: [":WallpaperPicker2_res", ":ThemePicker_res"],

res/layout/check_circle_grey_large_not_select_background_color.xml

0 → 100644
+20 −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.

-->

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

    xmlns:androidprv="http://schemas.android.com/apk/prv/res/android">

    <item android:color="?androidprv:attr/textColorSecondaryInverse" />

</selector>
 
 No newline at end of file

res/values/override.xml→res_override/values/override.xml

+8 −3
Original line number Diff line number Diff line
@@ -17,12 +17,17 @@ 
-->

<resources>

    <!-- Package of the stub apk containing the themes descriptions -->

    <string name="themes_stub_package" translatable="false">com.android.customization.themes

    <string name="themes_stub_package" translatable="false">

        com.android.customization.themes

    </string>



    <!-- Package of the stub apk containing the clock content -->

    <string name="clocks_stub_package" translatable="false"/>

    <!-- Authority of a provider in System UI that will provide preview info for available clockfaces. -->

    <string name="clocks_provider_authority" translatable="false">com.android.keyguard.clock</string>



    <!-- Authority of a System UI provider that provides preview info for available clockfaces. -->

    <string name="clocks_provider_authority" translatable="false">

        com.android.keyguard.clock

    </string>



    <string name="launcher_overlayable_package" translatable="false">com.android.launcher3</string>