Commit Graph

124382 Commits

Author SHA1 Message Date
Bill Yi
03f8992ecc [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: a80c569b36 -s ours am: 44b121b7c9 -s ours am: 4dbe6e87f2 -s ours am: 2afe393b43 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ie79d61fa68c680f2623c243963c3995ae3037972
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-08 22:38:56 +00:00
Treehugger Robot
c1a68f619f [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 675179075c -s ours am: 6bf1d3b6cc -s ours am: 0139435f36 -s ours am: 9aa61fb21a -s ours
am skip reason: subject contains skip directive

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

Change-Id: I1cc218e7c2425d8b666bfc2abe63d34fb81d684d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-08 22:38:36 +00:00
Bill Yi
e718d877d0 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 5dcde1cfde -s ours am: 4447361119 -s ours am: 9b90a5260a -s ours am: 9185c4eb85 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I2b34635fac17beda9c384f032ddc147faad763a5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-08 22:38:18 +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
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
Treehugger Robot
0139435f36 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 675179075c -s ours am: 6bf1d3b6cc -s ours
am skip reason: subject contains skip directive

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

Change-Id: I771a03386f7a13325eb197e40a1558fe6fd50471
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-08 20:53:43 +00:00
Bill Yi
9b90a5260a [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 5dcde1cfde -s ours am: 4447361119 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I6f4c2bb6bb7cc9db82229acc4bd117092a0394ba
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-08 20:53:26 +00:00
Bill Yi
44b121b7c9 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: a80c569b36 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I3ddc1ad1814db16b6a9ff11046cc1b58ee9038b4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-08 20:13:39 +00:00
Treehugger Robot
6bf1d3b6cc [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 675179075c -s ours
am skip reason: subject contains skip directive

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

Change-Id: If22ae483107c3450ce9fa30d462f2530bb6e3da2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-08 20:13:18 +00:00
Bill Yi
4447361119 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 5dcde1cfde -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ia3ca6c734cd069412d0a98f9b188af3ac54eb18d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-08 20:12:57 +00:00
Treehugger Robot
675179075c Merge "Import translations. DO NOT MERGE ANYWHERE" 2023-06-08 19:37:07 +00:00
Mady Mellor
87c2c90482 Merge "Fix colors in bubble settings so they're more visible" into udc-dev am: 8a47899369 am: 020007946a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23607273

Change-Id: Ic37c525e95e4d72baf3e76585bdfa127a05a245e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-08 19:07:36 +00:00
Mady Mellor
1c4809812a Merge "Fix colors in bubble settings so they're more visible" into udc-dev am: 8a47899369 am: 7605e122ac
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23607273

Change-Id: I4a04c727ca345d6a6197747dd1eff28fc6702c77
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-08 19:02:37 +00:00
Mady Mellor
7605e122ac 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: I66d7e691b5472f108303950f4a1a45347febb903
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-08 18:22:45 +00:00
Mady Mellor
020007946a 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: I20c56b5838988404b13524d88c2e9ff9467d8484
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-08 18:18:17 +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
Joanne Chung
bba1da3581 Merge "Update OWNER file to new owner" am: 6c84f9128d am: e7b01f0ce8 am: 16a3800902 am: 89c82f5894
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2618630

Change-Id: If78b849b1dd873d3c3bdc3b549feb3e426a4df38
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-08 09:36:36 +00:00
Joanne Chung
89c82f5894 Merge "Update OWNER file to new owner" am: 6c84f9128d am: e7b01f0ce8 am: 16a3800902
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2618630

Change-Id: Ica9e62112a10211e4ed6a7dd2633ff86050df231
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-08 08:53:40 +00:00
Joanne Chung
16a3800902 Merge "Update OWNER file to new owner" am: 6c84f9128d am: e7b01f0ce8
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2618630

Change-Id: I7dd7e11968e601d180cb928dd6dcb0803dedf523
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-08 08:05:03 +00:00
Joanne Chung
e7b01f0ce8 Merge "Update OWNER file to new owner" am: 6c84f9128d
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2618630

Change-Id: Ie7ac04781ba486dd74af1df57a995636453eb21a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-08 07:23:35 +00:00
Joanne Chung
6c84f9128d Merge "Update OWNER file to new owner" 2023-06-08 06:40:49 +00:00
Joanne Chung
674ae4ae93 Update OWNER file to new owner
Bug: 177641730
Change-Id: I68e9986338e04bb81a11a495f6de1657399b5742
Test: n/a. Only update owner
2023-06-08 06:40:41 +00:00
Treehugger Robot
57d4410b3f Merge "Fix low contrast on work challenge screen emergency call button" into udc-dev am: a34a510a40 am: c83e401444
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23601981

Change-Id: Ibe991ac28d55736e530ca014ed06b548870b52e8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-08 01:38:17 +00:00
Treehugger Robot
24e8361e2a Merge "Fix low contrast on work challenge screen emergency call button" into udc-dev am: a34a510a40 am: c0338e5dc3
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23601981

Change-Id: Ibbbcddcfadfbadcc66cbf2673f34ab8a1d29e2aa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-08 01:33:40 +00:00
Treehugger Robot
c83e401444 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: I25e8ab52aa7a285e22ec067d56d1a4a2e3252ebd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-08 00:50:56 +00:00
Treehugger Robot
c0338e5dc3 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: I452681812b4be6dccae36f3ec711e992a31b9924
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-08 00:50:15 +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
Aleksandar Kiridžić
ed0645b380 Merge "speech: On-device recognition settings profile selector" into udc-dev am: b5b15a6689 am: 9b20255944
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23517421

Change-Id: I0579c1c53126548e60aea7bd3f26aaf802060e11
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-07 20:08:14 +00:00
Aleksandar Kiridžić
e2d8e56c61 Merge "speech: On-device recognition settings profile selector" into udc-dev am: b5b15a6689 am: c449423483
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23517421

Change-Id: I18fd5f9209b5c7dc965ffed95751f8059eb95c0f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-07 20:03: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ć
c449423483 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: I9ead6c07f3f8c8b901301a7eed9de148490b4bda
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-07 18:43:15 +00:00
Aleksandar Kiridžić
9b20255944 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: I3b15f067f124ff17d7c540e2ca9dff5100178bb8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-07 18:38:59 +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
TreeHugger Robot
d60ff26d9f Merge "[Settings] Fix crash when user enter bluetooth page quickly." into udc-dev am: 3e374cc7a7 am: 5943e14bc3
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23601556

Change-Id: I2b2a2671f43ada1de08c5c766dfbbc4cf38b6e6d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-07 13:45:47 +00:00
TreeHugger Robot
99c0145565 Merge "[Settings] Fix crash when user enter bluetooth page quickly." into udc-dev am: 3e374cc7a7 am: 9b68c3c9c1
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23601556

Change-Id: Ie47f1d1d909d7f753619ff91041e24d58ae934fb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-07 13:40:42 +00:00
TreeHugger Robot
9b68c3c9c1 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: I5f9975f49ec0793eabf171c5dba0791683ab0d15
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-07 13:03:22 +00:00
TreeHugger Robot
5943e14bc3 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: I31a51edc4d856fab0127545e6e6acdf547c027c4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-07 12:59:49 +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
George Chang
2229a3393f Merge "Correct typo in the launch via NFC bottom string" into udc-dev am: 832e0b015e am: f63518f864
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23584036

Change-Id: I3f127a822fff7c5e64918e3b9a1619e67a307309
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-07 10:15:56 +00:00
George Chang
cb5b26ff73 Merge "Correct typo in the launch via NFC bottom string" into udc-dev am: 832e0b015e am: 29dd0bf796
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23584036

Change-Id: Ibb5362d87f383062376173d2820f8fbb80506deb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-07 10:11:22 +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
29dd0bf796 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: Ifc98c5ea76ad9fb5205ec3421470ebd7bf17473c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-07 09:33:13 +00:00
George Chang
f63518f864 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: I1b0246e219089604709900c2d8deb8d2e3d8a565
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-07 09:29:02 +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
SongFerng Wang
1f80bf93aa Merge "Add the log and moving it into onResume" into udc-d1-dev am: add7deceb2
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23579644

Change-Id: I51d34675109e1b428e0c1c45941f0462bf55b1c8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-07 03:32:04 +00:00
SongFerng Wang
add7deceb2 Merge "Add the log and moving it into onResume" into udc-d1-dev 2023-06-07 02:45:20 +00:00
SongFerng Wang
3a07547d81 Merge "ForgetDeviceDialogFragment check whether device is null or not" into udc-d1-dev am: 4929da451c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23578859

Change-Id: I919d6d7e09a7cdff2550bd667a1cb5fcb435b610
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-07 02:05:51 +00:00