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

122983 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Austin Delgado
d8a0b91e1a Merge "Fix going back after biometric enrollment in SUW" into udc-dev am: 2971c13923 am: 7246a93bd3 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23060222

Change-Id: I7ed684004b383d2d468a34831c9384398fb1aae0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-09 02:04:57 +00:00
Derek Jedral
98d9c60736 Merge "Change preference title if Active Unlock enabled" into udc-dev am: 42deb763e0 am: 2696c8dbc7 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22997141

Change-Id: I6f10b9fcd44d562d3bdf47f66b7b4cadcdd6b926
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-09 01:54:08 +00:00
Austin Delgado
7246a93bd3 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: I99b155b7965f04739bcbddf15fe75a3633cc07bb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-09 01:48:10 +00:00
Becca Hughes
72ff60a0e4 Merge "Disable all providers if none selected" into udc-dev am: 762691c365 am: 9230389dcd 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23086870

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

Change-Id: I3eb79af0410b2ca6b7e41ff2dfccd403e64fcd0f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-09 01:06:20 +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
Derek Jedral
2696c8dbc7 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: Ib0a4b4b2b76a3d1bc2244dbb6a7080c8c4b23b90
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-09 00:18:36 +00:00
Derek Jedral
a783d32ab1 Merge "Change preference title if Active Unlock enabled" into udc-dev am: 42deb763e0 am: 898e1d95f3 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22997141

Change-Id: I2269002faf18bbd9932cc91908a74517c7f6b9ac
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-08 22:23:49 +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
Han Xu
b2f83bcd3a Merge "Fix wifi QR layout to fix image stretching" into udc-dev am: 2f970a1a05 am: 7a1efdb589 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23080178

Change-Id: I86b3283678d4abd0dd5ff08c438650eb69840886
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-08 14:30:56 +00:00
Han Xu
07509fdb48 Merge "Fix wifi QR layout to fix image stretching" into udc-dev am: 2f970a1a05 am: 3894103292 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23080178

Change-Id: I214ed455a66ce6ae4319d84be959a57bdbef6f59
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-08 14:05:24 +00: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
7a1efdb589 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: I3a93f7089e99b1c85191c29963cf35bcb4e65796
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-08 13:01:03 +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
Treehugger Robot
33ba391274 Merge "Fix the battery string incorrect spelling" into udc-dev am: 23d3eda967 am: 93ab64ef47 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23080181

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

Change-Id: I8f129892f4f10838a059730436d4ae957846b476
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-08 11:43:12 +00:00
Treehugger Robot
06e92b4bf8 Merge "Fix the battery string incorrect spelling" into udc-dev am: 23d3eda967 am: b5682235cc 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23080181

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

Change-Id: Ieeb3a1b72e00c95592374b5e595e5b2d01906ef0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-08 11:38:45 +00: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
93ab64ef47 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: I231ff30e5df9248bf3713511ebb00795c502cba1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-08 10:56:22 +00:00
Treehugger Robot
99c883fd3f 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: I7544b0326987e4397d7baab8514b1d1388d52005
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-08 10:55:48 +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
afe6a6388b Merge "Hides Flash Notifications illustration on tablet" into udc-dev am: 1113d5e9b5 am: f676c35f02 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23012482

Change-Id: Iad821e17698321a88b6464fc0693b340d7141748
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-08 09:15:58 +00:00
Angela Wang
3716e194b1 Merge "Hides Flash Notifications illustration on tablet" into udc-dev am: 1113d5e9b5 am: b03509284e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23012482

Change-Id: Ibbb77dba4c77c09f2f6deb2db4bafefa82ed151f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-08 09:11:21 +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
Angela Wang
f676c35f02 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: I80b2e6a7bbe73212482521e5810430b9dcd0252f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-08 08:29:26 +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
8ad361f548 Merge "Revert^2 Disable Settings large-screen optimization" into udc-dev am: f22d51b5f6 am: b67f9c939d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23036416

Change-Id: I9405881518e5b4afa21dc7d8e69afc95ce4b3877
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-08 07:09:54 +00:00
Charles Chen
4a048e404a Merge "Revert^2 Disable Settings large-screen optimization" into udc-dev am: f22d51b5f6 am: 492530af2d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23036416

Change-Id: Idbe0fe4c1836bcf2d7760e92f8e5245112734c32
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-08 07:05:27 +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
Charles Chen
b67f9c939d 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: I17b847e8ab3cc4911342b4db900d53640df007fc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-08 06:23:42 +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
a537078a3d Merge "Use correct filter" into udc-dev am: cf440dcae5 am: 90869f6fab 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23048001

Change-Id: I7f0add571feff5f301d38ee10b8f068322774105
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-06 04:06:05 +00:00
Guangjie (Jerry) Shi
cdbf216781 Merge "Use correct filter" into udc-dev am: cf440dcae5 am: 860002b42c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23048001

Change-Id: I438c8153d07882280f6eef757fb11958bc0cc64f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-06 04:01:25 +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
90869f6fab 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: I1a2232ecab3a2cdb9c5af81b382a422284b0c323
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-06 03:20:25 +00:00
Guangjie (Jerry) Shi
cf440dcae5 Merge "Use correct filter" into udc-dev 2023-05-06 02:38:26 +00:00
Jack He
61e20187bd Merge changes from topic "LeAudioBeta" into udc-dev am: 2605ccbcfa am: 518d08f978 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22994939

Change-Id: I196b9081f1c6442834dc2884d2c96bdf6eaf2a4a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-06 02:01:21 +00:00
Patty Huang
06f934c87e Add toggle to show/hide the Per Device Enable LE Audio Toggle in Device details am: f05615f1e8 am: 636eb36df0 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22994938

Change-Id: I5e059589b04bc9ec3849b27c570e0a876fabfe55
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-06 02:01:19 +00:00