Android/packages_apps_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
Files
2aa8cd1d1a1afa56dddfb60a829d39cef21f8b74
packages_apps_Settings/res
History
Bonian Chen 244f21d9d7 resolve merge conflicts of 81d1cd0871 to stage-aosp-master am: 4ec8323bad 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19465627

Change-Id: I1c79864417df3c542538634621cb0458a892d926
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-29 10:11:11 +00:00
..
anim
…
color
…
color-night
…
drawable
Merge "Fix ExtraText lint errors" am: 000bc450b0
2022-07-14 11:32:07 +00:00
drawable-hdpi
…
drawable-ldrtl-hdpi
…
drawable-ldrtl-mdpi
…
drawable-ldrtl-xhdpi
…
drawable-ldrtl-xxhdpi
…
drawable-ldrtl-xxxhdpi
…
drawable-mdpi
…
drawable-night
…
drawable-nodpi
…
drawable-xhdpi
…
drawable-xxhdpi
…
drawable-xxxhdpi
…
interpolator
…
layout
Merge "Fix ExtraText lint errors" am: 000bc450b0
2022-07-14 11:32:07 +00:00
layout-land
…
layout-sw300dp-land
…
layout-sw600dp
…
menu
…
mipmap-hdpi
…
mipmap-mdpi
…
mipmap-xhdpi
…
mipmap-xxhdpi
…
mipmap-xxxhdpi
…
raw
…
raw-night
…
values
resolve merge conflicts of 81d1cd0871 to stage-aosp-master
2022-07-29 07:34:35 +00:00
values-af
Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master
2022-07-05 00:45:36 +00:00
values-af-nokeys
…
values-am
Import translations. DO NOT MERGE ANYWHERE
2022-07-03 14:12:52 -07:00
values-am-nokeys
…
values-ar
Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master
2022-07-05 00:45:36 +00:00
values-ar-nokeys
…
values-as
Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master
2022-07-05 00:45:36 +00:00
values-as-nokeys
…
values-az
Import translations. DO NOT MERGE ANYWHERE
2022-07-03 14:12:52 -07:00
values-az-nokeys
…
values-b+sr+Latn
Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master
2022-07-05 00:45:36 +00:00
values-b+sr+Latn-nokeys
…
values-be
Import translations. DO NOT MERGE ANYWHERE
2022-07-03 14:12:52 -07:00
values-be-nokeys
…
values-bg
Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master
2022-07-05 00:45:36 +00:00
values-bg-nokeys
…
values-bn
Import translations. DO NOT MERGE ANYWHERE
2022-07-03 14:12:52 -07:00
values-bn-nokeys
…
values-bs
Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master
2022-07-05 00:45:36 +00:00
values-bs-nokeys
…
values-ca
Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master
2022-07-05 00:45:36 +00:00
values-ca-nokeys
…
values-cs
Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master
2022-07-05 00:45:36 +00:00
values-cs-nokeys
…
values-da
Import translations. DO NOT MERGE ANYWHERE
2022-07-03 14:12:52 -07:00
values-da-nokeys
…
values-de
Import translations. DO NOT MERGE ANYWHERE
2022-07-03 14:12:52 -07:00
values-de-nokeys
…
values-el
Import translations. DO NOT MERGE ANYWHERE
2022-07-03 14:12:52 -07:00
values-el-nokeys
…
values-en-rAU
Import translations. DO NOT MERGE ANYWHERE
2022-07-03 14:12:52 -07:00
values-en-rAU-nokeys
…
values-en-rCA
Import translations. DO NOT MERGE ANYWHERE
2022-07-03 14:12:52 -07:00
values-en-rCA-nokeys
…
values-en-rGB
Import translations. DO NOT MERGE ANYWHERE
2022-07-03 14:12:52 -07:00
values-en-rGB-nokeys
…
values-en-rIN
Import translations. DO NOT MERGE ANYWHERE
2022-07-03 14:12:52 -07:00
values-en-rIN-nokeys
…
values-en-rXC
Import translations. DO NOT MERGE ANYWHERE
2022-07-03 14:12:52 -07:00
values-en-rXC-nokeys
…
values-es
Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master
2022-07-05 00:45:36 +00:00
values-es-nokeys
…
values-es-rUS
Import translations. DO NOT MERGE ANYWHERE
2022-07-03 14:12:52 -07:00
values-es-rUS-nokeys
…
values-et
Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master
2022-07-05 00:45:36 +00:00
values-et-nokeys
…
values-eu
Import translations. DO NOT MERGE ANYWHERE
2022-07-03 14:12:52 -07:00
values-eu-nokeys
…
values-fa
Import translations. DO NOT MERGE ANYWHERE
2022-07-03 14:12:52 -07:00
values-fa-nokeys
…
values-fi
Import translations. DO NOT MERGE ANYWHERE
2022-07-03 14:12:52 -07:00
values-fi-nokeys
…
values-fr
Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master
2022-07-05 00:45:36 +00:00
values-fr-nokeys
…
values-fr-rCA
Import translations. DO NOT MERGE ANYWHERE
2022-07-03 14:12:52 -07:00
values-fr-rCA-nokeys
…
values-gl
Import translations. DO NOT MERGE ANYWHERE
2022-07-03 14:12:52 -07:00
values-gl-nokeys
…
values-gu
Import translations. DO NOT MERGE ANYWHERE
2022-07-03 14:12:52 -07:00
values-gu-nokeys
…
values-h330dp
…
values-h480dp
…
values-hi
Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master
2022-07-05 00:45:36 +00:00
values-hi-nokeys
…
values-hr
Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master
2022-07-05 00:45:36 +00:00
values-hr-nokeys
…
values-hu
Import translations. DO NOT MERGE ANYWHERE
2022-07-03 14:12:52 -07:00
values-hu-nokeys
…
values-hy
Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master
2022-07-05 00:45:36 +00:00
values-hy-nokeys
…
values-in
Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master
2022-07-05 00:45:36 +00:00
values-in-nokeys
…
values-is
Import translations. DO NOT MERGE ANYWHERE
2022-07-03 14:12:52 -07:00
values-is-nokeys
…
values-it
Import translations. DO NOT MERGE ANYWHERE
2022-07-03 14:12:52 -07:00
values-it-nokeys
…
values-iw
Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master
2022-07-05 00:45:36 +00:00
values-iw-nokeys
…
values-ja
Import translations. DO NOT MERGE ANYWHERE
2022-07-03 14:12:52 -07:00
values-ja-nokeys
…
values-ka
Import translations. DO NOT MERGE ANYWHERE
2022-07-03 14:12:52 -07:00
values-ka-nokeys
…
values-kk
Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master
2022-07-05 00:45:36 +00:00
values-kk-nokeys
…
values-km
Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master
2022-07-05 00:45:36 +00:00
values-km-nokeys
…
values-kn
Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master
2022-07-05 00:45:36 +00:00
values-kn-nokeys
…
values-ko
Import translations. DO NOT MERGE ANYWHERE
2022-07-03 14:12:52 -07:00
values-ko-nokeys
…
values-ky
Import translations. DO NOT MERGE ANYWHERE
2022-07-03 14:12:52 -07:00
values-ky-nokeys
…
values-land
…
values-lo
Import translations. DO NOT MERGE ANYWHERE
2022-07-03 14:12:52 -07:00
values-lo-nokeys
…
values-lt
Import translations. DO NOT MERGE ANYWHERE
2022-07-03 14:12:52 -07:00
values-lt-nokeys
…
values-lv
Import translations. DO NOT MERGE ANYWHERE
2022-07-03 14:12:52 -07:00
values-lv-nokeys
…
values-mcc001-mnc01
…
values-mcc001-mnc010
…
values-mcc208-mnc10-fr
…
values-mcc222
…
values-mcc222-af
…
values-mcc222-am
…
values-mcc222-ar
…
values-mcc222-as
…
values-mcc222-az
…
values-mcc222-b+sr+Latn
…
values-mcc222-be
…
values-mcc222-bg
…
values-mcc222-bn
…
values-mcc222-bs
…
values-mcc222-ca
…
values-mcc222-cs
…
values-mcc222-da
…
values-mcc222-de
…
values-mcc222-el
…
values-mcc222-en-rAU
…
values-mcc222-en-rCA
…
values-mcc222-en-rGB
…
values-mcc222-en-rIN
…
values-mcc222-en-rXC
…
values-mcc222-es
…
values-mcc222-es-rUS
…
values-mcc222-et
…
values-mcc222-eu
…
values-mcc222-fa
…
values-mcc222-fi
…
values-mcc222-fr
…
values-mcc222-fr-rCA
…
values-mcc222-gl
…
values-mcc222-gu
…
values-mcc222-hi
…
values-mcc222-hr
…
values-mcc222-hu
…
values-mcc222-hy
…
values-mcc222-in
…
values-mcc222-is
…
values-mcc222-it
…
values-mcc222-iw
…
values-mcc222-ja
…
values-mcc222-ka
…
values-mcc222-kk
…
values-mcc222-km
…
values-mcc222-kn
…
values-mcc222-ko
…
values-mcc222-ky
…
values-mcc222-lo
…
values-mcc222-lt
…
values-mcc222-lv
…
values-mcc222-mk
…
values-mcc222-ml
…
values-mcc222-mn
…
values-mcc222-mr
…
values-mcc222-ms
…
values-mcc222-my
…
values-mcc222-nb
…
values-mcc222-ne
…
values-mcc222-nl
…
values-mcc222-or
…
values-mcc222-pa
…
values-mcc222-pl
…
values-mcc222-pt
…
values-mcc222-pt-rBR
…
values-mcc222-pt-rPT
…
values-mcc222-ro
…
values-mcc222-ru
…
values-mcc222-si
…
values-mcc222-sk
…
values-mcc222-sl
…
values-mcc222-sq
…
values-mcc222-sr
…
values-mcc222-sv
…
values-mcc222-sw
…
values-mcc222-ta
…
values-mcc222-te
…
values-mcc222-th
…
values-mcc222-tl
…
values-mcc222-tr
…
values-mcc222-uk
…
values-mcc222-ur
…
values-mcc222-uz
…
values-mcc222-vi
…
values-mcc222-zh-rCN
…
values-mcc222-zh-rHK
…
values-mcc222-zh-rTW
…
values-mcc222-zu
…
values-mcc234
…
values-mcc246-mnc081
…
values-mcc262-mnc02
…
values-mcc262-mnc02-af
…
values-mcc262-mnc02-am
…
values-mcc262-mnc02-ar
…
values-mcc262-mnc02-as
…
values-mcc262-mnc02-az
…
values-mcc262-mnc02-b+sr+Latn
…
values-mcc262-mnc02-be
…
values-mcc262-mnc02-bg
…
values-mcc262-mnc02-bn
…
values-mcc262-mnc02-bs
…
values-mcc262-mnc02-ca
…
values-mcc262-mnc02-cs
…
values-mcc262-mnc02-da
…
values-mcc262-mnc02-de
…
values-mcc262-mnc02-el
…
values-mcc262-mnc02-en-rAU
…
values-mcc262-mnc02-en-rCA
…
values-mcc262-mnc02-en-rGB
…
values-mcc262-mnc02-en-rIN
…
values-mcc262-mnc02-en-rXC
…
values-mcc262-mnc02-es
…
values-mcc262-mnc02-es-rUS
…
values-mcc262-mnc02-et
…
values-mcc262-mnc02-eu
…
values-mcc262-mnc02-fa
…
values-mcc262-mnc02-fi
…
values-mcc262-mnc02-fr
…
values-mcc262-mnc02-fr-rCA
…
values-mcc262-mnc02-gl
…
values-mcc262-mnc02-gu
…
values-mcc262-mnc02-hi
…
values-mcc262-mnc02-hr
…
values-mcc262-mnc02-hu
…
values-mcc262-mnc02-hy
…
values-mcc262-mnc02-in
…
values-mcc262-mnc02-is
…
values-mcc262-mnc02-it
…
values-mcc262-mnc02-iw
…
values-mcc262-mnc02-ja
…
values-mcc262-mnc02-ka
…
values-mcc262-mnc02-kk
…
values-mcc262-mnc02-km
…
values-mcc262-mnc02-kn
…
values-mcc262-mnc02-ko
…
values-mcc262-mnc02-ky
…
values-mcc262-mnc02-lo
…
values-mcc262-mnc02-lt
…
values-mcc262-mnc02-lv
…
values-mcc262-mnc02-mk
…
values-mcc262-mnc02-ml
…
values-mcc262-mnc02-mn
…
values-mcc262-mnc02-mr
…
values-mcc262-mnc02-ms
…
values-mcc262-mnc02-my
…
values-mcc262-mnc02-nb
…
values-mcc262-mnc02-ne
…
values-mcc262-mnc02-nl
…
values-mcc262-mnc02-or
…
values-mcc262-mnc02-pa
…
values-mcc262-mnc02-pl
…
values-mcc262-mnc02-pt
…
values-mcc262-mnc02-pt-rBR
…
values-mcc262-mnc02-pt-rPT
…
values-mcc262-mnc02-ro
…
values-mcc262-mnc02-ru
…
values-mcc262-mnc02-si
…
values-mcc262-mnc02-sk
…
values-mcc262-mnc02-sl
…
values-mcc262-mnc02-sq
…
values-mcc262-mnc02-sr
…
values-mcc262-mnc02-sv
…
values-mcc262-mnc02-sw
…
values-mcc262-mnc02-ta
…
values-mcc262-mnc02-te
…
values-mcc262-mnc02-th
…
values-mcc262-mnc02-tl
…
values-mcc262-mnc02-tr
…
values-mcc262-mnc02-uk
…
values-mcc262-mnc02-ur
…
values-mcc262-mnc02-uz
…
values-mcc262-mnc02-vi
…
values-mcc262-mnc02-zh-rCN
…
values-mcc262-mnc02-zh-rHK
…
values-mcc262-mnc02-zh-rTW
…
values-mcc262-mnc02-zu
…
values-mcc310-mnc028
…
values-mcc311-mnc390
…
values-mcc505
…
values-mk
Import translations. DO NOT MERGE ANYWHERE
2022-07-03 14:12:52 -07:00
values-mk-nokeys
…
values-ml
Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master
2022-07-05 00:45:36 +00:00
values-ml-nokeys
…
values-mn
Import translations. DO NOT MERGE ANYWHERE
2022-07-03 14:12:52 -07:00
values-mn-nokeys
…
values-mr
Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master
2022-07-05 00:45:36 +00:00
values-mr-nokeys
…
values-ms
Import translations. DO NOT MERGE ANYWHERE
2022-07-03 14:12:52 -07:00
values-ms-nokeys
…
values-my
Import translations. DO NOT MERGE ANYWHERE
2022-07-03 14:12:52 -07:00
values-my-nokeys
…
values-nb
Import translations. DO NOT MERGE ANYWHERE
2022-07-03 14:12:52 -07:00
values-nb-nokeys
…
values-ne
Import translations. DO NOT MERGE ANYWHERE
2022-07-03 14:12:52 -07:00
values-ne-nokeys
…
values-night
…
values-nl
Import translations. DO NOT MERGE ANYWHERE
2022-07-03 14:12:52 -07:00
values-nl-nokeys
…
values-nokeys
…
values-or
Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master
2022-07-05 00:45:36 +00:00
values-or-nokeys
…
values-pa
Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master
2022-07-05 00:45:36 +00:00
values-pa-nokeys
…
values-pl
Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master
2022-07-05 00:45:36 +00:00
values-pl-nokeys
…
values-pt
Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master
2022-07-05 00:45:36 +00:00
values-pt-nokeys
…
values-pt-rBR
Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master
2022-07-05 00:45:36 +00:00
values-pt-rBR-nokeys
…
values-pt-rPT
Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master
2022-07-05 00:45:36 +00:00
values-pt-rPT-nokeys
…
values-rm-nokeys
…
values-ro
Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master
2022-07-05 00:45:36 +00:00
values-ro-nokeys
…
values-ru
Import translations. DO NOT MERGE ANYWHERE
2022-07-03 14:12:52 -07:00
values-ru-nokeys
…
values-si
Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master
2022-07-05 00:45:36 +00:00
values-si-nokeys
…
values-sk
Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master
2022-07-05 00:45:36 +00:00
values-sk-nokeys
…
values-sl
Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master
2022-07-05 00:45:36 +00:00
values-sl-nokeys
…
values-sq
Import translations. DO NOT MERGE ANYWHERE
2022-07-03 14:12:52 -07:00
values-sq-nokeys
…
values-sr
Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master
2022-07-05 00:45:36 +00:00
values-sr-nokeys
…
values-sv
Import translations. DO NOT MERGE ANYWHERE
2022-07-03 14:12:52 -07:00
values-sv-nokeys
…
values-sw
Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master
2022-07-05 00:45:36 +00:00
values-sw320dp
…
values-sw360dp
…
values-sw600dp
…
values-sw600dp-land
…
values-sw720dp
…
values-sw720dp-land
…
values-sw-nokeys
…
values-ta
Import translations. DO NOT MERGE ANYWHERE
2022-07-03 14:12:52 -07:00
values-ta-nokeys
…
values-te
Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master
2022-07-05 00:45:36 +00:00
values-te-nokeys
…
values-th
Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master
2022-07-05 00:45:36 +00:00
values-th-nokeys
…
values-tl
Import translations. DO NOT MERGE ANYWHERE
2022-07-03 14:12:52 -07:00
values-tl-nokeys
…
values-tr
Import translations. DO NOT MERGE ANYWHERE
2022-07-03 14:12:52 -07:00
values-tr-nokeys
…
values-uk
Import translations. DO NOT MERGE ANYWHERE
2022-07-03 14:12:52 -07:00
values-uk-nokeys
…
values-ur
Import translations. DO NOT MERGE ANYWHERE
2022-07-03 14:12:52 -07:00
values-ur-nokeys
…
values-uz
Import translations. DO NOT MERGE ANYWHERE
2022-07-03 14:12:52 -07:00
values-uz-nokeys
…
values-vi
Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master
2022-07-05 00:45:36 +00:00
values-vi-nokeys
…
values-xlarge
…
values-zh-rCN
Import translations. DO NOT MERGE ANYWHERE
2022-07-03 14:12:52 -07:00
values-zh-rCN-nokeys
…
values-zh-rHK
Import translations. DO NOT MERGE ANYWHERE
2022-07-03 14:12:52 -07:00
values-zh-rHK-nokeys
…
values-zh-rTW
Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master
2022-07-05 00:45:36 +00:00
values-zh-rTW-nokeys
…
values-zu
Import translations. DO NOT MERGE ANYWHERE
2022-07-03 14:12:52 -07:00
values-zu-nokeys
…
xml
Merge "Recalculate view's height when tab is selected" into tm-dev am: 1f6334825f
2022-06-07 04:40:14 +00:00