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

122266 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Becca Hughes
09b2df4303 Merge "Add combined provider class that manages new settings UI" into udc-dev am: 99f45dd59b am: c5f2edcb4c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22911585

Change-Id: I490298203b8748898ae07ca00a9372241b2e6199
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-02 21:46:55 +00:00
Becca Hughes
c5f2edcb4c Merge "Add combined provider class that manages new settings UI" into udc-dev am: 99f45dd59b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22911585

Change-Id: I44dc0cd87c0be7df8b1506d203078ff57ff21138
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-02 21:03:56 +00:00
Becca Hughes
99f45dd59b Merge "Add combined provider class that manages new settings UI" into udc-dev 2023-05-02 20:16:32 +00:00
Ioana Alexandru
e0551da7c5 Fix AmbientDisplayAlwaysOn isSliceable. am: e0a4a343c4 am: c1c20274c6 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22897539

Change-Id: I0e8043ab275a62be19c5ed8a210e5f426c295d53
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-02 18:12:50 +00:00
Becca Hughes
ea03b3e2a0 Add combined provider class that manages new settings UI 
Example of how to use: https://paste.googleplex.com/6523798525313024

Test: make
Bug: 278919696
Change-Id: I934a5f6d02b50f8c97bda6d997902a42ff88e26f
 2023-05-02 17:37:44 +00:00
Ioana Alexandru
c1c20274c6 Fix AmbientDisplayAlwaysOn isSliceable. am: e0a4a343c4 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22897539

Change-Id: Ia4348c7ab9369a0bb40dd30c2db39e6824e1bc02
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-02 17:32:30 +00:00
Ioana Alexandru
e0a4a343c4 Fix AmbientDisplayAlwaysOn isSliceable. 
I changed this method to return true in ag/22761786 thinking that it was
necessary (as per the example at
https://g3doc.corp.google.com/company/teams/apps-android-settings/howto/settings_slices.md#preference-controller),
but this breaks a test, so I'm rolling back that part of the change.

Fix: 279881487
Test: presubmit
Change-Id: I87716a0daf5face9a79f98353b49ea2166226279
 2023-05-02 16:52:26 +00:00
Treehugger Robot
251da57429 Merge "Add tests for config check in ClonedAppsPreferenceController" into udc-dev am: d624141732 am: d5921d0bcf 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22954943

Change-Id: I55486c2659d78ccb300f19f26b20425b315ed5ac
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-02 15:20:43 +00:00
Treehugger Robot
d5921d0bcf Merge "Add tests for config check in ClonedAppsPreferenceController" into udc-dev am: d624141732 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22954943

Change-Id: I18fe27407d8f6003b597a4a9e98ed3b30cefe626
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-02 14:58:21 +00:00
Treehugger Robot
d624141732 Merge "Add tests for config check in ClonedAppsPreferenceController" into udc-dev 2023-05-02 14:47:48 +00:00
Lucas Silva
439cdd904f Merge "Fix colors for dreams settings according to new spec" into udc-dev am: 9bd47de298 am: bece3e4b9f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22954741

Change-Id: I8a912351bcd312ca984343dc24e4a44d61520167
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-02 14:47:12 +00:00
Chaohui Wang
34deed3eda Merge "Fix Data Saver page crashed when rotate" into udc-dev am: bf9ba71cba am: ef748cfc36 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22898015

Change-Id: I986376365180201cd503c4080f80e5007917e658
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-02 14:46:19 +00:00
Treehugger Robot
e769c5b4c9 Merge "Fix battery percentage is inconsistent in settings" into udc-dev am: 3b60e2a9c3 am: 01d7ed6a61 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22948142

Change-Id: I1212ac1e7b15b6280b1ae5386a916d1295d438bd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-02 14:43:24 +00:00
Lucas Silva
bece3e4b9f Merge "Fix colors for dreams settings according to new spec" into udc-dev am: 9bd47de298 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22954741

Change-Id: If83df1299e3c8c48850ed9a924485e45d2bc85cb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-02 14:35:09 +00:00
Lucas Silva
9bd47de298 Merge "Fix colors for dreams settings according to new spec" into udc-dev 2023-05-02 14:00:22 +00:00
Ankita Vyas
b32d02c293 Add tests for config check in ClonedAppsPreferenceController 
Bug: 280071827
Test: make RunSettingsRoboTests -j56 ROBOTEST_FILTER=ClonedAppsPreferenceControllerTest
Change-Id: Id7c2e73bdb0c2af3e700b3620bde2fe77c47f3e6
 2023-05-02 12:03:42 +00:00
Chaohui Wang
ef748cfc36 Merge "Fix Data Saver page crashed when rotate" into udc-dev am: bf9ba71cba 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22898015

Change-Id: I8e058b75c12a4bf2bf3462b83a23804e42db2acf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-02 10:35:15 +00:00
Treehugger Robot
01d7ed6a61 Merge "Fix battery percentage is inconsistent in settings" into udc-dev am: 3b60e2a9c3 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22948142

Change-Id: Ie0c10646accf9a9e9fdc219a76b84cf3cfd76872
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-02 10:24:59 +00:00
George
750cd809fe Fork the NfcTagAppsSettings page to SPA 
The page is located at "Apps > Special app access > Nfc launch"

Bug: 267404181
Test: make RunSettingsRoboTests ROBOTEST_FILTER=NfcTagAppsPreferenceControllerTest
Change-Id: I9fb4a68634f0b6f20d5f87601c1175ced33daad5
 2023-05-02 10:15:53 +00:00
Chaohui Wang
bf9ba71cba Merge "Fix Data Saver page crashed when rotate" into udc-dev 2023-05-02 09:50:17 +00:00
Treehugger Robot
3b60e2a9c3 Merge "Fix battery percentage is inconsistent in settings" into udc-dev 2023-05-02 05:08:39 +00:00
ykhung
0288b6d4af Fix battery percentage is inconsistent in settings 
Fix: 275217364
Test: make test RunSettingsRoboTests
Change-Id: I16dd772aacaea3f8ddb6da579adb033124e3dbb7
 2023-05-02 11:58:08 +08:00
Edgar Wang
d71accda55 Merge "Fix test case failed in SystemControlsFragmentTest" into udc-dev am: 55d7c97022 am: cd321d15a4 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22931168

Change-Id: I272c1bdb522a28e8e5b29803e01abc607bea7e7e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-02 03:18:24 +00:00
Edgar Wang
22f05bbf1c Merge "Fix PrivateDnsPreferenceControllerTest test case failed" into udc-dev am: 10129dc926 am: 11a93074f0 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22930678

Change-Id: Ibef72105e9b449d1f6097c0d90800ae11efeb5c8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-02 03:18:17 +00:00
Treehugger Robot
81bc2c00cc Merge "Support incompatible charger state in the Settings main page" into udc-dev am: 65efc1f45e am: 1352c72005 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22954539

Change-Id: I6beea870245b54f33ae00364e84cc6f7b4e18dc9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-02 03:18:10 +00:00
Edgar Wang
cd321d15a4 Merge "Fix test case failed in SystemControlsFragmentTest" into udc-dev am: 55d7c97022 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22931168

Change-Id: I17f261e3f7b5db0cf09b2ce5cd055109c0674ef4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-02 02:36:34 +00:00
Edgar Wang
11a93074f0 Merge "Fix PrivateDnsPreferenceControllerTest test case failed" into udc-dev am: 10129dc926 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22930678

Change-Id: Ib8d8a7d9f5e8a26d327a9ed0f22f23aac2194400
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-02 02:36:26 +00:00
Treehugger Robot
1352c72005 Merge "Support incompatible charger state in the Settings main page" into udc-dev am: 65efc1f45e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22954539

Change-Id: Ia8813239148539ba7da86305209102262f40d9c5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-02 02:36:16 +00:00
Edgar Wang
55d7c97022 Merge "Fix test case failed in SystemControlsFragmentTest" into udc-dev 2023-05-02 02:31:02 +00:00
Edgar Wang
10129dc926 Merge "Fix PrivateDnsPreferenceControllerTest test case failed" into udc-dev 2023-05-02 02:30:24 +00:00
Treehugger Robot
65efc1f45e Merge "Support incompatible charger state in the Settings main page" into udc-dev 2023-05-02 01:51:10 +00:00
Grace Cheng
a18fa5dda6 Merge "Prevent NPE on deleting fingerprint in Settings" into udc-dev am: 8b36777419 am: fba051fff0 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22911556

Change-Id: I028728170bdec5d604f5b781bacad29d0da9a991
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-02 00:30:40 +00:00
Grace Cheng
fba051fff0 Merge "Prevent NPE on deleting fingerprint in Settings" into udc-dev am: 8b36777419 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22911556

Change-Id: Ib8ab21f84ea24e97470854ed7c2ed5f12e262d5b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-01 23:50:17 +00:00
Grace Cheng
8b36777419 Merge "Prevent NPE on deleting fingerprint in Settings" into udc-dev 2023-05-01 22:40:59 +00:00
Lucas Silva
94b5a9e147 Fix colors for dreams settings according to new spec 
Fixes: 279780657
Test: open settings > display > screen saver and verified colors are
correct in both light/dark modes

Change-Id: Ibb2ba40807c937161f4dfa565f10d0ca2fb35549
 2023-05-01 15:21:11 -04:00
Kweku Adams
eafef5fe67 Merge "Use string notifications_disabled instead of off" into udc-dev am: 83c04b32d1 am: e6fe38f80c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22938598

Change-Id: Id6d5832f086b4ca773f90a1a53a2fbc3811888c8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-01 17:01:18 +00:00
Kweku Adams
e6fe38f80c Merge "Use string notifications_disabled instead of off" into udc-dev am: 83c04b32d1 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22938598

Change-Id: I70720fd6a505dfed13296f32d3d8109053faef1e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-01 16:18:44 +00:00
ykhung
09c1a4a850 Support incompatible charger state in the Settings main page 
https://screenshot.googleplex.com/9af4YCnCCjKHCFY

Bug: 271775549
Test: make test RunSettingsRoboTests
Change-Id: I6562e1b48a85ceceb20389ed87e55e0093040be2
 2023-05-02 00:04:01 +08:00
Kweku Adams
83c04b32d1 Merge "Use string notifications_disabled instead of off" into udc-dev 2023-05-01 15:37:22 +00:00
Florian Mayer
cfe9a7ce26 Merge "Fix typo in MemtagHelper" into udc-dev am: d7bbff0041 am: 6dd4f9a4ec 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22931417

Change-Id: Ibb342dd0c0da8b2a6381d89a6848cda76db482e1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-01 11:45:55 +00:00
Florian Mayer
6dd4f9a4ec Merge "Fix typo in MemtagHelper" into udc-dev am: d7bbff0041 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22931417

Change-Id: I7d000eba56ef08dfbe53fb3417b00dc5d7bdd3dc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-01 11:03:01 +00:00
Florian Mayer
d7bbff0041 Merge "Fix typo in MemtagHelper" into udc-dev 2023-05-01 10:26:47 +00:00
Florian Mayer
411d78c06c Fix typo in MemtagHelper 
Bug: 280034968
Change-Id: I5977925399342cd79f0bed2dd4af0e21c0c20102
 2023-05-01 10:25:04 +00:00
ykhung
471bc178e5 Fix legacy failed tests to avoid block presubmit am: a0f3f421dd am: 343284fe3f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22948657

Change-Id: I0f11401a21c9d9de656d46f298b86f2779b9115a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-30 09:04:18 +00:00
ykhung
343284fe3f Fix legacy failed tests to avoid block presubmit am: a0f3f421dd 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22948657

Change-Id: I9a28921a13578106840c73fbd21bcff23855ac21
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-30 08:18:06 +00:00
ykhung
a0f3f421dd Fix legacy failed tests to avoid block presubmit 
Root cause: the `Robolectric.setupActivity(Activity.class)` is removed from the system, which will always return the null `Context`

Test: make RunSettingsRoboTests ROBOTEST_FILTER=com.android.settings.fuelgauge.*
Change-Id: Ib52bc715508332bcb4bdcac56ecc414aa43f1419
 2023-04-30 00:33:57 +00:00
Treehugger Robot
3740b67371 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: a1c21ec6d0 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I387cdba42cd4f17dd55709b3708092c6f2106637
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-29 08:56:12 +00:00
Bill Yi
c02b50c037 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 4aaf3c69d2 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ifb19ad9c9f63ea0916c95d6c6a9cb4d2610627c5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-29 08:56:04 +00:00
Treehugger Robot
052b29430c [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: 7d651cba2a -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I931eb3cced5e3cefad8cd5fe7c94eed15999ec83
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-29 08:56:01 +00:00
Bill Yi
243f587fd9 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: af0651b602 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Iaae4ebe9ffc438c9ffb8252302d78ebed242d4f8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-29 08:55:27 +00:00