PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
123,337 Commits 1 Branch 0 Tags
e2f4b5d242e37001fcc036aa24bcb49fbff6321c
Commit Graph

123337 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Bill Yi
bcdf539e99 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: dc96a91fff -s ours am: c7e5bc37f1 -s ours am: df0a1a06a3 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ib27d5f7a153a009cae9302153cff71714b38e10a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-04 09:29:33 +00:00
Daniel Huang
da19d4a244 Merge "Fix Multiple UI issues" into udc-dev am: 4f541df33e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22985401

Change-Id: I6bcdd801f50041a36f20443a0b2365e433ca7382
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-04 09:28:46 +00:00
Treehugger Robot
c1607192c2 Merge "Support incompatible charger state in the battery main page" into udc-dev am: 54de6fd80b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22981565

Change-Id: I19861c5b58c69e95efa4338da6ac85e04a752101
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-04 09:28:09 +00:00
Chaohui Wang
d18cfc2bdc Merge "Fix SettingsDumpServiceTest" into udc-dev am: 678b1d5fa4 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23015997

Change-Id: I98b6263963ef2af0e0ec42c758b7efe45bf0438d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-04 09:27:24 +00:00
Treehugger Robot
5a4638850f [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 11ba47eebb -s ours am: c537439f3a -s ours am: 788a1ee2f6 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Iad4d1fa5bfe0de60eac2dfd499f992b6baff53ed
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-04 09:25:17 +00:00
Bill Yi
4d6f5e4db9 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: dc96a91fff -s ours am: c7e5bc37f1 -s ours am: df0a1a06a3 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I8ad4b1df5dd2e4a1ba4d83a66b504ede5a2ac60a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-04 09:25:02 +00:00
Hao Dong
6e48b99a85 Merge "Call onFaceStrengthChanged() only when authenticators registered." into udc-dev am: 1c9288fa24 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22999810

Change-Id: If06b8ef33f9325d67678f442a15ae0a0dde46f4a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-04 09:05:26 +00:00
Chaohui Wang
be1469b9f6 Merge "Fix SettingsDumpServiceTest" into udc-dev am: 678b1d5fa4 am: 396b3b45d4 am: d5547fbcb1 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23015997

Change-Id: I520c33c0ceb8ab61a27def7f89e439b2a692cb68
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-04 09:04:11 +00:00
Daniel Huang
8de64b59bf Merge "Fix Multiple UI issues" into udc-dev am: 4f541df33e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22985401

Change-Id: If96482ee38a1e3956ec1d936e555846ff66f2aa0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-04 09:03:38 +00:00
Treehugger Robot
08482b1d2b Merge "Support incompatible charger state in the battery main page" into udc-dev am: 54de6fd80b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22981565

Change-Id: I2cc06f818546475cb1951b0e02f44f9bf4add503
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-04 09:03:24 +00:00
Hao Dong
e548bea2e1 Merge "Call onFaceStrengthChanged() only when authenticators registered." into udc-dev am: 1c9288fa24 am: 56f39eeb45 am: c811f94c92 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22999810

Change-Id: I9427005098ab0ce645f7432f07dc3fab2352dcce
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-04 09:03:04 +00:00
SongFerng Wang
be40af59d7 Merge "Shows main_battery information for not untethered device" into udc-dev am: 197eb39cde 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22901825

Change-Id: I70ee782ad07cc3adc092f1fdecfd1b1381dbe222
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-04 09:02:02 +00:00
Daniel Huang
4f541df33e Merge "Fix Multiple UI issues" into udc-dev 2023-05-04 08:57:26 +00:00
Treehugger Robot
788a1ee2f6 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 11ba47eebb -s ours am: c537439f3a -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I180520a7cbb04c5978af4a22203b969f1d81a18f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-04 08:56:50 +00:00
Bill Yi
df0a1a06a3 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: dc96a91fff -s ours am: c7e5bc37f1 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ia765c4911206c444c00562b7d7220317780adec6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-04 08:56:41 +00:00
danielwbhuang
55a3d089f9 Fix Multiple UI issues 
1. Use edge-to-edge UI
2. Use new color token
3. Put text in the middle of the button

Bug:279163958
Bug:278504911

Test: manual
Change-Id: I189e9da2251f7d204ddc18680d3d1ec4638fa2db
 2023-05-04 08:56:41 +00:00
Chaohui Wang
c16a088a73 Log app special permission change for SPA 
Align with current logging and no package name.

Bug: 280575002
Test: Manually with App Op Permission pages
Change-Id: Ia0dde06769b1e08f8cec7cb1d87a8ca1baa80068
 2023-05-04 16:36:02 +08:00
Treehugger Robot
54de6fd80b Merge "Support incompatible charger state in the battery main page" into udc-dev 2023-05-04 08:28:57 +00:00
Chaohui Wang
d5547fbcb1 Merge "Fix SettingsDumpServiceTest" into udc-dev am: 678b1d5fa4 am: 396b3b45d4 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23015997

Change-Id: I23bd63427d47a63b51ad7eee58fcb963285ee3d7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-04 08:24:06 +00:00
Hao Dong
c811f94c92 Merge "Call onFaceStrengthChanged() only when authenticators registered." into udc-dev am: 1c9288fa24 am: 56f39eeb45 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22999810

Change-Id: Ic0348cedcd122cbbc0e4715feb4f9e7f2b569c25
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-04 08:23:48 +00:00
SongFerng Wang
6cfb908ca5 Merge "Shows main_battery information for not untethered device" into udc-dev am: 197eb39cde am: 10ed23b3c1 am: 45512c8b0c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22901825

Change-Id: I10d8c830dd0b41b39f1d98d3379c28b537f3d8a7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-04 07:57:24 +00:00
Chaohui Wang
396b3b45d4 Merge "Fix SettingsDumpServiceTest" into udc-dev am: 678b1d5fa4 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23015997

Change-Id: I7c302932f91793a9ab80796e4e6448c99bfd39e5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-04 07:56:51 +00:00
Chaohui Wang
678b1d5fa4 Merge "Fix SettingsDumpServiceTest" into udc-dev 2023-05-04 07:39:14 +00:00
Hao Dong
56f39eeb45 Merge "Call onFaceStrengthChanged() only when authenticators registered." into udc-dev am: 1c9288fa24 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22999810

Change-Id: I477cd05789ff62ad6cba68908de99d426d227e39
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-04 07:37:04 +00:00
SongFerng Wang
45512c8b0c Merge "Shows main_battery information for not untethered device" into udc-dev am: 197eb39cde am: 10ed23b3c1 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22901825

Change-Id: I60918326977b8013c69a0d1024d97a697f5769b9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-04 07:19:53 +00:00
Hao Dong
1c9288fa24 Merge "Call onFaceStrengthChanged() only when authenticators registered." into udc-dev 2023-05-04 07:00:40 +00:00
Hao Dong
6e8434b793 Call onFaceStrengthChanged() only when authenticators registered. 
Test: atest FaceEnrollIntroductionTest
Test: manually tested face enroll introduction page
Bug: 280384533
Change-Id: Iac9506d8430459aa399ac8efd3f41cbc6e67260d
Merged-In: Iac9506d8430459aa399ac8efd3f41cbc6e67260d
 2023-05-04 06:59:53 +00:00
ykhung
c234196bc1 Support incompatible charger state in the battery main page 
https://screenshot.googleplex.com/PrSzAtMAhsyqbsR

Bug: 271775549
Test: make test RunSettingsRoboTests
Change-Id: I0bb912eaab9c8837eaa3a9b998b3ebb5a8e6f99f
 2023-05-04 14:57:07 +08:00
SongFerng Wang
10ed23b3c1 Merge "Shows main_battery information for not untethered device" into udc-dev am: 197eb39cde 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22901825

Change-Id: Ia7f15c8a4fd0d0cd43b093616bc04ac5dbf59e2d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-04 06:31:45 +00:00
Chaohui Wang
e2b9d0680e Fix SettingsDumpServiceTest 
SettingsDumpService behavior changed in
Change I9d7fe2e763b9e5840ee76c5eb00bc88288e7ee41

After behavior changed, PrintWriter was wrapped in IndentingPrintWriter,
it's harder to mock the PrintWriter, so check the result directly.

Fix: 280068083
Test: RobolectricTest
Change-Id: I92a7b931c93df4cd9e9c3e47b91a9750df936f15
 2023-05-04 14:20:33 +08:00
Treehugger Robot
d1b9b5262a [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 11ba47eebb -s ours am: b960f4535f -s ours am: f3f9381437 -s ours am: b5933a3dac -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Icbc8729cef23cd4ade07dd7762edc8eab73ef4be
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-04 05:56:26 +00:00
SongFerng Wang
197eb39cde Merge "Shows main_battery information for not untethered device" into udc-dev 2023-05-04 05:47:59 +00:00
Treehugger Robot
3938ef6ebe [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 11ba47eebb -s ours am: c537439f3a -s ours am: 17dbdabce3 -s ours am: 1a01a70537 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I869f896cd55fe6b9a896e166e24fe171ba8ae667
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-04 05:42:32 +00:00
Bill Yi
80859fe3dd [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: dc96a91fff -s ours am: c7e5bc37f1 -s ours am: bef044e513 -s ours am: 2e1b23c580 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I1b0bff39763e6a3ecfd571332b11c25ba32ee034
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-04 05:42:17 +00:00
Treehugger Robot
7f70daf730 Merge changes from topic "tc_change_23050307_55" into tm-qpr-dev-plus-aosp am: 663a43e79f am: 4e9651a024 am: 5e8bd15267 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22974823

Change-Id: Ideb77f3c0b269b5100e75e6b501c0695746bcd63
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-04 05:40:59 +00:00
Tom Hsu
4c96e3e3dd Merge "[Settings] Fix NPE from updating subinfo changed." into udc-dev am: 99e03458fa am: f4f0d99add am: 964ce5a785 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22954342

Change-Id: I7a58eecef0a804c092663b1521c0ace82ca4dd9e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-04 05:40:49 +00:00
Tom Hsu
c34e52c633 Merge "[Settings] Fix NPE from updating subinfo changed." into udc-dev am: 99e03458fa am: f23adec53e am: 7bd9a86731 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22954342

Change-Id: I04ba2a0151af430b9595cfe4bc2b0a964b473266
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-04 05:40:40 +00:00
Tom Hsu
88e72070de Merge "[Settings] Fix NPE from updating subinfo changed." into udc-dev am: 99e03458fa am: f23adec53e am: 692d0a45ef 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22954342

Change-Id: I3c598aae73edbc8f4cdf9b7ff5d5ff309dfe794f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-04 05:32:12 +00:00
Treehugger Robot
b5933a3dac [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 11ba47eebb -s ours am: b960f4535f -s ours am: f3f9381437 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I378ffec60a2af2dd1930a002e62b4bf8099072bd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-04 05:31:51 +00:00
Treehugger Robot
1a01a70537 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 11ba47eebb -s ours am: c537439f3a -s ours am: 17dbdabce3 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I08b37a2c4e1404b35cc34dd2a5f719a97824a331
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-04 05:31:04 +00:00
Bill Yi
2e1b23c580 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: dc96a91fff -s ours am: c7e5bc37f1 -s ours am: bef044e513 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I186a07bab8646a1fb247490283db3dbfadc045be
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-04 05:31:00 +00:00
TreeHugger Robot
40a5a6b6ed Merge "Add Tapjacking Protection for all screens extends StorageWizardBase in Settings." into udc-dev am: 7bf4c8f9f5 am: 2c750a41f4 am: 700e460908 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23001477

Change-Id: I313e1953ef327e3c0b0fec8d2343c0b471460b51
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-04 05:30:53 +00:00
Treehugger Robot
5e8bd15267 Merge changes from topic "tc_change_23050307_55" into tm-qpr-dev-plus-aosp am: 663a43e79f am: 4e9651a024 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22974823

Change-Id: I3d52f46e32e2abfb9f8daa7a7bef09823f9de0b7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-04 05:30:27 +00:00
TreeHugger Robot
068f4194e0 Merge "Add Tapjacking Protection for all screens extends StorageWizardBase in Settings." into udc-dev am: 7bf4c8f9f5 am: b4d3bd6859 am: 6324ac704d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23001477

Change-Id: I2bbe04f76c725586a533a93c9bf661f7564c87b0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-04 05:29:29 +00:00
Treehugger Robot
965c66b2c7 Merge "Fix testNonIndexableKeys_existInXmlLayout" into udc-dev am: e71643efac am: 7e99eaa9bc am: f4c61c812a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22981573

Change-Id: I3eb3e743d8baa3885a39b1cbeaf56055da06c46e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-04 05:29:23 +00:00
Treehugger Robot
58b332455d Merge changes from topic "tc_change_23050307_55" into udc-dev-plus-aosp am: 14cdc33fb7 am: 05450878ef 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22974823

Change-Id: Ic83233d539c5aefaf1b57a93eb0419a027dd6a78
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-04 05:28:43 +00:00
Bill Yi
3c6cbf53d5 [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: dc96a91fff 2p: 98c8d85c26 am: 56b01ab110 -s ours am: cb37799525 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I505d158e5bead7d8e232a9db2be74989f15c7aa1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-04 05:28:37 +00:00
Tom Hsu
964ce5a785 Merge "[Settings] Fix NPE from updating subinfo changed." into udc-dev am: 99e03458fa am: f4f0d99add 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22954342

Change-Id: Idb81f53a41cc2853f218c2a6af8b9bcae8829748
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-04 05:28:07 +00:00
Treehugger Robot
ea4a714044 Merge "Fix testNonIndexableKeys_existInXmlLayout" into udc-dev am: e71643efac am: 19a610e0f1 am: 39522cb473 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22981573

Change-Id: I95e366318fd181c43db77383edf287f26615718c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-04 05:27:30 +00:00
TreeHugger Robot
589bc875e0 Merge "Add Tapjacking Protection for all screens extends StorageWizardBase in Settings." into udc-dev am: 7bf4c8f9f5 am: 2c750a41f4 am: a9ce3ae056 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23001477

Change-Id: I722166b954806d9973ab531e18c1226fd989824d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-04 05:27:23 +00:00