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

122444 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Treehugger Robot
0cbdd648f5 Merge "Revert "Remove CSIP/VCP enable/disable from Setting"" into udc-dev am: 83cc6a64c6 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23101218

Change-Id: I7441e0e8b6ecd9aa86eb6aad936c04e7d79d4dde
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-09 11:15:35 +00:00
Weng Su
bfc8efc4de Merge "Refine Settings textColor" into udc-dev am: e24cbeb6b7 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23083621

Change-Id: Ic6ebc234fb721cc0f2b0cf28bfdd029755aba943
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-09 10:50:45 +00:00
Guangjie (Jerry) Shi
bcd1326690 Merge "Fix work profile issue" into udc-dev am: ece191b09f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23086871

Change-Id: I174d4a00736084a32821c5328540b4e2d2663d7d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-09 07:26:46 +00:00
Jason Chang
5f7ffb31d2 Merge "Fix 'Do it later' button overlaps with text depending on landscape direction" into udc-d1-dev 2023-05-09 07:03:38 +00:00
Jack He
7d96f185ee Merge "Remove CSIP/VCP enable/disable from Setting" into udc-dev am: d55e645795 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23065696

Change-Id: Ib7e054b0f9bb497d227d32d9a8fbbd4acb7003a4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-09 06:20:49 +00:00
Treehugger Robot
83cc6a64c6 Merge "Revert "Remove CSIP/VCP enable/disable from Setting"" into udc-dev 2023-05-09 05:33:40 +00:00
Shawn Lin
01a434865f Merge "Set the talkback focus to the header text when Stage is NeedToConfirm" into udc-dev am: f5b4a2388d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23053883

Change-Id: I2b05046353006f6053f9dcc268dbfdbed66c4b39
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-09 05:15:47 +00:00
Weng Su
e24cbeb6b7 Merge "Refine Settings textColor" into udc-dev 2023-05-09 04:27:35 +00:00
Guangjie (Jerry) Shi
ece191b09f Merge "Fix work profile issue" into udc-dev 2023-05-09 03:47:05 +00:00
Treehugger Robot
25115c82a4 Merge "Disable provider if removed from primary" into udc-dev am: ee54d713d5 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23092304

Change-Id: I8857f30dbf252f4c1843310ab21156c8d936d8f8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-09 03:46:20 +00:00
Jack He
6edb515a9f Revert "Remove CSIP/VCP enable/disable from Setting" 
This reverts commit 345889b5e2.

Reason for revert: Accidental merge, should merge together with prebuilt

Bug: 280626194
Change-Id: I93f66f22b55eb906f8e079de35f2db00b102c788
 2023-05-09 02:44:45 +00:00
Jack He
d55e645795 Merge "Remove CSIP/VCP enable/disable from Setting" into udc-dev 2023-05-09 02:43:13 +00:00
Shawn Lin
f5b4a2388d Merge "Set the talkback focus to the header text when Stage is NeedToConfirm" into udc-dev 2023-05-09 02:11:48 +00:00
Treehugger Robot
ee54d713d5 Merge "Disable provider if removed from primary" into udc-dev 2023-05-09 02:01:46 +00:00
Becca Hughes
9230389dcd Merge "Disable all providers if none selected" into udc-dev am: 762691c365 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23086870

Change-Id: I3bba36664b2accc006218d46160383f73504da9c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-09 00:49:58 +00:00
Austin Delgado
083f9699c5 Merge "Fix going back after biometric enrollment in SUW" into udc-dev am: 2971c13923 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23060222

Change-Id: I39cd3cb9c37b0440027c9396f557207fafd6f35e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-09 00:19:45 +00:00
Becca Hughes
9e5b34ceb0 Disable provider if removed from primary 
Test: make
Bug: 281109887
Change-Id: Ie301cfc57176c6563b4be5cc661514a4324477c9
 2023-05-08 23:42:47 +00:00
Becca Hughes
ad13689915 Fix work profile issue 
Test: manual
Bug: 281332256
Change-Id: I5f47aacc84e5abe739ecc3bbad474957334e7c91
 2023-05-08 23:27:59 +00:00
Derek Jedral
898e1d95f3 Merge "Change preference title if Active Unlock enabled" into udc-dev am: 42deb763e0 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22997141

Change-Id: I73bb1c3acb600908a9dca9eff4fa7b01486b78c5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-08 21:46:18 +00:00
Becca Hughes
762691c365 Merge "Disable all providers if none selected" into udc-dev 2023-05-08 20:58:01 +00:00
Austin Delgado
2971c13923 Merge "Fix going back after biometric enrollment in SUW" into udc-dev 2023-05-08 19:39:41 +00:00
Derek Jedral
42deb763e0 Merge "Change preference title if Active Unlock enabled" into udc-dev 2023-05-08 17:56:32 +00:00
Austin Delgado
6e745242da Fix going back after biometric enrollment in SUW 
Bug: 280530120
Test: atest BiometricEnrollActivityTest
Test: tested manually by swiping back after enrollments
Change-Id: I305dd0904f86e2fc77f02047de8f3fc2c54621cb
 2023-05-08 17:24:19 +00:00
Becca Hughes
5262570691 Disable all providers if none selected 
Bug: 280905737
Test: manual
Change-Id: I53214c29cd7f03c8034284e5067f03305566397a
 2023-05-08 17:19:52 +00:00
Weng Su
2b4d808898 Refine Settings textColor 
- Update textColor from textColorTertiary to textColorSecondary

Bug: 271501723
Test: Manual testing with the Accessibility Scanner tool

Change-Id: I57c31ba5c6e066e21fea234502b24aaed15998d7
 2023-05-08 21:58:45 +08:00
Han Xu
3894103292 Merge "Fix wifi QR layout to fix image stretching" into udc-dev am: 2f970a1a05 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23080178

Change-Id: Icfa29d0fa13e61acee1a0173d3d6e6603c04c97c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-08 13:26:28 +00:00
Han Xu
2f970a1a05 Merge "Fix wifi QR layout to fix image stretching" into udc-dev 2023-05-08 12:17:59 +00:00
Shawn Lin
4fef3fac2c Set the talkback focus to the header text when Stage is NeedToConfirm 
Should set the talkback focus to the header text when the "Draw your
pattern again" page is shown.

Bug: 275728120
Test: 1. enable talk back
      2. Setup pattern lock
      3. In "Draw your pattern again" page, make sure the talkback focus
	 is set to the header view
Change-Id: If99a950488039840e8486ebb634f0070a9403916
 2023-05-08 19:01:33 +08:00
Treehugger Robot
b5682235cc Merge "Fix the battery string incorrect spelling" into udc-dev am: 23d3eda967 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23080181

Change-Id: I18598bec86a2ad09837544559b7044eda190a247
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-08 11:00:53 +00:00
Treehugger Robot
dc11c24806 Merge "Fix the updateDialogForCdmaPhone test case failed" into udc-dev am: fb1cebd7f9 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23078645

Change-Id: I583abc51b4e4160783d8ca14d810418b675892d9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-08 10:59:44 +00:00
Treehugger Robot
23d3eda967 Merge "Fix the battery string incorrect spelling" into udc-dev 2023-05-08 10:36:09 +00:00
Treehugger Robot
fb1cebd7f9 Merge "Fix the updateDialogForCdmaPhone test case failed" into udc-dev 2023-05-08 10:25:06 +00:00
Angela Wang
b03509284e Merge "Hides Flash Notifications illustration on tablet" into udc-dev am: 1113d5e9b5 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23012482

Change-Id: I3e48ca3c397b530d8158d2e012d6a4867976b2d0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-08 08:33:26 +00:00
Jason Chang
c4c2d65282 Fix 'Do it later' button overlaps with text depending on 
landscape direction

Set Gliflayout content padding top to 0 to make it more space.

Bug: 279792554

Test: manually test with reproduciable steps:
1. Start setup until Fingerprint Unlock
2. Scroll down
3. Accept the introduction
4. Do as instructed
5. Flip the phone 180 degrees

Change-Id: I1875691cccfc75062c6d8c9517240569ae0a4261
 2023-05-08 08:23:00 +00:00
ykhung
f31c8a477f Fix the battery string incorrect spelling 
Fix: 281473201
Test: presubmit
Change-Id: I9e4eb7f6c18918620a5e12680a30a5ba8bc7aa42
 2023-05-08 16:10:27 +08:00
Han Xu
d2e6c2fe6d Fix wifi QR layout to fix image stretching 
Bug: 270063908
Test: manual
Change-Id: I86e7d54bb78306292fcb355c1a4879a43cc876f7
 2023-05-08 15:58:04 +08:00
Angela Wang
1113d5e9b5 Merge "Hides Flash Notifications illustration on tablet" into udc-dev 2023-05-08 07:46:55 +00:00
Charles Chen
492530af2d Merge "Revert^2 Disable Settings large-screen optimization" into udc-dev am: f22d51b5f6 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23036416

Change-Id: I22e5078be5ab34e25be33a58939a1257c1bdcd4e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-08 06:27:59 +00:00
Sunny Shao
b723c4f96a Fix the updateDialogForCdmaPhone test case failed 
- This is a side effect of the CL(ag/16379105) which removed the getTextAsDigits API.
- Update the return value as empty string of the TelephonyManager.getImei().

Fixes: 215071948
Test: atest ImeiInfoDialogControllerTest
Change-Id: I790b5dc505ad1a91a951a4c46b241baddea392a1
 2023-05-08 14:01:23 +08:00
Charles Chen
f22d51b5f6 Merge "Revert^2 Disable Settings large-screen optimization" into udc-dev 2023-05-08 05:39:07 +00:00
Guangjie (Jerry) Shi
860002b42c Merge "Use correct filter" into udc-dev am: cf440dcae5 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23048001

Change-Id: I731560cdaae8973c95f87e1a3af108356b42505b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-06 03:24:29 +00:00
Guangjie (Jerry) Shi
cf440dcae5 Merge "Use correct filter" into udc-dev 2023-05-06 02:38:26 +00:00
Jack He
22e2bd2b85 Merge changes from topic "LeAudioBeta" into udc-dev am: 2605ccbcfa 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22994939

Change-Id: I5ad786001f89627dbede25e1db8aae59da83af82
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-06 01:16:06 +00:00
Jack He
2605ccbcfa Merge changes from topic "LeAudioBeta" into udc-dev 
* changes:
  Hide the LE audio toggle by flag
  Add toggle to show/hide the Per Device Enable LE Audio Toggle in Device details
 2023-05-06 00:42:40 +00:00
Treehugger Robot
b492914807 Merge "Set primary services as enabled" into udc-dev am: 1dc52d159d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23047998

Change-Id: I45f5fbe9c81c81c111661a33f1c418a604de2977
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-06 00:12:42 +00:00
Becca Hughes
ed295c248e Use correct filter 
Test: TH
Bug: 280908763
Change-Id: I8a80e8533578b5e0b7a9b516c488b3602d18feef
 2023-05-05 23:42:29 +00:00
Treehugger Robot
1dc52d159d Merge "Set primary services as enabled" into udc-dev 2023-05-05 23:40:43 +00:00
Becca Hughes
eb5c65a43b Fix settings live update am: 481be6dde4 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23061769

Change-Id: Ie3315c417c4829dd6eab07579cf1ce077bf591ab
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-05 22:52:40 +00:00
Becca Hughes
4fe1f506dd Set primary services as enabled 
Test: make
Bug: 281121157
Change-Id: Ide7902d0561fa6e513e90f8245da6a754c856ae7
 2023-05-05 21:47:58 +00:00
Alice Kuo
345889b5e2 Remove CSIP/VCP enable/disable from Setting 
We moved this part to Bluetooth Framework, so remove these from Setting

Bug: 280626194
Test: NA
Change-Id: Ia84d0d68d8d77fde7479b6d4e49743dfeb821eae
 2023-05-06 05:31:34 +08:00