Zaiyue Xue
c73bb0874e
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: I337dc943ce94ab303d1b1f555f89b5e347ad11bc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-14 03:41:53 +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
Treehugger Robot
5004aa4057
Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-mainline-prod
2023-06-13 19:27:07 +00:00
Bill Yi
71c6887a4a
[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: Ibf4a9de8f2dc4afb7ccb294c8fe25f33b516b692
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-13 18:12:06 +00:00
Bill Yi
d6c479940a
[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: I16e4ea1236aeaa79775823d623d3621e051a1e10
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-13 18:11:45 +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
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
Treehugger Robot
afc1826562
Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-mainline-prod
2023-06-13 17:23:18 +00:00
Bill Yi
aa3e86a4f1
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Ifec4827871d0180c64e68f614fe5e5dad5a3196a
2023-06-13 00:52:33 -07:00
Bill Yi
5c20a28a88
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I2195b6922ed0862d1c5fe242f05a798ed470590c
2023-06-13 00:50:22 -07:00
Treehugger Robot
48b541abfb
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: I572e58d1ce3150a8d5a9e489fe5b55f00177e57a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-12 20:29:18 +00:00
Taran Singh
feea08e693
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: I533b1a673de2d3660a75452f5f7c58fe33ab55a6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-12 20:29:17 +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
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
eefb4e777d
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: I75182c66daf65a4b48cfe7a66fb67cbbfba74b7d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-12 17:43:48 +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
842eda9339
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: I46a25dd5193e7077a3122e8c1bfa94131cd62ee2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-12 04:19:33 +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
3730239bd7
[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: I72e847af6480cc3787e4ae1c8777656800ab4dae
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-10 02:03:03 +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
01f7d38e8a
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: I6bda0911ef32a2262bacaee387e0e6d91104e56f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-09 18:30:41 +00:00
Fabian Kozynski
d3df7f5090
Merge "Fix typo in product string" into udc-dev
2023-06-09 17:44:36 +00:00
Mady Mellor
d219333161
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: Icd172f86a9893c0733b5ed5791c7e7017dd227d4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-09 16:17:58 +00:00
Oli Thompson
03bd83270a
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: If1f8a496fc6fec8419619d9c399bddb21bfcc232
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-09 16:17:41 +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
Mady Mellor
fb1e921bd9
Update the colors for bubbles settings based on new spec
...
Test: manual - get a bubble, go to that apps bubble settings screen,
observe the colors look correct, switch theme and
check again.
Bug: 283951560
Change-Id: I28fa64f8d7b53419a57615bf3da4da7eff049674
2023-06-08 13:23:54 -07:00
Mady Mellor
ee31358597
Merge "Fix colors in bubble settings so they're more visible" into udc-dev am: 8a47899369
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23607273
Change-Id: Id35a456c7a07f1c232150aa9223f5a84d33dcf06
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-08 18:22:59 +00:00
Mady Mellor
8a47899369
Merge "Fix colors in bubble settings so they're more visible" into udc-dev
2023-06-08 17:35:55 +00:00
Mady Mellor
f184678802
Fix colors in bubble settings so they're more visible
...
Test: manual - get a bubble, go to that apps bubble settings screen,
observe the colors look correct, switch theme and
check again.
Bug: 283951560
Change-Id: I361b1c20e293c02b4d604e0b5845a074c31e5103
2023-06-08 09:21:13 -07:00
jasonwshsu
ac04ce9091
Change the summary string to exclude 'Audio output' feature
...
'Audio output' plan to punt into U-QPR or V. Change the summary to not mention it.
Bug: 286174797
Test: flash rom and check UI not exist
Change-Id: I66ffb26c9b9ed612f41be7025a474cc63f256d87
2023-06-08 09:05:53 +00:00
Treehugger Robot
c334825405
Merge "Fix low contrast on work challenge screen emergency call button" into udc-dev am: a34a510a40
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23601981
Change-Id: I4d882fe72b24e512d089772378cdc31d69e277e0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-08 00:50:26 +00:00
Treehugger Robot
a34a510a40
Merge "Fix low contrast on work challenge screen emergency call button" into udc-dev
2023-06-08 00:15:18 +00:00
Oli Thompson
ab73c1a3e3
Fix low contrast on work challenge screen emergency call button
...
Bug: 285718470
Test: btest a.d.g.WorkTelephonyTest#workChallengePinScreen_whenAllSubscriptionsManaged_hasEmergencyButton -nm
Change-Id: I546e30e7f0b9b5eccd54e912274eeb6ba1a7a6e6
2023-06-07 19:25:59 +00:00
Aleksandar Kiridžić
85bc7cf3e8
Merge "speech: On-device recognition settings profile selector" into udc-dev am: b5b15a6689
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23517421
Change-Id: I7067a39e91e74c5956e2301081f53f021bfdb979
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-07 18:42:39 +00:00
Aleksandar Kiridžić
b5b15a6689
Merge "speech: On-device recognition settings profile selector" into udc-dev
2023-06-07 17:53:38 +00:00
Fabián Kozynski
5ec8f8d315
Fix typo in product string
...
Fix the typo so the string displays in the correct products.
Test: manual, using tablet product
Fixes: 284007230
Change-Id: I970c214f46e0d30ecb92ff8f24c6f3fd8dfe33e3
2023-06-07 12:45:41 -04:00
TreeHugger Robot
19f1707fda
Merge "[Settings] Fix crash when user enter bluetooth page quickly." into udc-dev am: 3e374cc7a7
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23601556
Change-Id: Ia5b21af9f18c286c5f8cdb480209db5859e53e82
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-07 13:03:24 +00:00
TreeHugger Robot
3e374cc7a7
Merge "[Settings] Fix crash when user enter bluetooth page quickly." into udc-dev
2023-06-07 12:13:51 +00:00
tom hsu
bf7865b27e
[Settings] Fix crash when user enter bluetooth page quickly.
...
- When SliceManager try to pinSlice, process may not have the permssion
yet, so in Androix lib it use try/catch to avoid Security exception.
However, if SliceManger quickly unpinSlice after pinSlice, process
may still not get the permission yet, then due to no security
exception, it cause the settings crash.
Bug: 283065718
Test: atest passed
Test: Manual test passed
Change-Id: I2293fca73e65dfaa34237abe57e0c6a3fe0f62bb
2023-06-07 09:37:21 +00:00
George Chang
4b49493d05
Merge "Correct typo in the launch via NFC bottom string" into udc-dev am: 832e0b015e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23584036
Change-Id: I65f5b640f3f66f69f83cab8f81f6229064f6d363
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-07 09:33:13 +00:00
George Chang
832e0b015e
Merge "Correct typo in the launch via NFC bottom string" into udc-dev
2023-06-07 09:02:51 +00:00
Ale Nijamkin
306421f87f
Merge "Fixes nav stack issue." into udc-dev am: b5dda005fd
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23573917
Change-Id: Iedb6d5b7454e973a99d512cda94b0278fa801d4e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-06 19:44:07 +00:00
Ale Nijamkin
b5dda005fd
Merge "Fixes nav stack issue." into udc-dev
2023-06-06 18:48:59 +00:00
Treehugger Robot
8b66ae6b87
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: f996cfceba
-s ours am: 059773bd86
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23559398
Change-Id: I3b9eed2e78368c0b370f831fe69d263921d2614a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-06 14:51:19 +00:00
Bill Yi
a8d77892c5
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 506e105fdb
-s ours am: 284d320abb
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23559398
Change-Id: I6a59db556b021ca9d97782164217add35ebb9e08
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-06 14:51:18 +00:00
Treehugger Robot
870f0419f6
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: ba4dc8f0bc
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23559401
Change-Id: I4610de244a9baa232d58a30181f3be3c42fea106
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-06 14:50:05 +00:00