PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
109,869 Commits 1 Branch 0 Tags
bb5b51e44c95a9878fd0b49f7a1b43aabea5590a
Commit Graph

109869 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Yi-Ling Chuang
f3b83b0c67 Merge "Guard against the NPE in getTransitionType()" into tm-dev am: 3bf578c73e am: 33cad52af7 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18447100

Change-Id: Ibcec1e5fbe089c55a3abe273e31b405fae17f1da
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-26 11:33:38 +00:00
Bill Yi
4df2f106db [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 0aaa6d1154 -s ours am: 72642fa03d -s ours am: 2e3963a753 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I779e364f553071542d1ecc15816fa3ed3350b059
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-26 10:56:15 +00:00
Kate Montgomery
fff219744b Merge "Flag off stickiness of show/hide system setting." into tm-dev am: d79959bd7d am: c99a03e749 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18399916

Change-Id: I4d69c3c1a763e077883db3299b67f30731ef7274
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-26 10:26:44 +00:00
TreeHugger Robot
55fbc64693 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: c41e921e1c -s ours am: 2937a50efb -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ie8ab0cf30e36fee048b20658d815ceaa2812c68f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-26 10:22:54 +00:00
Bill Yi
a6bc2a15aa [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ff3c01f123 -s ours am: 6376db2aaf -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I8ed76346b9d6a2dbbaf9ebb64d1a3c2057211c78
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-26 10:22:44 +00:00
TreeHugger Robot
035e4440ef Merge "Update Spatial audio settings page" into tm-dev am: 6993aa86eb am: 5d509d1564 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18456662

Change-Id: Id40aa22ec2ddd016c8ccbff89cb234a71026c07e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-26 10:12:20 +00:00
TreeHugger Robot
5a82cdff23 Merge "Guard against the NPE in setPreferenceIcon()" into tm-dev am: cce3381ed4 am: 69fe472c92 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18447101

Change-Id: Idd9e0232042280162535a6048917a913e15f294c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-26 10:12:13 +00:00
TreeHugger Robot
4718181211 Merge "Fix incorrect battery icon showing on the recent apps" into tm-dev am: 1cf78b8b83 am: 52a529c104 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18447091

Change-Id: Ia346f808b9d309e34a86fc2186cd2d059037c6c8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-26 10:12:06 +00:00
Bill Yi
bae0c3658c [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 6890a9fd64 -s ours am: 1dfa58f5e6 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I35709820c0a86687887e6adf677a897fe66872ff
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-26 10:11:56 +00:00
Arc Wang
3a51651733 [automerger skipped] Center apps Preference title when there is no summary am: 3cb8171f4f am: 7a534025bf -s ours 
am skip reason: Merged-In I6fceba243e2ccac9ea180b940b571da07e1ba805 with SHA-1 e4673a3dc8 is already in history

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

Change-Id: I54cdceb35924f1cee57a508116ddd4207a3c1c91
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-26 10:11:49 +00:00
Chaohui Wang
5b987b718c Fix flicker in Location page when location is off am: f9ebeadb33 am: fd98622f97 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18402153

Change-Id: I85ce427c2a71062910594323b373ac82f7fa655a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-26 10:11:41 +00:00
Hugh Chen
11a3a0ddc8 [automerger skipped] RESTRICT AUTOMERGE Make bluetooth not discoverable via SliceDeepLinkTrampoline am: 06139d3ffc am: c2bb599eeb -s ours am: 8ddd1d70b2 -s ours am: 22ce749aa6 -s ours am: 8ce854af29 -s ours am: 136af4e593 -s ours am: 40ed71c895 -s ours am: c4899bf019 -s ours am: 4e0eaf1624 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I55e993556eb5e4990a5728f6561c6bd5c3ed3fe8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-26 10:11:34 +00:00
Hugh Chen
9488e03781 [automerger skipped] RESTRICT AUTOMERGE Make bluetooth not discoverable via SliceDeepLinkTrampoline am: c44b6fed73 am: d925f52768 -s ours am: 8d4a4b690f -s ours am: f13ceb8aea -s ours am: ddc8e16cd6 -s ours am: 0e568376a3 -s ours am: 5558b22a8c -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I2b2531de1ea9110a1571aa9c18d8ebfffbfa24d3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-26 10:11:25 +00:00
Hugh Chen
554a65a5f4 [automerger skipped] RESTRICT AUTOMERGE Make bluetooth not discoverable via SliceDeepLinkTrampoline am: 9399a699d7 -s ours am: 1e636ad03e -s ours am: dc1023e587 -s ours am: 3d0db8d34f -s ours am: e5d54e867c -s ours am: f189662037 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ib84b97617ebb11b4b07dc38a8f6d3944e60573df
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-26 10:11:17 +00:00
Tom Hsu
d4f8901f7c Merge "[Panlingual] Fix the item clicked is not match target application" into tm-dev am: 45c60f8564 am: b1a5167a8d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18356600

Change-Id: I6bbd76fc84f8cdfe2ad94f89993ff86695715acf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-26 10:11:10 +00:00
TreeHugger Robot
b1a6d1af77 [automerger skipped] Merge "RESTRICT AUTOMERGE Make bluetooth not discoverable via SliceDeepLinkTrampoline" into sc-qpr1-dev am: 20457ad117 -s ours am: e26317b97c -s ours am: ce98ad58a5 -s ours am: 132ffcade3 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I622d2cdcc12a8c03864a2385b67bca9c7037f773
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-26 10:11:00 +00:00
Hugh Chen
9c3fcf2fde [automerger skipped] RESTRICT AUTOMERGE Make bluetooth not discoverable via SliceDeepLinkTrampoline am: 663066691e -s ours am: e178179a9e -s ours am: 97299b8c00 -s ours am: 501ff023cb -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ibfeefa040e1acc306372f91e6928ecd26e6870bd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-26 10:10:59 +00:00
Hugh Chen
176225c177 [automerger skipped] [automerge] RESTRICT AUTOMERGE Make bluetooth not discoverable via SliceDeepLinkTrampoline 2p: 1c4142e1ae am: 23ab123ba7 -s ours am: a2d6c9a087 -s ours am: eab5e61360 -s ours am: 6f866f150b -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ic83e3ac3b4ed2440b905d61c2f0cd495ab0dfd5f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-26 10:10:51 +00:00
TreeHugger Robot
81052727d7 [automerger skipped] Merge "RESTRICT AUTOMERGE Make bluetooth not discoverable via SliceDeepLinkTrampoline" into sc-v2-dev am: c8603dabf2 -s ours am: 04cc0c8073 -s ours am: db2705999a -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I1c40e7a3fc9e4d1433f0ab379c7809a1e7480de7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-26 10:10:41 +00:00
Hugh Chen
d38870100a [automerger skipped] RESTRICT AUTOMERGE Make bluetooth not discoverable via SliceDeepLinkTrampoline am: 8bae222489 -s ours am: 6774dbbe03 -s ours am: c2da472477 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I24fc47c144356011bfe325364146087be3cf83fb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-26 10:10:39 +00:00
Jason Chiu
0c732f2a80 Don't start two pane for singleInstance deep links 
If the activity's launch mode is "singleInstance", it can't be embedded
in Settings since it will be created in a new task.

Bug: 229371407
Test: adb shell am start -a android.settings.NETWORK_OPERATOR_SETTINGS
Change-Id: I1689d860151182cd9e97d9e4fd65d30a8804a570
 2022-05-26 17:47:18 +08:00
tom hsu
d793e9512d Fix wrong summary string show on the network page. 
Bug: 206742805
Test: local test, see b/206742805#4
Change-Id: I4fa9468e4f3b7d3671e383d3203b67636daa416c
 2022-05-26 17:41:13 +08:00
Chaohui Wang
3a99f7c370 Fix flicker for AppDataUsagePreference 
AppDataUsagePreference's title is sometime async loading, which cause
preference height change, which lead to page flicker.

Set a title placeholder before async loading to reduce flicker.

Fix: 187019210
Test: manual visual test
Change-Id: I26df832ab03a04641fd3d6eb678903ff3fe8820a
 2022-05-26 17:36:45 +08:00
TreeHugger Robot
2a83136398 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 12a30b9511 -s ours am: 7ab31e744a -s ours am: a60e8c0f03 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Iebe568df9753210598b5f7d2138c0f059c23e129
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-26 08:53:55 +00:00
Bill Yi
4de10215ec [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: d941a36042 -s ours am: 900e78b59d -s ours am: 74bc2e20e4 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Id069527454707fd5a69cbe211a842238e36c68a7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-26 08:53:39 +00:00
Bill Yi
7054b123ef [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 1c8b7a9fe8 -s ours am: 66ad02c375 -s ours am: 04f012f755 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I68fbfe959ec250271a43fcbbc253b242edfec7b4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-26 08:53:25 +00:00
Bill Yi
767f523875 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 4cf0235db1 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I3e867df55e5a6e8eddfe63e7cb934d73dcd6f9fb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-26 08:50:22 +00:00
TreeHugger Robot
09023f0125 Merge "Add the ripple effect to the highlight background" into tm-dev am: 56e3f60dec am: 472d540799 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18356599

Change-Id: I634ef31fab033dd75c78eede976cac7a297b2ab1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-26 08:45:21 +00:00
Arc Wang
46cbfd9ca1 Fix Settings crash when setting a null ringtone am: ec3ae8bb17 am: 7b14f3130c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18400413

Change-Id: I371c69d46326485f8219a06d83160a1ba5df1269
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-26 08:45:12 +00:00
TreeHugger Robot
99a9857e7f [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod am: 673ba1d114 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I0f49cfe2ea047ac5ef3f64fac549ae999be3405a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-26 07:54:41 +00:00
Bill Yi
9c7309a89b [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 3634c0bac5 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I64fe442ad620f62cc2149693262a642e9ab09d7b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-26 07:54:26 +00:00
Xupei Li
05301c7d1a Settings: Change array resource sim_color_light to an integer array 
* It should be an integer array because its items are all color reference, and I found that the translations of this resource can lead to not show SIM color in languages other than English.

Change-Id: I6264abdfd0a49119e0170ae5c4bec437ad4c9e8f
 2022-05-26 07:17:58 +00:00
Hank Sheng
bdda48ebe5 Create the glifv4 theme and set to glifv4 theme when the themestring is glifv4. 
screen shot:
https://hsv.googleplex.com/5487921525161984
https://hsv.googleplex.com/4853914928152576
https://hsv.googleplex.com/6492643191160832
https://hsv.googleplex.com/5915886260060160
https://hsv.googleplex.com/6321050657751040
https://hsv.googleplex.com/6222016362315776

Bug: 233036258
Bug: 233032365
Change-Id: If2bb4a82912bfdd18dc17ced11adc59eaf474bed
 2022-05-26 07:17:36 +00:00
Amy Hsu
ea858a6afc [ScreenResolutionController] UI string update 
Bug: b/230626771
Test: Check the string manually
Change-Id: Ic5c8ed146297bf1672e18e078aa8389738584cfb
 2022-05-26 11:33:52 +08:00
SongFerngWang
948f512098 Changing the condition since the esim may be removable 
The condition whether the slot is esim slot should use getIsEuicc
api since the esim may be removable.

Bug: 233338345
Test: atest UiccSlotUtilTest
Change-Id: I47dc068e57a0faa7f7ce85af7933a48caa2c93e4
 2022-05-26 10:54:39 +08:00
Automerger Merge Worker
bbc66f248d Merge changes from topic "am-b26f2cb44c53490f868637cd5d96ec61" into tm-d1-dev-plus-aosp am: 9c9743a464 am: b81192f261 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18586095

Change-Id: Id17bb16746c445bc6efacf33756e81e1d46f84a6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-25 20:46:58 +00:00
Bill Yi
a7dd5214db [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: b91e43c526 -s ours am: 6096b86e1a -s ours am: 2366eddc23 -s ours am: 83f7a4775c -s ours 
am skip reason: subject contains skip directive

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

Change-Id: If623bc002056e6056df393e2b1905528c787e2b2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-25 20:46:41 +00:00
Automerger Merge Worker
cdec79473f Merge changes from topic "am-1f81d4e1bbf440c4b1a2b336aefd3506" into tm-qpr-dev-plus-aosp am: 35b5383b73 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18586095

Change-Id: Ia92c4485d8b39cd69eb5818ebf3c6b5a3eafde7f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-25 20:44:00 +00:00
Bill Yi
467fee39c7 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: b91e43c526 -s ours am: 6096b86e1a -s ours am: e75601afb3 -s ours am: 84f44060f6 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I3fbd9270b609dcc10c73f0260a0d3511b9b51953
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-25 20:43:17 +00:00
Bill Yi
bf00bb238a [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: b91e43c526 -s ours am: 7cbd699752 -s ours am: 39208432c2 -s ours am: bcb0120461 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I353ea85ed0a84ced8d79e26d0964c716add2cd7c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-25 20:36:14 +00:00
Bill Yi
bc1ac025e5 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: fdcf407543 -s ours am: 142b69b865 -s ours am: 8c834259b1 -s ours am: 8b5d3ce26d -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I1af31b6fda5fba07fc6ce592ff8663ea751f2a17
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-25 20:36:08 +00:00
Bill Yi
af6197baf3 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: f4cb74b97a -s ours am: d3f6a2192f -s ours am: 5ad0301bbe -s ours am: 58114edf1c -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I47230e05cfd2af7037f15259e723604634b0d721
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-25 20:35:54 +00:00
Bill Yi
95a0827347 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: cec4bd47cb -s ours am: a34af9b081 -s ours am: 6ea19fdbb7 -s ours am: c8733029be -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ideef1e8725541cb1479249b8fdeea5bd4bcbb06b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-25 20:35:38 +00:00
Automerger Merge Worker
b81192f261 Merge changes from topic "am-b26f2cb44c53490f868637cd5d96ec61" into tm-d1-dev-plus-aosp am: 9c9743a464 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18586095

Change-Id: Icae4749c2f427be2d2021f6bf91666e3f383fe5a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-25 20:15:03 +00:00
Bill Yi
83f7a4775c [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: b91e43c526 -s ours am: 6096b86e1a -s ours am: 2366eddc23 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I8874e336869963ed7df2f809f7b7abcb1d88cd5c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-25 20:14:46 +00:00
Automerger Merge Worker
35b5383b73 Merge changes from topic "am-1f81d4e1bbf440c4b1a2b336aefd3506" into tm-qpr-dev-plus-aosp 
* changes:
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: b91e43c526 -s ours am: 6096b86e1a -s ours am: e75601afb3 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: fdcf407543 -s ours am: c99eb87613 -s ours am: 02cc0fd744 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: f4cb74b97a -s ours am: f344101fdb -s ours am: 760d7ac4f9 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: cec4bd47cb -s ours am: 9b4e0f0e67 -s ours am: c43c833edf -s ours
 2022-05-25 20:13:08 +00:00
Bill Yi
bcb0120461 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: b91e43c526 -s ours am: 7cbd699752 -s ours am: 39208432c2 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Id96e98dacec28faa26423f50090a26f5c2d47f0b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-25 20:11:38 +00:00
Bill Yi
8b5d3ce26d [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: fdcf407543 -s ours am: 142b69b865 -s ours am: 8c834259b1 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I4968ce85dee29dfc15e3ce95e83ca9fcf5fa8487
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-25 20:11:29 +00:00
Bill Yi
58114edf1c [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: f4cb74b97a -s ours am: d3f6a2192f -s ours am: 5ad0301bbe -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ibdbb8911a9c51f902c73525a7d269693827fb044
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-25 20:11:14 +00:00
Bill Yi
c8733029be [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: cec4bd47cb -s ours am: a34af9b081 -s ours am: 6ea19fdbb7 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I100af5841f318de3facae67f92e75e2807a8b1f1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-25 20:11:01 +00:00