PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
110,571 Commits 1 Branch 0 Tags
2e7924abcf8c93fe20f6ac4a323160f083485d9a
Commit Graph

110571 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Julia Reynolds
65b18b5e69 Validate config activities with their rule owners 
Test: RoboTests
Bug: 189332346
Bug: 235823407
Change-Id: Iee1b1caca4d6eb2729feb872c3e4954b6c16519c
Merged-In: Iee1b1caca4d6eb2729feb872c3e4954b6c16519c
 2022-08-10 14:19:14 +00:00
Bruno Kremp
b204960ea4 Fix SIM name in Network Details to show the selected SIM. 
When dual SIM cards with same Carrier Id inserted, authentication of
SIM base network is via default data SIM. However, SIM name shown in
Network Details is always the one inserted first.
Hence, make SIM name of default data SIM shown in Network Details
preferred to keep consistent with the one used for authentication.

Co-authored-by: Yibo Wang <yibo.x.wang@sony.com>

Test: manual test
Bug: 240732444
Change-Id: Ibd64189d6c25b5a64881a0ad9d40854df93481f4
 2022-08-10 15:09:49 +02:00
Prabal Singh
b31624d406 Hide work policy info if safety center is enabled 
Fix: b/241747812
Test: Manually
Test: make RunSettingsRoboTests
ROBOTEST_FILTER=WorkPolicyInfoPreferenceControllerTest

Change-Id: I23d68dd80d91ec9df80dd2542355ecc964583d39
 2022-08-10 09:56:14 +01:00
jasonwshsu
7880aee855 Add pair button in bluetooth details page for hearing aid device 
Root Cause: Users can not connect another ear again after they cancel
the pairing dialog in Accessibility -> hearing aids entry

Solution: Add pair button in bluetooth details page for hearing aid
device

Bug: 233038449
Test: make RunSettingsRoboTests
ROBOTEST_FILTER=BluetoothDetailsPairOtherControllerTest

Change-Id: I6a7af1c2c2263476b040233edb072cc64a2927b0
 2022-08-10 07:20:56 +00:00
Android Build Coastguard Worker
aefa40e682 Snap for 8926023 from b132484ead to tm-qpr1-release 
Change-Id: I5b93a4135e237ee636cf648c23ba47598983d3f2
 2022-08-09 23:26:01 +00:00
Jeff Sharkey
ad89dbb4b5 Merge "Migrate stringslint.py to AyeAye." am: f37834c09f am: 04cdd54030 am: 8c5c4a7a76 am: 8498c4f3d4 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2173867

Change-Id: I16e99485d9f6915f443f3789aed558e08dd02ea9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-09 18:59:49 +00:00
Jeff Sharkey
8498c4f3d4 Merge "Migrate stringslint.py to AyeAye." am: f37834c09f am: 04cdd54030 am: 8c5c4a7a76 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2173867

Change-Id: I6c2af498637ae8766790bc0d348be8a8173e74dd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-09 18:42:53 +00:00
Ats Jenk
fe2a168189 Developer tile for toggling desktop mode 
Create a developer tile for toggling desktop windowing mode.
Relies on desktop windowing prototype flag, captions in shell flag and
freeform to be enabled.

Bug: 241944030
Test: manually verified tile is available in developer tiles
Change-Id: I0e5904ac896405ac166590972a83872cdbabb5a4
 2022-08-09 11:19:30 -07:00
Jeff Sharkey
8c5c4a7a76 Merge "Migrate stringslint.py to AyeAye." am: f37834c09f am: 04cdd54030 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2173867

Change-Id: Ieca0de6f73bb0af73988ceb9c5c08af0044c3566
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-09 18:16:02 +00:00
Jeff Sharkey
04cdd54030 Merge "Migrate stringslint.py to AyeAye." am: f37834c09f 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2173867

Change-Id: Ice243d4b3231199f16d9b59a208867c0986b0d06
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-09 17:48:33 +00:00
Jeff Sharkey
f37834c09f Merge "Migrate stringslint.py to AyeAye." 2022-08-09 17:29:23 +00:00
Himanshu Rawat
cd64f0e384 [automerger skipped] Merge "Don't cancel passkey entry pairing autonomously" into tm-dev am: f073d27097 -s ours am: 6d05b035d1 -s ours am: 245a52c010 -s ours 
am skip reason: Merged-In Ifdb98c16084dd811eed68469e7df5d1913c6ace8 with SHA-1 aa1950fd80 is already in history

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

Change-Id: Ifcbee62366faa4dfc906aeb7785e592d3589cd29
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-09 07:47:21 +00:00
Himanshu Rawat
22691cc301 [automerger skipped] Don't cancel passkey entry pairing autonomously am: d668a888f0 -s ours am: 6b7e6b9fcd -s ours am: e8dc99088c -s ours 
am skip reason: Merged-In Ifdb98c16084dd811eed68469e7df5d1913c6ace8 with SHA-1 aa1950fd80 is already in history

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

Change-Id: I4692f2aa8ee487cbe005edfd4225aba6735a85d0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-09 07:47:20 +00:00
Himanshu Rawat
b6be4770ac [automerger skipped] Merge "Don't cancel passkey entry pairing autonomously" into tm-dev am: f073d27097 -s ours am: 12705de9c8 -s ours am: 58834bca2c -s ours 
am skip reason: Merged-In Ifdb98c16084dd811eed68469e7df5d1913c6ace8 with SHA-1 c2b402bd50 is already in history

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

Change-Id: I3eea077c3f5b16f03454120371c9c0192a9a2c34
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-09 07:46:51 +00:00
Himanshu Rawat
a06469ea63 [automerger skipped] Don't cancel passkey entry pairing autonomously am: d668a888f0 -s ours am: 02062edb25 -s ours am: 99d6748582 -s ours 
am skip reason: Merged-In Ifdb98c16084dd811eed68469e7df5d1913c6ace8 with SHA-1 c2b402bd50 is already in history

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

Change-Id: Idd08fef437d09c0075b839ff56a32878588bcf6c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-09 07:46:50 +00:00
Himanshu Rawat
61ca4c719f [automerger skipped] Merge "Don't cancel passkey entry pairing autonomously" into tm-dev am: f073d27097 -s ours am: 12705de9c8 -s ours am: b132484ead -s ours 
am skip reason: Merged-In Ifdb98c16084dd811eed68469e7df5d1913c6ace8 with SHA-1 c2b402bd50 is already in history

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

Change-Id: Ib755cca4f05697d9f697ae956c548141b8b5a04b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-09 07:46:33 +00:00
Himanshu Rawat
aed2e13f2f [automerger skipped] Don't cancel passkey entry pairing autonomously am: d668a888f0 -s ours am: 02062edb25 -s ours am: 8e5f1b5b74 -s ours 
am skip reason: Merged-In Ifdb98c16084dd811eed68469e7df5d1913c6ace8 with SHA-1 c2b402bd50 is already in history

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

Change-Id: I47a92c8f202fc77b83b01d7dcc93d6ae1fe23ba9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-09 07:46:31 +00:00
Himanshu Rawat
245a52c010 [automerger skipped] Merge "Don't cancel passkey entry pairing autonomously" into tm-dev am: f073d27097 -s ours am: 6d05b035d1 -s ours 
am skip reason: Merged-In Ifdb98c16084dd811eed68469e7df5d1913c6ace8 with SHA-1 aa1950fd80 is already in history

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

Change-Id: Idf957cd9af66d98c320c36b4d06875840a9eb16f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-09 07:31:08 +00:00
Himanshu Rawat
e8dc99088c [automerger skipped] Don't cancel passkey entry pairing autonomously am: d668a888f0 -s ours am: 6b7e6b9fcd -s ours 
am skip reason: Merged-In Ifdb98c16084dd811eed68469e7df5d1913c6ace8 with SHA-1 aa1950fd80 is already in history

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

Change-Id: I89e332a273db1c01eef63f7c560ffad79db383c5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-09 07:31:07 +00:00
Himanshu Rawat
b132484ead [automerger skipped] Merge "Don't cancel passkey entry pairing autonomously" into tm-dev am: f073d27097 -s ours am: 12705de9c8 -s ours 
am skip reason: Merged-In Ifdb98c16084dd811eed68469e7df5d1913c6ace8 with SHA-1 c2b402bd50 is already in history

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

Change-Id: I51e6b4fc0193135ccfc03192df2ac7d17f062609
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-09 07:31:06 +00:00
Himanshu Rawat
8e5f1b5b74 [automerger skipped] Don't cancel passkey entry pairing autonomously am: d668a888f0 -s ours am: 02062edb25 -s ours 
am skip reason: Merged-In Ifdb98c16084dd811eed68469e7df5d1913c6ace8 with SHA-1 c2b402bd50 is already in history

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

Change-Id: I4ba3832a21f6dde054f83f78a608b613bccf79d8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-09 07:31:05 +00:00
Himanshu Rawat
58834bca2c [automerger skipped] Merge "Don't cancel passkey entry pairing autonomously" into tm-dev am: f073d27097 -s ours am: 12705de9c8 -s ours 
am skip reason: Merged-In Ifdb98c16084dd811eed68469e7df5d1913c6ace8 with SHA-1 c2b402bd50 is already in history

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

Change-Id: Ieff7ef668240ea57dfc5d098252a680a6eace1fc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-09 07:31:02 +00:00
Himanshu Rawat
99d6748582 [automerger skipped] Don't cancel passkey entry pairing autonomously am: d668a888f0 -s ours am: 02062edb25 -s ours 
am skip reason: Merged-In Ifdb98c16084dd811eed68469e7df5d1913c6ace8 with SHA-1 c2b402bd50 is already in history

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

Change-Id: I4b52705de96200bf8fb5bb551a43f1bf51409dec
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-09 07:31:00 +00:00
Himanshu Rawat
12705de9c8 [automerger skipped] Merge "Don't cancel passkey entry pairing autonomously" into tm-dev am: f073d27097 -s ours 
am skip reason: Merged-In Ifdb98c16084dd811eed68469e7df5d1913c6ace8 with SHA-1 c2b402bd50 is already in history

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

Change-Id: I2ecc3ff311794336743d574f75054bae032375e0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-09 07:05:42 +00:00
Himanshu Rawat
02062edb25 [automerger skipped] Don't cancel passkey entry pairing autonomously am: d668a888f0 -s ours 
am skip reason: Merged-In Ifdb98c16084dd811eed68469e7df5d1913c6ace8 with SHA-1 c2b402bd50 is already in history

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

Change-Id: Ie9b244a71a6fdebe3a7b10425fe0061e23f19d19
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-09 07:05:41 +00:00
Himanshu Rawat
6d05b035d1 [automerger skipped] Merge "Don't cancel passkey entry pairing autonomously" into tm-dev am: f073d27097 -s ours 
am skip reason: Merged-In Ifdb98c16084dd811eed68469e7df5d1913c6ace8 with SHA-1 aa1950fd80 is already in history

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

Change-Id: Ic8a8b0b5165d6d433331e3c3acac9f1042c76428
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-09 07:04:21 +00:00
Himanshu Rawat
6b7e6b9fcd [automerger skipped] Don't cancel passkey entry pairing autonomously am: d668a888f0 -s ours 
am skip reason: Merged-In Ifdb98c16084dd811eed68469e7df5d1913c6ace8 with SHA-1 aa1950fd80 is already in history

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

Change-Id: I4ad185ed4f71048d2aeb756cf1384e06452dc2ab
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-09 07:04:17 +00:00
Himanshu Rawat
f073d27097 Merge "Don't cancel passkey entry pairing autonomously" into tm-dev 2022-08-09 06:42:00 +00:00
Milton Wu
98239c0da6 Add FLAG_SECURE for ChooseLockPassword and Pattern 
Prevent ChooseLockPassword and ChooseLockPatten being projected to
remote views, add FLAG_SECURE for these screens.

Bug: 179725730
Test: Check these 2 screens not projected to chromecast
Test: robo test for SetupChooseLockPatternTest ChooseLockPatternTest
      SetupChooseLockPasswordTest ChooseLockPasswordTest
Change-Id: I7449a24427c966c1aa4280a7b7e7e70b60997cca
 2022-08-09 04:12:10 +00:00
Android Build Coastguard Worker
a97528e225 Snap for 8920865 from 5fa5132f34 to tm-qpr1-release 
Change-Id: Ifc6b47b98c3f4d63973d54ff98ba257f2b1b53c8
 2022-08-09 00:15:42 +00:00
Automerger Merge Worker
a3e8d15e45 Merge changes from topic "am-c036cb8107fa4697ae97e16bc8c57a94" into tm-d1-dev-plus-aosp am: 355cf5534b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19549238

Change-Id: I68386ae4212ba7ee402a537d61c4a3db92e9c040
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-08 15:24:40 +00:00
Bill Yi
8491ffc957 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 34848403ec -s ours am: ba8de85603 -s ours am: 400ee96a23 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I05753b7c69cb5dbcdac71302307dc5d2fde00d71
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-08 15:24:24 +00:00
Bill Yi
0396db20d7 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 34848403ec -s ours am: e1617e2547 -s ours am: de8d1f362e -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I82af4ad0e93c8f34e9aad6a316ef282f11ad4210
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-08 15:15:38 +00:00
Bill Yi
bb70dd6d3b [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f52497bd40 -s ours am: 9a59cb4425 -s ours am: 7a6cfc59bc -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ic3da25998d311205461b8dbcd15a7fdde9547a46
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-08 15:15:28 +00:00
Bill Yi
9aeb49e969 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 83da16166c -s ours am: 339f517c18 -s ours am: 4e8f9c0dbf -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ib02a441a9a5610567ac55f03f7a2bccd04068e65
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-08 15:15:18 +00:00
Bill Yi
9245ecf252 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 272619ebfc -s ours am: 065b5806ef -s ours am: 05199e1e03 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: If4386e9928b8e8d73188ddbb89f03f8fa04cca68
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-08 15:15:01 +00:00
Bill Yi
6915f8d941 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 34848403ec -s ours am: ba8de85603 -s ours am: 5fa5132f34 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I20bffeebf983e481fefa07f5f9b94d084142263c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-08 14:57:20 +00:00
Bill Yi
45b42b3c77 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f52497bd40 -s ours am: 0cf4c34624 -s ours am: e52590665b -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I2d8cd6119459b5497f8fefdd730e45581873da1c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-08 14:57:12 +00:00
Bill Yi
81c078b3a2 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 83da16166c -s ours am: 4f7ff2683a -s ours am: c6584ab4bd -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ie68b8a64564112074e9df6507a4ae47a217a9f94
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-08 14:57:00 +00:00
Bill Yi
f07c2d63dd [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 272619ebfc -s ours am: 6c210588fc -s ours am: af74f8dfde -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I1b15a0b0c04e72239f6251bc51ebf02927a6a7df
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-08 14:56:44 +00:00
Automerger Merge Worker
355cf5534b Merge changes from topic "am-c036cb8107fa4697ae97e16bc8c57a94" into tm-d1-dev-plus-aosp 
* changes:
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 34848403ec -s ours am: ba8de85603 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f52497bd40 -s ours am: 0cf4c34624 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 83da16166c -s ours am: 4f7ff2683a -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 272619ebfc -s ours am: 6c210588fc -s ours
 2022-08-08 14:45:54 +00:00
Bill Yi
5fa5132f34 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 34848403ec -s ours am: ba8de85603 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I7f188bc1b9e77d04ffdb1afd61d7531d8266ac63
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-08 14:43:31 +00:00
Bill Yi
400ee96a23 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 34848403ec -s ours am: ba8de85603 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I544c7dee0d3cc8a4aaa34e2d2043e38dccf05cde
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-08 14:43:25 +00:00
Bill Yi
e52590665b [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f52497bd40 -s ours am: 0cf4c34624 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I0bdafaa4f8cb1e56ff6b2ec2c7ef120c976a7cce
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-08 14:43:25 +00:00
Bill Yi
fe6ade2ec2 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f52497bd40 -s ours am: 0cf4c34624 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I231dcc9587b3aafbbbff1e4291c2ba3f2dad27fe
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-08 14:43:18 +00:00
Bill Yi
c6584ab4bd [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 83da16166c -s ours am: 4f7ff2683a -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I1d0ce608a264fe5c15f4037b35f911df9ff6ead8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-08 14:43:11 +00:00
Bill Yi
c46f4b35fb [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 83da16166c -s ours am: 4f7ff2683a -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ic6d63b2a784aad8e66dd7c3b1ebe58a54a840850
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-08 14:43:06 +00:00
Bill Yi
af74f8dfde [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 272619ebfc -s ours am: 6c210588fc -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I00769191143c30e2dbaba985611c4b3ac756c478
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-08 14:42:58 +00:00
Bill Yi
de8d1f362e [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 34848403ec -s ours am: e1617e2547 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Icda5c5c8012ea5a9fbf415b6abf8e6baa451a891
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-08 14:42:57 +00:00
Bill Yi
7a6cfc59bc [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f52497bd40 -s ours am: 9a59cb4425 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ieb989bcce06b10b09a76b212948f037fb8afa702
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-08 14:42:51 +00:00