PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "[Panlingual] Remove the warning message from AppLocaleDetails" into tm-dev am: 14c7ce7ccb

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

Change-Id: I27181686e44f979d4989f38b8d91b32549be6d77
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
James Lin
2022-05-12 02:31:53 +00:00
committed by Automerger Merge Worker
parent 71d5366bf6 14c7ce7ccb
commit c7eea3d1b7
4 changed files with 0 additions and 87 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
res/drawable/ic_error_outline.xml
View File

@@ -1,28 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
/**
* 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.
*/
-->
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportWidth="24.0"
android:viewportHeight="24.0">
<path
android:pathData="M11,15h2v2h-2v-2zM11,7h2v6h-2L11,7zM11.99,2C6.47,2 2,6.48 2,12s4.47,10 9.99,10C17.52,22 22,17.52 22,12S17.52,2 11.99,2zM12,20c-4.42,0 -8,-3.58 -8,-8s3.58,-8 8,-8 8,3.58 8,8 -3.58,8 -8,8z"
android:fillColor="?android:attr/colorError"
android:fillType="evenOdd"/>
</vector>

9
res/values/strings.xml
View File

@@ -500,15 +500,6 @@
<!-- Title for the App's locale picker activity. [CHAR LIMIT=50]-->
<string name="app_locale_picker_title">App Language</string>
<!-- Title for the warning message of the locale picker activity. [CHAR LIMIT=50]-->
<string name="warnings_title">Update the app</string>
<!-- Summary for the warning message of the locale picker activity. [CHAR LIMIT=70]-->
<string name="warnings_summary">You need to update the app for the latest available languages</string>
<!-- Button text on warning message [CHAR LIMIT=20]-->
<string name="warnings_button_update">Update now</string>
<!-- Category for the suggested app's locales. [CHAR LIMIT=50]-->
<string name="suggested_app_locales_title">Suggested languages</string>

7
res/xml/app_locale_details.xml
View File

@@ -24,13 +24,6 @@
android:title="@string/desc_app_locale_disclaimer"
android:order="1"/>
<com.android.settingslib.widget.BannerMessagePreference
android:key="key_warnings"
android:order="20"
android:icon="@drawable/ic_error_outline"
android:title="@string/warnings_title"
android:summary="@string/warnings_summary"/>
<com.android.settingslib.widget.LayoutPreference
android:key="app_locale_description"
android:order="30"