Bill Yi
4368d3a79a
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 49d00437a6
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23664034
Change-Id: I3cf6e2db154acc9d2b64a47a9fd1a43e70e10063
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-14 04:26:23 +00:00
Treehugger Robot
7e88b1ed07
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: a505517090
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23664847
Change-Id: Icd531ab1576b548a996d8f975d130eefb8a30360
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-14 03:42:34 +00:00
Bill Yi
d0d5c9d84c
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 58628e0170
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23664847
Change-Id: I87b24056f4a0d370634fe2ccc2237ea8045fddea
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-14 03:42:25 +00:00
Treehugger Robot
7930f72c4d
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: c706f8544d
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23664844
Change-Id: I850098c780abe7d600eee7243df0f033d387f1c9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-14 03:42:18 +00:00
Bill Yi
7c2f3a4ba1
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 23819646e2
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23664844
Change-Id: Ibcd3f5106e8f6ca98315c92437b7a0179f1e66ce
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-14 03:41:55 +00:00
Treehugger Robot
7d610e7f85
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 958690e3a5
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23664035
Change-Id: I12b528b5410a96bf63d6fb645f12682e57e40b6e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-14 03:41:36 +00:00
Bill Yi
94f17b981a
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b86bd3cfe3
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23664035
Change-Id: I29ed00f4ef95520f1ebbe6ecdadf9eaa6d1432c0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-14 03:41:19 +00:00
Zaiyue Xue
da62051efd
Merge "Don't load battery entry names and icons in offline job to improve memory usage." into udc-dev am: 8c25fe4c60
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23596963
Change-Id: Ie9e6621a39e30b5ba000e2bf6516719eea2a8fd5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-14 03:39:42 +00:00
Treehugger Robot
b8ddf4126c
Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod
2023-06-14 03:33:21 +00:00
Treehugger Robot
a505517090
Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev
2023-06-14 03:32:14 +00:00
Treehugger Robot
c706f8544d
Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev
2023-06-14 03:32:14 +00:00
Treehugger Robot
958690e3a5
Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev
2023-06-14 03:32:14 +00:00
Zaiyue Xue
8c25fe4c60
Merge "Don't load battery entry names and icons in offline job to improve memory usage." into udc-dev
2023-06-14 03:01:25 +00:00
Grace Cheng
f58714496a
Fix NPE in updateAddPreference
...
Update mAddFingerprintPreference to avoid NPE
Fixes: 286495189
Test: Rotate screen during first fingerprint enrollment, complete enrollment, and observe no crash
Change-Id: Id7edde492168b467360c6c99b326721cd883bba8
Merged-In: Id7edde492168b467360c6c99b326721cd883bba8
2023-06-13 19:23:04 +00:00
Bill Yi
fec819220b
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 5e54379b8a
-s ours am: 32b73cd4ea
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23664037
Change-Id: If4718b30ee626a955a2da4d2d577116cde5bd6d8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-13 18:48:15 +00:00
Bill Yi
d152123a74
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 29e59fbd3a
-s ours am: c7d760438a
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23664033
Change-Id: I9b83f96b046054735004994bba24dba2b53c610f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-13 18:15:54 +00:00
Bill Yi
a20c952bb6
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 5e54379b8a
-s ours am: c52befa925
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23664037
Change-Id: I2b1476f7e11814649388cc8c08c976b1bb1a643d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-13 18:15:33 +00:00
Bill Yi
c7d760438a
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 29e59fbd3a
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23664033
Change-Id: I31527b6935660fe76669f6d711beb978e55600b1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-13 18:08:05 +00:00
Bill Yi
32b73cd4ea
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 5e54379b8a
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23664037
Change-Id: I5cc0f93640e97a83a96c3e37d1a891dd0dd82d2d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-13 18:04:11 +00:00
Bill Yi
c52befa925
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 5e54379b8a
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23664037
Change-Id: Iab183d63901b1abd798cce19c452634518daca35
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-13 18:03:19 +00:00
SongFerngWang
f405dadcf2
Remove the owner
...
Bug: 286964921
Test: build pass
Change-Id: I4daf629e8cb994753dca36a811f0d25685df6928
2023-06-13 15:10:46 +08:00
Bill Yi
58628e0170
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I2daf643f4601e64d83742cfbf1d895e8b272bc98
2023-06-12 13:36:39 -07:00
Bill Yi
23819646e2
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I7203e546696a4dde1d8c8f7b32e6a432f7a5bcb8
2023-06-12 13:29:45 -07:00
Treehugger Robot
c823f0aa45
Merge "DO NOT MERGE: Prevent non-system IME from becoming device admin" into udc-dev am: decc428857
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23545057
Change-Id: Icba0b458b25bdef0dc25a4882c9c8799d0a46885
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-12 20:29:38 +00:00
Taran Singh
6f6747910d
DO NOT MERGE: Prevent non-system IME from becoming device admin am: 9260c67352
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23545057
Change-Id: I44012b898eec57e26fdc4d6d4a38c54578b8a0e2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-12 20:29:37 +00:00
Bill Yi
5e54379b8a
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Ib262798ed73568339f2f5ac4e6cf40c1ab08f7c6
2023-06-12 13:28:15 -07:00
Bill Yi
b86bd3cfe3
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I03150507e9d454e50da97bbf70752f7fc2736975
2023-06-12 13:26:17 -07:00
Bill Yi
49d00437a6
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Id5d119a140094265999e5ac40d4444956d1cbf4c
2023-06-12 13:24:36 -07:00
Bill Yi
29e59fbd3a
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I9f0371fcd4317dd3da3dbcb11f0b0d472ca24673
2023-06-12 13:22:55 -07:00
Treehugger Robot
decc428857
Merge "DO NOT MERGE: Prevent non-system IME from becoming device admin" into udc-dev
2023-06-12 19:57:26 +00:00
Han Xu
2fb6c5887d
Add manufactured year into hardware info page am: b452bc9f9d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23629342
Change-Id: I59bab60a59b531e25663b3e34a554f3ac7dfc87b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-12 17:44:38 +00:00
Han Xu
b452bc9f9d
Add manufactured year into hardware info page
...
Bug: 285471557
Test: manual visually
Change-Id: Iaab254ac6ee77217e29d89524d782577f44119cb
2023-06-12 17:43:55 +08:00
Jason Hsu
d2c7424293
Merge "Change the summary string to exclude 'Audio output' feature" into udc-dev am: fecfa96723
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23557965
Change-Id: I4fd0ed02f598224a5f93aa646f8895298a64ac90
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-12 04:09:31 +00:00
Jason Hsu
fecfa96723
Merge "Change the summary string to exclude 'Audio output' feature" into udc-dev
2023-06-12 03:54:11 +00:00
Zaiyue Xue
ec032710dc
Don't load battery entry names and icons in offline job to improve memory usage.
...
Risk: low (The name and icon will be always loaded again in the UI.)
Bug: 280720236
Fix: 280720236
Test: manual
Change-Id: I86f50e953ffd4910acbf9f318e1cc1caa3a7a232
Merged-In: I86f50e953ffd4910acbf9f318e1cc1caa3a7a232
2023-06-12 10:49:01 +08:00
Avinash Vadlamudi
90d3d346e6
[Auto Pin Confirmation]: Add talkback capability for Auto-confirm correct PIN checkbox even if it is not in focus am: 01637b556e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23601571
Change-Id: I58b483720e2a7ed6ed5d92094192fe2b7a5f3df6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-10 01:58:13 +00:00
Avinash Vadlamudi
01637b556e
[Auto Pin Confirmation]: Add talkback capability for Auto-confirm correct PIN checkbox even if it is not in focus
...
- set accessibilityLiveRegion as Polite mode to allow talkback to announce the state of checkbox even if is not in focus
Bug: 281950677
Test: Manual test by flashing on device and checking in talkback mode
Change-Id: Ia1066e2df1f40e6c339a4cd63f92acf0858f8f3d
2023-06-10 01:25:18 +00:00
Fabian Kozynski
9bbac9f715
Merge "Fix typo in product string" into udc-dev am: d3df7f5090
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23600032
Change-Id: I18c217922a8725f376f02e9f6d07d10de3cac891
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-09 18:32:29 +00:00
Fabian Kozynski
d3df7f5090
Merge "Fix typo in product string" into udc-dev
2023-06-09 17:44:36 +00:00
Mady Mellor
9db4671279
Merge "Update the colors for bubbles settings based on new spec" into udc-dev am: 57406435cf
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23622468
Change-Id: I045d775faec3df27cfde23e9b52ca29574d20511
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-09 16:13:15 +00:00
Oli Thompson
86f36a032f
Merge "Fix emergency button not visible on pattern work challenge screen" into udc-dev am: 01b382546e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23631338
Change-Id: I06044fd93191b0799858c6db9f194a222fa7fe99
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-09 16:12:19 +00:00
Mady Mellor
57406435cf
Merge "Update the colors for bubbles settings based on new spec" into udc-dev
2023-06-09 15:33:30 +00:00
Oli Thompson
01b382546e
Merge "Fix emergency button not visible on pattern work challenge screen" into udc-dev
2023-06-09 15:31:17 +00:00
Oli Thompson
dcce8fa662
Fix emergency button not visible on pattern work challenge screen
...
Hide the subtext for work challenge pattern,so everything fits and
adjust some spacing
Test: btest a.d.g.WorkTelephonyTest#workChallengePatternScreen_whenAllSubscriptionsManaged_hasEmergencyButton -nm
Bug: 283137301
Bug: 286391641
Change-Id: Ia6214b624f8d7328f7445f01a08166b8ab33fdec
2023-06-09 13:06:39 +00:00
Treehugger Robot
ccbb133718
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 17d8a837ee
-s ours am: d422e6e895
-s ours am: 58fedeb053
-s ours
...
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2614632
Change-Id: Ibf985f2de02b4109646b73554a08ced641753243
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-08 21:41:55 +00:00
Bill Yi
2afe393b43
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: a80c569b36
-s ours am: 44b121b7c9
-s ours am: 4dbe6e87f2
-s ours
...
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2614632
Change-Id: Ib9d0cb3bda8aab108fe1f916694751a289efd780
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-08 21:41:42 +00:00
Treehugger Robot
9aa61fb21a
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 675179075c
-s ours am: 6bf1d3b6cc
-s ours am: 0139435f36
-s ours
...
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2614631
Change-Id: I5e5fbd2b732abc0120fc364f7a9c89e334ee19b6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-08 21:41:22 +00:00
Bill Yi
9185c4eb85
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 5dcde1cfde
-s ours am: 4447361119
-s ours am: 9b90a5260a
-s ours
...
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2614631
Change-Id: I10aeccb5883f01f7b95b6b496b0e00828ec5ae85
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-08 21:40:59 +00:00
Treehugger Robot
58fedeb053
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 17d8a837ee
-s ours am: d422e6e895
-s ours
...
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2614632
Change-Id: I2be65cd7ff57dbafdc6f687e2d18009bc4cfdc4a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-08 20:54:19 +00:00
Bill Yi
4dbe6e87f2
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: a80c569b36
-s ours am: 44b121b7c9
-s ours
...
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2614632
Change-Id: I5fb2edeada2bcb5a84a78ab8c3ba30e08069d9b9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-08 20:54:02 +00:00