Android/packages_apps_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
123,354 Commits 1 Branch 0 Tags
f0bca9aab06479ffbed9f3bc6f982b92bf58d551
Commit Graph

48213 Commits

Author SHA1 Message Date
Derek Jedral
f0bca9aab0 Merge "Change preference title if Active Unlock enabled" into udc-dev am: 42deb763e0 am: 898e1d95f3 am: 57c7dd9741 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22997141

Change-Id: Iea6b5bca8dc065c0e5014f99147b378409fc0afc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-08 23:07:44 +00:00
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
42deb763e0 Merge "Change preference title if Active Unlock enabled" into udc-dev 2023-05-08 17:56:32 +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
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
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
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
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
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
f22d51b5f6 Merge "Revert^2 Disable Settings large-screen optimization" into udc-dev 2023-05-08 05:39:07 +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
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
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
Jack He
9539ac8974 Merge changes from topic "LeAudioBeta" into udc-dev am: 2605ccbcfa am: 22e2bd2b85 am: a38db8628e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22994939

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

Change-Id: Icb0f9c343ff90fc5d032da8276640a895407698f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-06 01:37:45 +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
Treehugger Robot
14efad99d4 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: Ie1f2311d208380d807a52411fcd398d77b61aae2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-06 00:52: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
Becca Hughes
ed295c248e Use correct filter 
Test: TH
Bug: 280908763
Change-Id: I8a80e8533578b5e0b7a9b516c488b3602d18feef
 2023-05-05 23:42:29 +00:00
Becca Hughes
5e9b4bf2e2 Fix settings live update am: 481be6dde4 am: eb5c65a43b am: dd4b33d784 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23061769

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

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

Change-Id: I93dab6fc16e7888bdef5886d857897cbafa93085
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-05 22:21:18 +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
b15ed12119 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: I4364111601f67e6661dd7b6f09ef7f36361769db
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-05 21:39:26 +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
Guangjie (Jerry) Shi
7096d488d4 Merge "Do null check to account for the case where provider is only autofill provider." into udc-dev am: 2898e3b527 am: 5ea3d20578 am: b9853fd9f4 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23055667

Change-Id: Ic6462c987370c9c3ba3731747328fcab2b5a31d3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-05 18:51:02 +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
b9853fd9f4 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: Id318cb90a4fe3d364cb91c4a6b3228835860c6a8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-05 18:06:33 +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
1589d91e42 Merge "Fix dialog leak in RequestPermissionActivity" into udc-dev am: 5b18837a49 am: 72f42fe9f2 am: d91ec4c6ce 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23012490

Change-Id: Ie5cbd3133fb810621a7e1b8ebfde524edd4aa563
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-05 13:25:48 +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
d91ec4c6ce 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: Ia558ba2a9d668942483164792899339d355e9bd0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-05 12:47:14 +00:00
Vania Januar
75d8bf6b10 Merge "Replace placeholder icons with stylus icons" into udc-dev am: 072d8b90d0 am: 247fed89c4 am: aa438742ed 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23025585

Change-Id: I043d7acab120d6d9fc3b1aed4833466b358b4542
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-05 12:06:04 +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
aa438742ed 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: Ie8ee82c7ec38135b7f8bba33e171aece1bf337a2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-05 11:23:05 +00:00
Chaohui Wang
9c30db071c Merge "FRP bypass defense in the Settings App for SPA" into udc-dev am: 7c042f374b am: 3d06aec9ab am: ee0a1b5224 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22948156

Change-Id: I6f19ceea151d73bb6a9f1c79ff723326260c26cf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-05 10:00:49 +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
Chaohui Wang
ee0a1b5224 Merge "FRP bypass defense in the Settings App for SPA" into udc-dev am: 7c042f374b am: 3d06aec9ab 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22948156

Change-Id: Ie1b0bc84ff0a286544815d1b8e860b403ef157cd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-05 09:22:02 +00:00