PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
122,371 Commits 1 Branch 0 Tags
319351aaf40518c4794011317d3bede40f52099d
Commit Graph

122371 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Daniel Huang
319351aaf4 Merge "[Fixed] Reverse scrolling setting is reversed" into udc-dev am: 08b2b68e22 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22994936

Change-Id: Icb0a6739f47101b83e9d6d634b22c084b039b515
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-05 02:34:58 +00:00
Daniel Huang
08b2b68e22 Merge "[Fixed] Reverse scrolling setting is reversed" into udc-dev 2023-05-05 02:33:13 +00:00
Treehugger Robot
e1e392ba22 Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-mainline-prod 2023-05-05 00:04:14 +00:00
Becca Hughes
6464b82525 Use isPrimary bit to determine top provider am: 3096997718 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22997343

Change-Id: I496a9ca5f2712cb3017502d8c99acea125aeff84
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-04 23:46:40 +00:00
Becca Hughes
3096997718 Use isPrimary bit to determine top provider 
If the cred man provider has the isPrimary
bit set then we should use it as top
provider.

Test: ondevice
Bug: 280454916
Change-Id: I8c5651909d3926f09549c64af68185f1ef633198
 2023-05-04 21:19:54 +00:00
Oli Thompson
40c016b0d1 Merge "Change icon in settings work challenge" into udc-dev am: 69fcc2ba5c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22965558

Change-Id: Ibf70e18ac501c15790ff111154a824ae432b1af2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-04 18:59:00 +00:00
Oli Thompson
69fcc2ba5c Merge "Change icon in settings work challenge" into udc-dev 2023-05-04 18:28:23 +00:00
Guangjie (Jerry) Shi
b3b562cd34 Merge "Modify the usage of setEnabledProvider to temporarily passed in empty list." into udc-dev am: 817ee8489f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23001498

Change-Id: I12b362c2275c81a8875700fb8fe62fb4ae345d08
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-04 17:55:37 +00:00
Xiaozhen Lin
6326345a03 Merge "Password clearing in Settings App" into udc-dev am: be911918d0 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22914954

Change-Id: Icdfaa898af945ecd1592a44a86b4b8cafffe95da
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-04 17:54:40 +00:00
Guangjie (Jerry) Shi
817ee8489f Merge "Modify the usage of setEnabledProvider to temporarily passed in empty list." into udc-dev 2023-05-04 17:33:03 +00:00
Xiaozhen Lin
be911918d0 Merge "Password clearing in Settings App" into udc-dev 2023-05-04 17:09:34 +00:00
Jerry Shi
645ba04085 Modify the usage of setEnabledProvider to temporarily passed in empty 
list.

Test: local test
Bug: 280492574

Change-Id: Id13aea203636527bcda745727aae417b2a8e289c
 2023-05-04 08:57:43 -07:00
Lucas Silva
dc0ac9407e Merge "Update DreamAdapter to set icon tint colors in xml" into udc-dev am: d66bde103a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23004698

Change-Id: I7bcd2aa9ca3700890505a9a2f704a461f1f3e498
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-04 15:49:25 +00:00
Lucas Silva
d66bde103a Merge "Update DreamAdapter to set icon tint colors in xml" into udc-dev 2023-05-04 15:37:25 +00:00
TreeHugger Robot
51b4b2dd2e Merge "[Settings] Remove WFC enabled state condition of querying Telecomm." into udc-dev am: 3a2b8e81e5 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22961321

Change-Id: I60ba44bba4faf49f3b7ddf3a651ac2c75ef672a0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-04 15:28:07 +00:00
TreeHugger Robot
3a2b8e81e5 Merge "[Settings] Remove WFC enabled state condition of querying Telecomm." into udc-dev 2023-05-04 14:57:36 +00:00
Chaohui Wang
8c2d64a2b4 Merge "Update for getSystemPackageNames" into udc-dev am: 3f4820bdf1 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22948670

Change-Id: I4bb9c4a75b66801d46f36764587f652ed622369f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-04 09:55:20 +00:00
Chaohui Wang
3f4820bdf1 Merge "Update for getSystemPackageNames" into udc-dev 2023-05-04 09:43:28 +00:00
Daniel Huang
6d36372c64 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: Ibfe49eb8a48c8e892c31bff5846a539e955807b2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-04 09:03:06 +00:00
Treehugger Robot
94d430b929 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: I08a599d0a917a57f8f3bf8e72363664495f6395e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-04 09:02:28 +00:00
Daniel Huang
4f541df33e Merge "Fix Multiple UI issues" into udc-dev 2023-05-04 08:57:26 +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
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
f029f96558 Merge "Fix SettingsDumpServiceTest" into udc-dev am: 678b1d5fa4 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23015997

Change-Id: I93cd903136cff94b75348c0d8a0ada523f38bca0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-04 07:41:27 +00:00
Hao Dong
55379a00aa 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: I7dccee436e7050ed5a97387b97b1adcb3df228d0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-04 07:41:05 +00:00
Chaohui Wang
678b1d5fa4 Merge "Fix SettingsDumpServiceTest" into udc-dev 2023-05-04 07:39:14 +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
00dde2a96b 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: Ia31a1fc427d909efd392ae5f3bac851c121a610e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-04 06:36:38 +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
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
d8cb58c3cf [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: I48b14c5c38cd9aa372f063726de9204bcc1fc159
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-04 05:06:19 +00:00
Bill Yi
5e574a1301 [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: Ice3700e5fe6795063d056cea175775c10c8565c1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-04 05:06:10 +00:00
Treehugger Robot
c537439f3a [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 11ba47eebb -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: I19e3f9ad92a238698ffce7cad4d08c3d90199df6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-04 05:04:04 +00:00
Bill Yi
c7e5bc37f1 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: dc96a91fff -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: Id79f748013e887d8a73f16f386675844449512d8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-04 05:03:44 +00:00
Tom Hsu
9f47d30cd2 Merge "[Settings] Fix NPE from updating subinfo changed." into udc-dev am: 99e03458fa 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22954342

Change-Id: Ic51542e97d348936e3c5cfceb3cfc0a5945bf140
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-04 04:56:44 +00:00
Treehugger Robot
11ba47eebb Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev 2023-05-04 04:36:13 +00:00
Tom Hsu
99e03458fa Merge "[Settings] Fix NPE from updating subinfo changed." into udc-dev 2023-05-04 04:21:51 +00:00
TreeHugger Robot
43e329e463 Merge "Add Tapjacking Protection for all screens extends StorageWizardBase in Settings." into udc-dev am: 7bf4c8f9f5 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23001477

Change-Id: I43d1b9a2f326aea6a8ad8d40f3f5cd024120d75f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-04 04:21:28 +00:00
TreeHugger Robot
7bf4c8f9f5 Merge "Add Tapjacking Protection for all screens extends StorageWizardBase in Settings." into udc-dev 2023-05-04 04:09:13 +00:00
Treehugger Robot
b3d65a57af Merge "Fix testNonIndexableKeys_existInXmlLayout" into udc-dev am: e71643efac 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22981573

Change-Id: I12332396bed68d97d711926f8d3dc076864ca1d7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-04 04:00:30 +00:00
Treehugger Robot
e71643efac Merge "Fix testNonIndexableKeys_existInXmlLayout" into udc-dev 2023-05-04 03:15:40 +00:00
Chaohui Wang
f51e1422f3 Update for getSystemPackageNames 
Param showInstantApps is removed.

Bug: 280280596
Test: Unit Tests
Change-Id: Ib58176d9beefb2d2bdf8c7c969e2cc96bb64f8e7
 2023-05-04 02:33:10 +00:00
Lin Yuan
ec574d6fe5 [automerge] Fix: Bluetooth and Wifi scanning location MainSwitch page policy transparency. 2p: 7591fff234 am: 062a9ca549 am: f86d507407 am: d8321f5df7 am: ae2dd3d513 am: 9e84690fb7 am: dac4ef66d9 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22861203

Change-Id: Ifc9575413c7025833b2e95de281f16f7b8197537
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-04 02:29:36 +00:00
Lin Yuan
5a099fab45 [automerge] Fix: Bluetooth and Wifi scanning location MainSwitch page policy transparency. 2p: 7591fff234 am: 062a9ca549 am: f86d507407 am: d8321f5df7 am: eb3be1fa5b am: d2ddc84c14 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22861203

Change-Id: I0b8452b48f8581b117580dfbf92de545aba578e9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-04 02:28:46 +00:00
Lin Yuan
dac4ef66d9 [automerge] Fix: Bluetooth and Wifi scanning location MainSwitch page policy transparency. 2p: 7591fff234 am: 062a9ca549 am: f86d507407 am: d8321f5df7 am: ae2dd3d513 am: 9e84690fb7 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22861203

Change-Id: Ia36438aa214a976c0b98eeecec0db054298a8bb3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-04 02:25:07 +00:00
Lin Yuan
9e84690fb7 [automerge] Fix: Bluetooth and Wifi scanning location MainSwitch page policy transparency. 2p: 7591fff234 am: 062a9ca549 am: f86d507407 am: d8321f5df7 am: ae2dd3d513 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22861203

Change-Id: I0521342515969ccb2d46b9e9159d29b998713cd7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-04 01:41:25 +00:00
Lin Yuan
d2ddc84c14 [automerge] Fix: Bluetooth and Wifi scanning location MainSwitch page policy transparency. 2p: 7591fff234 am: 062a9ca549 am: f86d507407 am: d8321f5df7 am: eb3be1fa5b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22861203

Change-Id: I69571348ce67c5a5572a5fb5c15d31c88fb26a4a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-04 01:37:49 +00:00
Lin Yuan
ae2dd3d513 [automerge] Fix: Bluetooth and Wifi scanning location MainSwitch page policy transparency. 2p: 7591fff234 am: 062a9ca549 am: f86d507407 am: d8321f5df7 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22861203

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