PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
121,305 Commits 1 Branch 0 Tags
03c863614dba2b90d2abdfd97efda4c095d949ce
Commit Graph

121305 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Bill Yi
03c863614d [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 3c3f35c7dd -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I62904eafe1d1b0cbd4b08cf84a761137e8e889c4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-10 21:50:40 +00:00
Bill Yi
b052aa6400 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: 8fe591389b -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I94b235b1e698bb00fd2f3f9394c2629ca5f96557
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-10 21:50:36 +00:00
Bill Yi
c0c88802c4 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 9d5a9fbb23 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I1176718cb5f1cb2af438642fa2a30462082e9098
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-10 21:48:30 +00:00
Bill Yi
8fe591389b Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev 2023-03-10 21:18:23 +00:00
Vania Januar
1883fc0bf6 Merge "Show single icon layout for unknown device type in advanced header." into udc-dev am: 76452f3a1f am: adb043c201 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21700162

Change-Id: Iafe427fa7342385bfd71b03328310e5082e4e463
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-10 19:24:46 +00:00
Treehugger Robot
758f403273 Merge "Adb is disconnecting during Monkey Test Run." am: 821e70ea59 am: c8a58a249d am: 3c62dd3543 am: a38c972ef0 am: 2f6bb387f0 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2348443

Change-Id: I04df492aaa2cfc42d7de65c41788f3dceb582dd0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-10 19:22:10 +00:00
Vania Januar
61d5568e62 Merge "Show single icon layout for unknown device type in advanced header." into udc-dev am: 76452f3a1f am: 5b24c992e1 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21700162

Change-Id: I55e5d977c94731ee859bdab9323db620edbba7c8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-10 18:59:42 +00:00
Treehugger Robot
e04405ab59 Merge "Adb is disconnecting during Monkey Test Run." am: 821e70ea59 am: c8a58a249d am: 3c62dd3543 am: a38c972ef0 am: f719ca7ec0 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2348443

Change-Id: I84e8a5a5a2fa96daa9d5e17556dc00c0d62193f9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-10 18:56:26 +00:00
Vania Januar
adb043c201 Merge "Show single icon layout for unknown device type in advanced header." into udc-dev am: 76452f3a1f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21700162

Change-Id: I172f16edeaabf7374f9a77cd67daf0ac5808a64b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-10 18:55:54 +00:00
Vania Januar
5b24c992e1 Merge "Show single icon layout for unknown device type in advanced header." into udc-dev am: 76452f3a1f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21700162

Change-Id: I5cf3fa692a8bd992e78b2a42fe3817487683f5e2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-10 18:55:27 +00:00
Vania Januar
76452f3a1f Merge "Show single icon layout for unknown device type in advanced header." into udc-dev 2023-03-10 18:15:37 +00:00
Treehugger Robot
f719ca7ec0 Merge "Adb is disconnecting during Monkey Test Run." am: 821e70ea59 am: c8a58a249d am: 3c62dd3543 am: a38c972ef0 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2348443

Change-Id: I8b60d17de7e930436142107da0dfd1fee29c0c88
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-10 17:58:19 +00:00
Treehugger Robot
2f6bb387f0 Merge "Adb is disconnecting during Monkey Test Run." am: 821e70ea59 am: c8a58a249d am: 3c62dd3543 am: a38c972ef0 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2348443

Change-Id: I5b3920550c231799afcc28c7aeb3150712bd57a3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-10 17:57:53 +00:00
Treehugger Robot
a38c972ef0 Merge "Adb is disconnecting during Monkey Test Run." am: 821e70ea59 am: c8a58a249d am: 3c62dd3543 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2348443

Change-Id: If51239c47ffc2ebf9c80ce5b8f2e27d8b187a871
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-10 17:04:09 +00:00
Treehugger Robot
3c62dd3543 Merge "Adb is disconnecting during Monkey Test Run." am: 821e70ea59 am: c8a58a249d 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2348443

Change-Id: I8ec06e45f02f48bfec30051159ed8a931a11e2e8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-10 16:27:37 +00:00
Treehugger Robot
c8a58a249d Merge "Adb is disconnecting during Monkey Test Run." am: 821e70ea59 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2348443

Change-Id: I76493ccb15ff2d58045061ef4c62b20f772aab30
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-10 15:53:41 +00:00
Treehugger Robot
821e70ea59 Merge "Adb is disconnecting during Monkey Test Run." 2023-03-10 15:19:15 +00:00
Marcelo Arteiro
52cd57fc7f Merge "Revert "Automated Token Alignment Android/Material"" into udc-dev am: 7e2d77a717 am: e7250864cd 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21944880

Change-Id: I6f9b7b60ed8abb98abf53a9d3b7b69ebbecb5e4a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-10 14:43:17 +00:00
Marcelo Arteiro
c4071f0e4c Merge "Revert "Automated Token Alignment Android/Material"" into udc-dev am: 7e2d77a717 am: e161c61575 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21944880

Change-Id: I96e2cdbfa4756366fb14f150c5abc6eb705b635d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-10 14:42:16 +00:00
Marcelo Arteiro
e161c61575 Merge "Revert "Automated Token Alignment Android/Material"" into udc-dev am: 7e2d77a717 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21944880

Change-Id: Id3cc5c2fd50d8b5c34b7695796ae6047d76016d1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-10 14:09:10 +00:00
Marcelo Arteiro
e7250864cd Merge "Revert "Automated Token Alignment Android/Material"" into udc-dev am: 7e2d77a717 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21944880

Change-Id: Ia16e68a02b5f88082f4b6f7468580d261a6cb422
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-10 14:09:07 +00:00
Marcelo Arteiro
7e2d77a717 Merge "Revert "Automated Token Alignment Android/Material"" into udc-dev 2023-03-10 13:43:23 +00:00
Junyu Lai
50ef1baad4 Merge "Do not crash when duplication found in merged imsi list" am: ae267bae74 am: 0da4abe1db am: 4beef2e82e am: 3eb30fb31c am: 101d035e5f 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2479336

Change-Id: Ief45cbb7ab7a0d2b51e4a521bdf8ae1bd7bacff9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-10 13:14:50 +00:00
George Chang
f308aa1117 Merge "Update title string for Nfc Tag App Preference" into udc-dev am: 541a7153a5 am: 3785967f8e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21918803

Change-Id: I57c46bd49a6c4d6a707dc1e5c4d2f17c99a88100
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-10 13:14:30 +00:00
Ting-Kang Chang
68523a3f0c Merge "Add debug logs for updateBatteryStatus and TopLevelBatteryPreferenceController updating." into udc-dev am: d31de7593e am: 3d500900b7 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21858528

Change-Id: Ic02188652ed4fc324258c87369891563d4028044
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-10 13:13:38 +00:00
Junyu Lai
101d035e5f Merge "Do not crash when duplication found in merged imsi list" am: ae267bae74 am: 0da4abe1db am: 4beef2e82e am: 3eb30fb31c 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2479336

Change-Id: Ib5ac7af875fc0e29301739ebe147b93eb8e207c1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-10 12:41:54 +00:00
George Chang
3785967f8e Merge "Update title string for Nfc Tag App Preference" into udc-dev am: 541a7153a5 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21918803

Change-Id: I6bae3dfae9a53f92761770b2a7aa08b923b2d115
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-10 12:41:45 +00:00
Ting-Kang Chang
3d500900b7 Merge "Add debug logs for updateBatteryStatus and TopLevelBatteryPreferenceController updating." into udc-dev am: d31de7593e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21858528

Change-Id: Ia1311e3f57008829afa03d6dcca6b985b86d7302
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-10 12:41:13 +00:00
Junyu Lai
2937f3251a Merge "Do not crash when duplication found in merged imsi list" am: ae267bae74 am: 0da4abe1db am: 4beef2e82e am: 3eb30fb31c am: 775719b968 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2479336

Change-Id: Ie2a9702e857b93b87aba055ea97172092e44d579
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-10 12:17:37 +00:00
Junyu Lai
775719b968 Merge "Do not crash when duplication found in merged imsi list" am: ae267bae74 am: 0da4abe1db am: 4beef2e82e am: 3eb30fb31c 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2479336

Change-Id: I2c70953e9d9c7ab8db48bafd8e194ac196374acc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-10 11:26:22 +00:00
Junyu Lai
3eb30fb31c Merge "Do not crash when duplication found in merged imsi list" am: ae267bae74 am: 0da4abe1db am: 4beef2e82e 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2479336

Change-Id: I7323a6fbd1e8f7595fdb7c29e7520cff5ac12a00
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-10 10:48:49 +00:00
Junyu Lai
4beef2e82e Merge "Do not crash when duplication found in merged imsi list" am: ae267bae74 am: 0da4abe1db 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2479336

Change-Id: Ia79b5f286b4269c38fc3a2fa990615251694a020
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-10 10:12:13 +00:00
Junyu Lai
0da4abe1db Merge "Do not crash when duplication found in merged imsi list" am: ae267bae74 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2479336

Change-Id: I3e55fc5496918d8e2d0c230df74b62e1e6847fb6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-10 09:37:20 +00:00
Junyu Lai
ae267bae74 Merge "Do not crash when duplication found in merged imsi list" 2023-03-10 09:01:44 +00:00
George Chang
7d750aaef5 Merge "Update title string for Nfc Tag App Preference" into udc-dev am: 541a7153a5 am: 8995b86814 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21918803

Change-Id: I9a933c196acaf98bf5c8d0cf23f92c32d2ddf396
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-10 06:12:23 +00:00
George Chang
8995b86814 Merge "Update title string for Nfc Tag App Preference" into udc-dev am: 541a7153a5 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21918803

Change-Id: I4765b87b59613ce12bf280229df9d6cd65fd82c1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-10 05:48:23 +00:00
George Chang
541a7153a5 Merge "Update title string for Nfc Tag App Preference" into udc-dev 2023-03-10 05:11:20 +00:00
Cathy Chen
8208de8cf4 Merge "Revert "Use updated lockscreen validation API in Settings."" 2023-03-10 04:25:46 +00:00
Cathy Chen
093658dbb6 Revert "Use updated lockscreen validation API in Settings." 
Revert submission 21914417-lskf-api-review1

Reason for revert: build break

Reverted changes: /q/submissionid:21914417-lskf-api-review1

Bug: 272574624
Change-Id: I3cc824924efd239b25415e500a48bf6deb0c3c9b
 2023-03-10 04:04:54 +00:00
Ting-Kang Chang
c746960886 Merge "Add debug logs for updateBatteryStatus and TopLevelBatteryPreferenceController updating." into udc-dev am: d31de7593e am: b2c2836b19 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21858528

Change-Id: I3abe3392cfcb349890eeacf75a437ea9a0f1d5fe
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-10 03:25:41 +00:00
Ting-Kang Chang
b2c2836b19 Merge "Add debug logs for updateBatteryStatus and TopLevelBatteryPreferenceController updating." into udc-dev am: d31de7593e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21858528

Change-Id: Ic182026d44537fa2548eb629affe5c1f2afdd40c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-10 03:01:53 +00:00
Ting-Kang Chang
d31de7593e Merge "Add debug logs for updateBatteryStatus and TopLevelBatteryPreferenceController updating." into udc-dev 2023-03-10 02:32:59 +00:00
Marcelo Arteiro
1b599e0232 Revert "Automated Token Alignment Android/Material" 
This reverts commit c9ca4a9014.

Reason for revert: Black Search Box in Settings App (Light Theme)

Change-Id: I936e977ce044b8da41d818d6b3392adc6fd1e4e6
 2023-03-09 23:40:40 +00:00
Automerger Merge Worker
5153de354b Merge "Merge "Use updated lockscreen validation API in Settings." into udc-dev am: 18df885c94 am: 56deb1bde4" 2023-03-09 23:10:45 +00:00
Dmitry Dementyev
36537e895b Merge "Use updated lockscreen validation API in Settings." into udc-dev am: 18df885c94 am: 56deb1bde4 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21910534

Change-Id: I6e1395bd9d4d675b9919cc16f3630747095b8416
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-09 23:10:17 +00:00
Dmitry Dementyev
ac7e7903ec Merge "Use updated lockscreen validation API in Settings." into udc-dev am: 18df885c94 am: 938be1cfa0 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21910534

Change-Id: I08f402b2c9512bbc6051f21b7ececac31b93a550
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-09 23:09:57 +00:00
Dmitry Dementyev
938be1cfa0 Merge "Use updated lockscreen validation API in Settings." into udc-dev am: 18df885c94 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21910534

Change-Id: I3fb05dd24e4f5ca655115fbc3ec669f79e41c788
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-09 22:45:41 +00:00
Dmitry Dementyev
56deb1bde4 Merge "Use updated lockscreen validation API in Settings." into udc-dev am: 18df885c94 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21910534

Change-Id: I0335cc899f0fc5b88497e5d0be3821365518e60f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-09 22:45:31 +00:00
Dmitry Dementyev
18df885c94 Merge "Use updated lockscreen validation API in Settings." into udc-dev 2023-03-09 22:15:43 +00:00
Dmitry Dementyev
77a4bbe35c Merge "Use updated lockscreen validation API in Settings." 2023-03-09 20:23:36 +00:00