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

Commit 782287ad authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Move the same-name-different-product configs from res folder to... 

Merge "Move the same-name-different-product configs from res folder to res-product folder" into udc-dev am: ae2c14a0

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21502690



Change-Id: Ice7dbb0fe9880b268bef1b441c82503d786f1566
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents dd940a31 ae2c14a0

res-product/values/config.xml

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

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

-->



<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">

    <!-- The illustration for those screen are not in one of below type. This file should be a video in JSON format. -->

    <item name="a11y_timeout_banner" type="raw" product="default">@raw/accessibility_timeout_banner</item>

    <item name="a11y_timeout_banner" type="raw" product="tablet">@raw/accessibility_timeout_banner_tablet</item>



    <item name="a11y_shortcut_type_triple_tap" type="raw" product="default">@raw/accessibility_shortcut_type_triple_tap</item>

    <item name="a11y_shortcut_type_triple_tap" type="raw" product="tablet">@raw/accessibility_shortcut_type_triple_tap_tablet</item>



    <item name="a11y_color_inversion_banner" type="raw" product="default">@raw/accessibility_color_inversion_banner</item>

    <item name="a11y_color_inversion_banner" type="raw" product="tablet">@raw/accessibility_color_inversion_banner_tablet</item>



    <item name="a11y_magnification_banner" type="raw" product="default">@raw/accessibility_magnification_banner</item>

    <item name="a11y_magnification_banner" type="raw" product="tablet">@raw/accessibility_magnification_banner_tablet</item>



    <item name="a11y_extra_dim_banner" type="raw" product="default">@raw/extra_dim_banner</item>

    <item name="a11y_extra_dim_banner" type="raw" product="tablet">@raw/extra_dim_banner_tablet</item>

</resources>

res/values/config.xml

+0 −16
Original line number Diff line number Diff line
@@ -695,20 +695,4 @@ 


    <!-- Whether auto data switching on secondary SIM enables cross-SIM calling on both SIMs. -->

    <bool name="config_auto_data_switch_enables_cross_sim_calling">false</bool>



    <!-- The illustration for those screen are not in one of below type. This file should be a video in JSON format. -->

    <item name="a11y_timeout_banner" type="raw" product="default">@raw/accessibility_timeout_banner</item>

    <item name="a11y_timeout_banner" type="raw" product="tablet">@raw/accessibility_timeout_banner_tablet</item>



    <item name="a11y_shortcut_type_triple_tap" type="raw" product="default">@raw/accessibility_shortcut_type_triple_tap</item>

    <item name="a11y_shortcut_type_triple_tap" type="raw" product="tablet">@raw/accessibility_shortcut_type_triple_tap_tablet</item>



    <item name="a11y_color_inversion_banner" type="raw" product="default">@raw/accessibility_color_inversion_banner</item>

    <item name="a11y_color_inversion_banner" type="raw" product="tablet">@raw/accessibility_color_inversion_banner_tablet</item>



    <item name="a11y_magnification_banner" type="raw" product="default">@raw/accessibility_magnification_banner</item>

    <item name="a11y_magnification_banner" type="raw" product="tablet">@raw/accessibility_magnification_banner_tablet</item>



    <item name="a11y_extra_dim_banner" type="raw" product="default">@raw/extra_dim_banner</item>

    <item name="a11y_extra_dim_banner" type="raw" product="tablet">@raw/extra_dim_banner_tablet</item>

</resources>