PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
126,167 Commits 1 Branch 0 Tags
68df6c80bfc6f429f6c97083afbd04a1917b650d
Commit Graph

126167 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
9e7da7aaba 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: Idb7bba03da26ed237bf0b5a726506effb5ff6e29
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-08 10:59:43 +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
Chaohui Wang
ab8a130674 Clean up DefaultSubscriptionController.getSummary 
Which is always overridden by subclass after Change
I7d29b58ca5476ae0bb6fe2e04fecb96164cb1ada

This is a no op.

Bug: 277301125
Test: Manually with Mobile Settings
Test: Unit test
Change-Id: Ifa5928e1026b18c33f2bdd51fdcba267249dcee5
 2023-05-08 18:56:06 +08: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
dea0344933 Merge "Hides Flash Notifications illustration on tablet" into udc-dev am: 1113d5e9b5 am: b03509284e am: 07ee2d859d am: 8341fad6bf 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23012482

Change-Id: Ie23392df4b673a1839aa8154c75bf31275272939
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-08 10:19:38 +00:00
Angela Wang
b1de4fbe7a Merge "Hides Flash Notifications illustration on tablet" into udc-dev am: 1113d5e9b5 am: f676c35f02 am: afe6a6388b am: 87c42f29b0 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23012482

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

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

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

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

Change-Id: Ia51ee15c9ea0add3538c7a78a6995bba4e88ffbe
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-08 09:48:54 +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
07ee2d859d 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: Ibfdba3482f10fd329b039449a006e3bf4ef0bc1e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-08 09:15:23 +00:00
Angela Wang
d72f221a9b Merge "Hides Flash Notifications illustration on tablet" into udc-dev am: 1113d5e9b5 am: 75b08ce5ab 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23012482

Change-Id: I1c8e3f1fbc69031a6837ea565be008088d4493b9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-08 09:11:21 +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
Milton Wu
13c9606849 Merge "[BiometricsV2] Refine fingerprint ui and flow" 2023-05-08 08:41:36 +00:00
Charles Chen
0f00b5e1e1 Merge "Revert^2 Disable Settings large-screen optimization" into udc-dev am: f22d51b5f6 am: 492530af2d am: 2bc77140bb am: 0eeb5c9ccb 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23036416

Change-Id: Ibf340862c3a531db2a8357a186c7a0b5c85937d1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-08 08:35:12 +00:00
Charles Chen
97266f7ed4 Merge "Revert^2 Disable Settings large-screen optimization" into udc-dev am: f22d51b5f6 am: b67f9c939d am: 8ad361f548 am: 11534c33c9 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23036416

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

Change-Id: I26ded3805bd3f7bd26bffc35a0013cdf123cace3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-08 08:34:13 +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
75b08ce5ab 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: I2b92a152a995f46684c2ebfc4a83694691f60743
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
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
Charles Chen
0eeb5c9ccb Merge "Revert^2 Disable Settings large-screen optimization" into udc-dev am: f22d51b5f6 am: 492530af2d am: 2bc77140bb 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23036416

Change-Id: Ibd9132d3c38984854c147376683ae999480b8763
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-08 07:52:35 +00:00
Charles Chen
11534c33c9 Merge "Revert^2 Disable Settings large-screen optimization" into udc-dev am: f22d51b5f6 am: b67f9c939d am: 8ad361f548 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23036416

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

Change-Id: Ic1c823416b52ca853e94fe75c7ab3406b4d3f194
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-08 07:47:11 +00: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
2bc77140bb 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: Ic2aa13fd6523bb97bdb7b79fe0013ca1f2f64779
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-08 07:09:22 +00:00
Charles Chen
240c89f988 Merge "Revert^2 Disable Settings large-screen optimization" into udc-dev am: f22d51b5f6 am: 3086c6138a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23036416

Change-Id: I0bfce6a6714d1267a1af6809fd9dca911d05fe33
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-08 07:05:27 +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
3086c6138a 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: Iba436ee9da9f07f051f659dd5ad42d21047b0e67
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-08 06:27:52 +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
Milton Wu
8b0fc14f94 [BiometricsV2] Refine fingerprint ui and flow 
1. Fix "No thanks" become 2 lines, and fix the status when new
   fingerprint enrolled.
2. Fix Finish page shows again after pressing back from a new Finish
   page
3. Fix FindSensor page shows again after max number of fingerprint
   has reached.
4. Add missing tests, and remove some bypass-only tests

Bug: 279134177
Bug: 279380583
Bug: 279386539
Bug: 279394069
Test: atest FingerprintEnrollIntroViewModelTest
    FingerprintEnrollFindSensorViewModelTest
    FingerprintEnrollEnrollingViewModelTest
    FingerprintEnrollmentViewModelTest FingerprintEnrollmentActivityTest
Test: manually test 1, 2, and 3
Change-Id: I3797ceed8e7d6c10a4b4711f8bff8d7f222f0923
 2023-05-08 14:00:22 +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
cb00c675e5 Merge "Use correct filter" into udc-dev am: cf440dcae5 am: 860002b42c am: 30f7b3f66c am: 98600aff36 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23048001

Change-Id: I1c7ebbaa36ee20bc77d3bb5fc9fcf05f0bce45c4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-06 05:11:54 +00:00
Guangjie (Jerry) Shi
9806cabcd7 Merge "Use correct filter" into udc-dev am: cf440dcae5 am: 90869f6fab am: a537078a3d am: 6091e80755 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23048001

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

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

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

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

Change-Id: I9fc16d8ef9a9f54ca1140da499bdf993f20f0d59
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-06 04:22:43 +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
30f7b3f66c 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: I37ff8277ac3e2fd71a990ac3f9ae5e6972c55bfa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-06 04:05:18 +00:00
Guangjie (Jerry) Shi
570bdf7331 Merge "Use correct filter" into udc-dev am: cf440dcae5 am: 9355fbfa8f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23048001

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