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

122518 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Derek Jedral
57c7dd9741 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: Iacff802347ca8f679ffc4e487cf62627c7d30f1f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-08 22:21:34 +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
Derek Jedral
42deb763e0 Merge "Change preference title if Active Unlock enabled" into udc-dev 2023-05-08 17:56:32 +00:00
Han Xu
aa3607690f 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: Iba93634c1cea2f17bc89225c560beab89a4a6801
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-08 17:46:03 +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
2f970a1a05 Merge "Fix wifi QR layout to fix image stretching" into udc-dev 2023-05-08 12:17:59 +00:00
Treehugger Robot
ef264fb304 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: I07d591bbec5d5d2fe68d019613c424d319750f7a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-08 11:42:13 +00:00
Treehugger Robot
e42c86703b 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: I417be26a4538146e20432c71bf6858e1f6bc8026
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-08 11:42:00 +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
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
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
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
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
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
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
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
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
9768e06a1e Merge changes from topic "LeAudioBeta" into udc-dev am: 2605ccbcfa am: 22e2bd2b85 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22994939

Change-Id: I555838c800e6d5c89d20601347decf58caa37993
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-06 02:00:48 +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
Treehugger Robot
9a9a6b13f5 Merge "Set primary services as enabled" into udc-dev am: 1dc52d159d am: b492914807 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23047998

Change-Id: I5ccdf60696b11fb4258055103381155c3f16a176
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-06 00:54:36 +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
a85c239613 Fix settings live update am: 481be6dde4 am: eb5c65a43b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23061769

Change-Id: I30931cb72a1906baeea0bccfca50deb192a00d81
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-05 23:34:01 +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
Becca Hughes
e150bb8a57 Fix newly installed providers bug am: 17a0266b16 am: fa5c54dcaf 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23048200

Change-Id: I51e4b23ea053e27c31586c1efe3fe7f3368b006a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-05 21:43:34 +00:00
Becca Hughes
fa5c54dcaf Fix newly installed providers bug am: 17a0266b16 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23048200

Change-Id: I8060e38ff4ae2d05c0f63b0ac1ceac49379ac2ad
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-05 21:01:01 +00:00
Becca Hughes
481be6dde4 Fix settings live update 
We were using a setting observer to watch
for changes but it was being cleaned up
because we did not hold a reference to
it.

Test: make
Bug: 280905737
Change-Id: I154951f47af20998e25d62a82a8e79f9c00fa027
 2023-05-05 20:32:44 +00:00
Becca Hughes
17a0266b16 Fix newly installed providers bug 
Package monitor was not registered
properly.

Change-Id: Ifde2e6027b2aee2355114c8ff9b0d1f542fa2f8d
Test: treehugger
Bug: 280867431
 2023-05-05 18:27:26 +00:00
Guangjie (Jerry) Shi
9c922641c1 Merge "Do null check to account for the case where provider is only autofill provider." into udc-dev am: 2898e3b527 am: 5ea3d20578 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23055667

Change-Id: Ida6d4cc55ec83fe30a75fb577170f47b60bd0eb2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-05 18:08:37 +00:00
Guangjie (Jerry) Shi
5ea3d20578 Merge "Do null check to account for the case where provider is only autofill provider." into udc-dev am: 2898e3b527 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23055667

Change-Id: If4dc87d555834f8c89e2de23b09d2c0cad78ac46
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-05 17:27:57 +00:00
Guangjie (Jerry) Shi
2898e3b527 Merge "Do null check to account for the case where provider is only autofill provider." into udc-dev 2023-05-05 16:45:37 +00:00
Jerry Shi
8d167d55f3 Do null check to account for the case where provider is only autofill 
provider.

Test: local build
Bug: 281047738

Change-Id: I9f3dca118a0d4182e2d727fa011dcb48db2a553f
 2023-05-05 14:59:27 +00:00
Chaohui Wang
3a164bc0db Merge "Fix dialog leak in RequestPermissionActivity" into udc-dev am: 5b18837a49 am: 72f42fe9f2 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23012490

Change-Id: I2d6c0af8414dc753ebba0d82ef188ea136558749
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-05 12:51:21 +00:00
Chaohui Wang
72f42fe9f2 Merge "Fix dialog leak in RequestPermissionActivity" into udc-dev am: 5b18837a49 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23012490

Change-Id: I4c0efabd30e2e9cf0d46477672741474bb8203f0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-05 12:09:38 +00:00
Chaohui Wang
5b18837a49 Merge "Fix dialog leak in RequestPermissionActivity" into udc-dev 2023-05-05 11:32:13 +00:00
Vania Januar
a2f4601fa8 Merge "Replace placeholder icons with stylus icons" into udc-dev am: 072d8b90d0 am: 247fed89c4 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23025585

Change-Id: I63c9b6e5bdd23a0f57cc7729bcbd6606cb89c4a2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-05 11:27:18 +00:00
Vania Januar
247fed89c4 Merge "Replace placeholder icons with stylus icons" into udc-dev am: 072d8b90d0 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23025585

Change-Id: Icc6d64627bba5370c4d68a0456c0d2641540cdfe
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-05 10:45:36 +00:00
Angela Wang
360cb671f2 Hides Flash Notifications illustration on tablet 
Since tablet illustrations are not yet finalized, we'll hide the Flash
Notifications illustration on tablet for now.

Bug: 280748155
Test: checks the UI on phone and tablet manually
Change-Id: I5a309dec3291f3585cc1d9769e2465c94250fa7f
 2023-05-05 09:54:04 +00:00
Vania Januar
072d8b90d0 Merge "Replace placeholder icons with stylus icons" into udc-dev 2023-05-05 09:50:11 +00:00
Chaohui Wang
39bf7dd530 Fix dialog leak in RequestPermissionActivity 
Dialog still show when activity destroyed will cause leak.

Dismiss dialog when activity onDestroy to fix this issue.

Fix: 279522922
Test: Manually with "Don't keep activities"
Test: Robolectric Test
Change-Id: I445f4b160020823a6f6e2883055218c1224e2c48
 2023-05-05 17:30:02 +08:00