Android/packages_apps_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
126,340 Commits 1 Branch 0 Tags
207b990ff413d6d83d6dcd16e52d7e1970bc2bf4
Commit Graph

29160 Commits

Author SHA1 Message Date
YK Hung
7f9afcf553 Merge "Update tablet help article link (1/2)" into udc-dev am: a4f67e02c8 am: 5007841ebd am: c2e7b61ee9 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23695285

Change-Id: Iaf945a698cf20ed42a5c357381783ef7c238b825
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-20 08:07:05 +00:00
YK Hung
c2e7b61ee9 Merge "Update tablet help article link (1/2)" into udc-dev am: a4f67e02c8 am: 5007841ebd 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23695285

Change-Id: If3a00b355020c1307999684330297e4a388ba8dd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-20 07:28:29 +00:00
YK Hung
5007841ebd Merge "Update tablet help article link (1/2)" into udc-dev am: a4f67e02c8 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23695285

Change-Id: Id6b352d47918565fac42659529c97d1b4c89606f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-20 07:01:29 +00:00
YK Hung
a4f67e02c8 Merge "Update tablet help article link (1/2)" into udc-dev 2023-06-20 06:34:46 +00:00
Chaohui Wang
68159be3ee [lint] Fix Wrong Resource Type am: 7aaceaa782 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23734154

Change-Id: If50e377055875ff4814e6b479ba9e474cf62b91c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-19 05:55:25 +00:00
Chaohui Wang
7aaceaa782 [lint] Fix Wrong Resource Type 
Bug: 285231003
Test: m Settings
Change-Id: I8dfbaf1342f014af35cd08906ac3f498b6c8c11a
 2023-06-19 10:17:35 +08:00
Chaohui Wang
78981afdc2 Merge "Migrate PlatformCompat App List to SPA" into udc-qpr-dev am: 879ff5f271 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23410196

Change-Id: I8746fd67255bd0799307f403f132e5a1692e41b7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-16 08:40:02 +00:00
Chaohui Wang
ed6d6c9e0f Migrate PlatformCompat App List to SPA 
So hidden modules are not shown in the list.

This will also improve the developer experience.

Bug: 273913035
Test: Manually with App Compatibility Changes
Test: Unit test
Change-Id: Ic78a51819159a0f848db6173f751b1be8c6b1e70
 2023-06-15 09:37:11 +00:00
Wesley Wang
ddbb5bcd5c Update tablet help article link (1/2) 
Bug: 287122689
Test: make SettingsRoboTests
Change-Id: If09f7a6aab01f00bdb1675444237698643e6ba93
 2023-06-15 14:38:59 +08:00
Rhed Jao
721a7bacaa Merge "[Settings] Add a verification flow for exiting repair mode" into udc-qpr-dev am: e1c9d65cda 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23629341

Change-Id: I58bc332082495cf4451228aa8179f6d2e6a2c73b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-15 06:34:53 +00:00
Rhed Jao
e1c9d65cda Merge "[Settings] Add a verification flow for exiting repair mode" into udc-qpr-dev 2023-06-15 04:55:45 +00:00
Rhed Jao
b7a4a7daa4 [Settings] Add a verification flow for exiting repair mode 
Handles the ACTION_CONFIRM_REPAIR_MODE_DEVICE_CREDENTIAL
intent to launch the confirm device credential activity for
users to exiting repair mode. The activity passes a special
user id USER_REPAIR_MODE to the framework and verify credentials
that the user enrolled in normal mode.

Bug: 277561275
Test: am start -a android.app.action.PREPARE_REPAIR_MODE_DEVICE_CREDENTIAL
      settings put global repair_mode_active 1
      am start -a android.app.action.CONFIRM_REPAIR_MODE_DEVICE_CREDENTIAL
      The credential is verified successfully.
Change-Id: I9ffe32f9925ee2b990c49d5674d27196a4c9edf7
 2023-06-15 02:14:41 +00:00
Hao Dong
a9f1ed3501 Merge "Wait for systemui udfps overlay ready to show settings udfps enroll view." into udc-qpr-dev am: 61659799de 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23595181

Change-Id: Ia545f7902df20a47c6dc154cfb3d781541bb25ba
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-15 01:45:55 +00:00
Hao Dong
61659799de Merge "Wait for systemui udfps overlay ready to show settings udfps enroll view." into udc-qpr-dev 2023-06-15 01:22:22 +00:00
Treehugger Robot
c706f8544d Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev 2023-06-14 03:32:14 +00:00
Wenhui Yang
e839945290 Merge "Fix face model delete message" into udc-d1-dev am: d56f96aaba 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23677227

Change-Id: I147cb8b08941e5b56836c2d95456b605a2ed55f0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-13 21:11:21 +00:00
TreeHugger Robot
3b89844e7f Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-qpr-dev 2023-06-13 19:58:54 +00:00
TreeHugger Robot
6fd46cf3a3 Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-qpr-dev 2023-06-13 19:58:54 +00:00
Wenhui Yang
08d11518a8 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
(cherry picked from commit 5e71aee4cd)
 2023-06-13 18:37:26 +00:00
Bill Yi
c1407e61f1 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: If3945f0ac9f4368b2cd50e66554accadc49e31ed
 2023-06-13 01:00:54 -07:00
Bill Yi
8430cda6d3 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I85702c2b4ddd2485683d5bb16bed43244e70022b
 2023-06-13 00:56:19 -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
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
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
e319c686e7 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: I29b80b692bc97132b5cc7eac3d3a153d0f93d238
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-12 18:08:24 +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
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
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
bab462f1d6 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: Id50ea2a480c6d674a77764e285642f2087df9c40
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-12 04:52:00 +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
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
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
50cacfcc1e 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: I55c42684f0af8cbcc8550d0b2491b7b132ab490d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-09 17:03:03 +00:00
Oli Thompson
f35b1be8ac 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: I82b44ce36153a64d37629f40dc8c7805c17847a6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-09 17:02:43 +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
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
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