Android/packages_apps_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
126,002 Commits 1 Branch 0 Tags
6856e809b09b56f094b9e9ee1be02b10ec4c2d45
Commit Graph

29121 Commits

Author SHA1 Message Date
Han Xu
fc05f6766e Add manufactured year into hardware info page am: b452bc9f9d am: 15da26329f am: 24fc0d6744 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23629342

Change-Id: Idb39c3d58e9e90f03ec329ab72b772ab705ef7de
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-12 18:53:23 +00:00
Han Xu
24fc0d6744 Add manufactured year into hardware info page am: b452bc9f9d am: 15da26329f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23629342

Change-Id: Ia99e7b22230a44bbe5c70bcac17b64cd5536e4f9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-12 18:06:18 +00:00
Han Xu
15da26329f 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: I53f6c06271bb862cd16e2f3cb48886f764686d40
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-12 17:43:44 +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
82bc64d4ee Merge "Change the summary string to exclude 'Audio output' feature" into udc-dev am: fecfa96723 am: 3608d5bf18 am: 50ac77ebfe 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23557965

Change-Id: Icc2928b5a74fdad3390dc89d43fe8c4604344d55
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-12 05:29:34 +00:00
Jason Hsu
50ac77ebfe Merge "Change the summary string to exclude 'Audio output' feature" into udc-dev am: fecfa96723 am: 3608d5bf18 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23557965

Change-Id: Ia74f7630061811583ba8b9c94ca79598593292e5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-12 04:50:10 +00:00
Jason Hsu
3608d5bf18 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: Ia809e0cc8fa6e1503496e9ae7cbbeda5300d6b1b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-12 04:19:35 +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
Mady Mellor
0be0c80a7c Merge "Update the colors for bubbles settings based on new spec" into udc-dev am: 57406435cf am: 0399987aa1 am: f55de6cdd1 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23622468

Change-Id: I522e268341ca3b7bab8cab7be5ca736ebaeb3c18
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-09 17:43:43 +00:00
Oli Thompson
1a883223d2 Merge "Fix emergency button not visible on pattern work challenge screen" into udc-dev am: 01b382546e am: e86146d685 am: ca697c000a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23631338

Change-Id: Ic85a04f5844fe373393a0811e07f553f83722827
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-09 17:42:40 +00:00
Mady Mellor
f55de6cdd1 Merge "Update the colors for bubbles settings based on new spec" into udc-dev am: 57406435cf am: 0399987aa1 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23622468

Change-Id: I9b9c6a097b60c2a08c5f69b6b3c02beb73bbeb9c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-09 16:59:18 +00:00
Oli Thompson
ca697c000a Merge "Fix emergency button not visible on pattern work challenge screen" into udc-dev am: 01b382546e am: e86146d685 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23631338

Change-Id: Ifcde9f0a8fc75fc01909771df880f2b6ee70dab9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-09 16:58:49 +00:00
Mady Mellor
0399987aa1 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: I9ba9a9b9a7fb9ba79d5b3f28a4627f28937eb7ec
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-09 16:17:46 +00:00
Oli Thompson
e86146d685 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: I7aa48065cbc087ff4135a93983e3b32b97dc6204
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-09 16:16:59 +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
Zoey Chen
db4bede383 Merge "[Panlingual] Set focus to the drag list to avoid the overlapping" into udc-qpr-dev am: 593028ca32 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23615216

Change-Id: I73c935ebf704c97e4b38621dd3675e8da42b02d7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-09 06:11:34 +00:00
Zoey Chen
593028ca32 Merge "[Panlingual] Set focus to the drag list to avoid the overlapping" into udc-qpr-dev 2023-06-09 05:57:19 +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
b1c6a59867 Merge "Fix colors in bubble settings so they're more visible" into udc-dev am: 8a47899369 am: 7605e122ac am: 1c4809812a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23607273

Change-Id: Ia8df9e8f5f38eb131be80bacad294cb7a8353ec7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-08 19:46:35 +00:00
Mady Mellor
e5aa469940 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: I616264cebad588f95f8c1756e81bca62927ddbb9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-08 19:07:14 +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
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
Zoey Chen
9263383b75 [Panlingual] Set focus to the drag list to avoid the overlapping 
Bug: 284401644
Test: manual
Change-Id: I6446cacec20398672d2ac675c4e8823e6912dfb9
 2023-06-08 14:44:52 +00: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
fe675b620c Merge "[Regional] Change the wording from "Use app default" to "Usw default"" into udc-qpr-dev am: 8f3679ab91 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23601572

Change-Id: I404c62a74fe886eb4f2d8e7c458e91237f0ce3a9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-08 07:25:53 +00:00
Treehugger Robot
8f3679ab91 Merge "[Regional] Change the wording from "Use app default" to "Usw default"" into udc-qpr-dev 2023-06-08 06:16:32 +00:00
Treehugger Robot
c6e0a970ba Merge "Fix low contrast on work challenge screen emergency call button" into udc-dev am: a34a510a40 am: c0338e5dc3 am: 24e8361e2a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23601981

Change-Id: Idd53e9fa39a7202009b974016f8d045db06ef455
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-08 02:15:21 +00:00
Treehugger Robot
9c4b3ad72b 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: Ie7e71eb056a9976296dd2d6da95cc03f1e01ebe7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-08 01:37:16 +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
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
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
Zoey Chen
3b698670ad [Regional] Change the wording from "Use app default" to "Usw default" 
Bug: 282890644
Change-Id: I0735b38afd666895bf9801170bea6178f9ba6292
Test: manual
 2023-06-07 12:40:05 +00:00
George Chang
f3160735e4 Merge "Correct typo in the launch via NFC bottom string" into udc-dev am: 832e0b015e am: 29dd0bf796 am: cb5b26ff73 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23584036

Change-Id: Ie331e2ac5c1d3701ae16d123610752e6f6554082
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-07 10:53:00 +00:00
George Chang
6b83876c1e 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: I4ed20c3448a6b8be5065efd6cad0b1ef765135d1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-07 10:15:29 +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
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
832e0b015e Merge "Correct typo in the launch via NFC bottom string" into udc-dev 2023-06-07 09:02:51 +00:00
Wenhui Yang
e947da08e3 Merge "Fix face model delete message" into udc-qpr-dev am: 4eceb6c5c5 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23573016

Change-Id: I1aa4a7a33a14adae4a5fcbe1f443b3af89ed674b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-06 21:12:54 +00:00
Wenhui Yang
4eceb6c5c5 Merge "Fix face model delete message" into udc-qpr-dev 2023-06-06 21:09:56 +00:00
Wenhui Yang
5e71aee4cd Fix face model delete message 
Add new strings for face model deletion when fingerprint unlock is available.

Test: Manual - test on devices and observe the error message is correct.
Fixes: 283122570
Change-Id: I0511e58d030b8b63391d8406bfc0447fe33fa9fc
 2023-06-06 19:44:17 +00:00
TreeHugger Robot
ce5a816f29 Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-qpr-dev 2023-06-06 15:05:24 +00:00
TreeHugger Robot
6c069119ea Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-qpr-dev 2023-06-06 15:05:24 +00:00
Treehugger Robot
fb4945a4ae Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev 2023-06-06 14:58:40 +00:00
Treehugger Robot
8db6cc323c Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev 2023-06-06 14:58:40 +00:00
Treehugger Robot
d8d85a8485 Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev 2023-06-06 14:43:16 +00:00