PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
123,604 Commits 1 Branch 0 Tags
ca542c90cd2506daf1c4de72f34de940c8128d76
Commit Graph

123604 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Becca Hughes
ca542c90cd Rollback decision to merge by package name 
At the moment settings aggregates by
package name and it has been decided that
we should do per-service instead.

Test: atest & manual
Bug: 278598419
Change-Id: I6b7c8adac4957f1c3382044208e1642d0b6e3fab
 2023-04-18 22:15:50 +00:00
TreeHugger Robot
92e0bf9b1f Merge "[Settings] Update the footer link in Regional Preferences" into udc-dev am: c974342073 am: 6abeadaf77 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22700947

Change-Id: Iaf6887c5037b07f2dcc6725ca411db2a3f65b69c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-18 12:04:02 +00:00
TreeHugger Robot
c5900dcf26 Merge "[Settings] Update the footer link in Regional Preferences" into udc-dev am: c974342073 am: 4f2f22f89c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22700947

Change-Id: Ida98b40f1b197b5dabe373213fc43ff1f318df32
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-18 12:02:07 +00:00
TreeHugger Robot
6abeadaf77 Merge "[Settings] Update the footer link in Regional Preferences" into udc-dev am: c974342073 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22700947

Change-Id: Iabc92854c80d421f2941ab04ad86ee46d6e4cedc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-18 11:38:58 +00:00
TreeHugger Robot
4f2f22f89c Merge "[Settings] Update the footer link in Regional Preferences" into udc-dev am: c974342073 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22700947

Change-Id: I1104418200a50b0923793060615c250b8e22e7e6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-18 11:38:24 +00:00
TreeHugger Robot
c974342073 Merge "[Settings] Update the footer link in Regional Preferences" into udc-dev 2023-04-18 11:17:16 +00:00
Zoey Chen
a3c3ae6944 Merge "[Settings] Fix the layout index" into udc-dev am: cd719845d6 am: 4f01523156 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22573648

Change-Id: Ie41a3d6d0ae77e6c6192ddd8745e30914f0f11bf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-18 10:54:57 +00:00
Zoey Chen
cfff3dc1c2 Merge "[Settings] Fix the layout index" into udc-dev am: cd719845d6 am: affb6ad3c9 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22573648

Change-Id: Id1ec4f1e555b5a29c33fba3ce82d44c1f598c2e8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-18 10:54:44 +00:00
Zoey Chen
4f01523156 Merge "[Settings] Fix the layout index" into udc-dev am: cd719845d6 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22573648

Change-Id: I887e0086b36b621cfdd8ad3d5000e24914757fef
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-18 10:32:39 +00:00
Zoey Chen
affb6ad3c9 Merge "[Settings] Fix the layout index" into udc-dev am: cd719845d6 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22573648

Change-Id: I25017a2a897fa689c5f103437ae4bae0594c5259
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-18 10:32:37 +00:00
Zoey Chen
cd719845d6 Merge "[Settings] Fix the layout index" into udc-dev 2023-04-18 10:02:40 +00:00
Zoey Chen
5e987f49dd [Settings] Update the footer link in Regional Preferences 
Bug: 277573274
Test: local test
Change-Id: I0c02cee71365f98d89d98e4147e1eb5245b7ede9
 2023-04-18 09:59:24 +00:00
Automerger Merge Worker
d0fdc9b978 Merge "Merge "Fix pair another dialog doesn't show up after pairing in all bluetooth device page." into udc-dev am: 80016ad92a am: 2fb71a4548" 2023-04-18 09:26:18 +00:00
Jason Hsu
dd9803ccf7 Merge "Fix pair another dialog doesn't show up after pairing in all bluetooth device page." into udc-dev am: 80016ad92a am: d3453f681c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22477523

Change-Id: If2daf9293d431799df85b1a1fd299fd16cd1a790
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-18 09:25:41 +00:00
Jason Hsu
d73c3689c2 Merge "Fix pair another dialog doesn't show up after pairing in all bluetooth device page." into udc-dev am: 80016ad92a am: 2fb71a4548 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22477523

Change-Id: I52afe43b8a614344d8027d7f289e4acda538e48c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-18 09:25:31 +00:00
Jason Hsu
2fb71a4548 Merge "Fix pair another dialog doesn't show up after pairing in all bluetooth device page." into udc-dev am: 80016ad92a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22477523

Change-Id: Ia5edae7485315c2cfab27ad65d533d287d3f60ff
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-18 09:02:16 +00:00
Jason Hsu
d3453f681c Merge "Fix pair another dialog doesn't show up after pairing in all bluetooth device page." into udc-dev am: 80016ad92a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22477523

Change-Id: I2d794bf5d149f2301364431114abdbe04352e8ae
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-18 09:00:43 +00:00
Jason Hsu
80016ad92a Merge "Fix pair another dialog doesn't show up after pairing in all bluetooth device page." into udc-dev 2023-04-18 08:47:37 +00:00
Zoey Chen
e9f6efa2b6 [Settings] Fix the layout index 
The index of language label's layout is 0 and index of num layout is 1, so the select tp speak will read the language label first.
The root cause of the incorrect index is, the language label's layout starts with the parent layout instead of the num layout in the hierarchy view. Adjust the language label's layout and add these views one by one in the parent view.

Also fix the layout's jumping when user switches the page to "Remove language"

Bug: 277173513
Test: local test
Change-Id: I0d5879a07183713fa50b38f6321a15dd32582518
 2023-04-18 08:46:23 +00:00
Treehugger Robot
a790e85c8f Merge "[BiometricsV2] fix enrolling rotate failed" into udc-dev am: 2a0d6ead1a am: 9c37881b64 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22651124

Change-Id: Ibc9bdd1c17f4c8de833e7be3ed2c80f8f24901c5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-18 05:45:58 +00:00
Treehugger Robot
01605466a8 Merge "[BiometricsV2] fix enrolling rotate failed" into udc-dev am: 2a0d6ead1a am: 8cf1fe7757 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22651124

Change-Id: I9431fc80ffe0ce638813ede530267e51108c478c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-18 05:28:15 +00:00
Treehugger Robot
9c37881b64 Merge "[BiometricsV2] fix enrolling rotate failed" into udc-dev am: 2a0d6ead1a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22651124

Change-Id: Id9d4afd348cd1274dc37cee3d5fa73b0e88789b7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-18 05:26:25 +00:00
Treehugger Robot
8cf1fe7757 Merge "[BiometricsV2] fix enrolling rotate failed" into udc-dev am: 2a0d6ead1a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22651124

Change-Id: I43de2b80470465f59792f037bd33ebf081c72474
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-18 05:07:20 +00:00
Treehugger Robot
2a0d6ead1a Merge "[BiometricsV2] fix enrolling rotate failed" into udc-dev 2023-04-18 04:56:12 +00:00
Priyanka Advani
e69bc8c90e Merge "Revert "Add receiver for app install/uninstall events"" 2023-04-18 04:14:34 +00:00
YK Hung
5c77d0e9ad Merge "Cleanup smart battery entries (1/3)" into udc-dev am: d9f390010b am: 74692be06c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22639713

Change-Id: I359b45c03ad73def2647113cc87798fe22d2769f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-18 02:43:54 +00:00
YK Hung
86711b3099 Merge "Cleanup smart battery entries (1/3)" into udc-dev am: d9f390010b am: 5b55ef3c9e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22639713

Change-Id: I3eedbe5aaf8f2a6e2cfe262ad67795f0f1f0e682
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-18 02:42:49 +00:00
YK Hung
5b55ef3c9e Merge "Cleanup smart battery entries (1/3)" into udc-dev am: d9f390010b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22639713

Change-Id: I8e5dde75c20ade2e97220f79893d608d1908be3c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-18 02:25:03 +00:00
YK Hung
74692be06c Merge "Cleanup smart battery entries (1/3)" into udc-dev am: d9f390010b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22639713

Change-Id: Ib0ce398e1d92751367123891c9930735626ae62f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-18 02:22:49 +00:00
YK Hung
d9f390010b Merge "Cleanup smart battery entries (1/3)" into udc-dev 2023-04-18 01:59:06 +00:00
Priyanka Advani
57a077f8a5 Revert "Add receiver for app install/uninstall events" 
This reverts commit 86e092d84a.

Reason for revert: Probable culprit for b/278615544.

Change-Id: I5ff8730ab3e1974967b8c9f840f0ee3110dad483
 2023-04-17 23:05:32 +00:00
Jay Sullivan
70b6694fa1 Merge "[Safety Labels] Filter out auto, wear and tv" into udc-dev am: 4d5ac5a89f am: a90fd5c5cb 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22562077

Change-Id: I22f5c61b69d90595bcfa5769881cd183ad6e54d3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-17 20:57:17 +00:00
Becca Hughes
bc5a9b2fd8 [automerger skipped] Merge "Add dialog for enabling a provider in settings" into udc-dev am: e18613ccc6 am: 167ba43c34 -s ours 
am skip reason: Merged-In I404444115f178faf5545dec9686096fcdfdf73de with SHA-1 b69351b06d is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22605959

Change-Id: I6748ff3f2cb180aae4135104f5111464e9744fa7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-17 20:57:04 +00:00
Jay Sullivan
b6f19bd11d Merge "[Safety Labels] Filter out auto, wear and tv" into udc-dev am: 4d5ac5a89f am: d8ca8de897 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22562077

Change-Id: I85b75d9707a673c56add33f61c8533e85d9a312a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-17 20:25:52 +00:00
Becca Hughes
0c60452d75 [automerger skipped] Merge "Add dialog for enabling a provider in settings" into udc-dev am: e18613ccc6 am: 7d818f8f53 -s ours 
am skip reason: Merged-In I404444115f178faf5545dec9686096fcdfdf73de with SHA-1 7d407abf58 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22605959

Change-Id: I3c67d2d4697b3220d2da51d9e11dd6537cce8253
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-17 20:25:37 +00:00
Jay Sullivan
d8ca8de897 Merge "[Safety Labels] Filter out auto, wear and tv" into udc-dev am: 4d5ac5a89f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22562077

Change-Id: I4fdeabc560b05e96633729158e904243d08b8aec
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-17 20:23:56 +00:00
Jay Sullivan
a90fd5c5cb Merge "[Safety Labels] Filter out auto, wear and tv" into udc-dev am: 4d5ac5a89f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22562077

Change-Id: If69eb762d77b1b1ba3fe405cf78a9f23e8d16f37
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-17 20:13:47 +00:00
Becca Hughes
167ba43c34 Merge "Add dialog for enabling a provider in settings" into udc-dev am: e18613ccc6 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22605959

Change-Id: I981fe036a79c7c2476ff5ba46021ca6ace57dd97
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-17 20:12:52 +00:00
Becca Hughes
7d818f8f53 Merge "Add dialog for enabling a provider in settings" into udc-dev am: e18613ccc6 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22605959

Change-Id: Ifd7a9e4a9aa944b320db9f92add53accc7be9478
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-17 20:11:44 +00:00
Jay Sullivan
4d5ac5a89f Merge "[Safety Labels] Filter out auto, wear and tv" into udc-dev 2023-04-17 19:53:43 +00:00
TreeHugger Robot
94ea6ce20a Merge "Add receiver for app install/uninstall events" 2023-04-17 19:49:07 +00:00
Becca Hughes
e18613ccc6 Merge "Add dialog for enabling a provider in settings" into udc-dev 2023-04-17 19:42:57 +00:00
Fabian Kozynski
7de537bbeb Merge "Update strings for device controls settings" into udc-dev am: 2099f58d3e am: f7885593ec 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22623556

Change-Id: I84cc72ad680573afb5c9338d3a6718108b07dd49
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-17 18:56:47 +00:00
Automerger Merge Worker
2c0e88e981 Merge "Fix Settings crash on non face service support devices am: e85d588904 am: f018643563" 2023-04-17 18:55:19 +00:00
lbill
f77bbf87f7 Fix Settings crash on non face service support devices am: e85d588904 am: f018643563 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22670382

Change-Id: I726332e5567197249e6ab8a94488ef652bea1ee0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-17 18:54:24 +00:00
Fabian Kozynski
6e7600a34c Merge "Update strings for device controls settings" into udc-dev am: 2099f58d3e am: 25cc8f2fce 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22623556

Change-Id: I211e7c7b4f5e8c4dd130e4c564ae3d05a83fa48a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-17 18:48:54 +00:00
lbill
d372953d69 Fix Settings crash on non face service support devices am: e85d588904 am: d4ce5542fd 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22670382

Change-Id: Ifaeb7fe69a6a486c8b73e8043308416479d3b0d7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-17 18:46:17 +00:00
Fabian Kozynski
25cc8f2fce Merge "Update strings for device controls settings" into udc-dev am: 2099f58d3e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22623556

Change-Id: If4e9398bb55ccdc93538ef7e42b8eb827107d055
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-17 18:22:58 +00:00
Fabian Kozynski
f7885593ec Merge "Update strings for device controls settings" into udc-dev am: 2099f58d3e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22623556

Change-Id: I55256e32cc23cd7beafc2f0d6df38e165e0e6077
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-17 18:21:56 +00:00
lbill
d4ce5542fd Fix Settings crash on non face service support devices am: e85d588904 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22670382

Change-Id: I905e91e606f3cc1289d197f660fdea1896e94448
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-17 18:19:43 +00:00