PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
110,374 Commits 1 Branch 0 Tags
5067d29ba49b8fdede295080bf6784015c2d749d
Commit Graph

110374 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Lucas Silva
5067d29ba4 Merge "Update dream summary when dream suppressed by bedtime mode" into tm-qpr-dev am: 6a8e193fad 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20216381

Change-Id: I72ec38de9b99e704d909ddf9e21e7ac825b00abf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-10-18 17:43:35 +00:00
Lucas Silva
6a8e193fad Merge "Update dream summary when dream suppressed by bedtime mode" into tm-qpr-dev 2022-10-18 17:17:25 +00:00
Lucas Silva
51f838ba4b Update dream summary when dream suppressed by bedtime mode 
Bug: 246472225
Test: enabled bedtime mode, verified settings summary updated
Test: make -j64 RunSettingsRoboTests ROBOTEST_FILTER="com.android.settings.dream.WhenToDreamPreferenceControllerTest"
Change-Id: I4de12f636975b1bdf36898f7a530fde2f55644d4
 2022-10-18 13:23:49 +00:00
SongFerng Wang
bd476febf0 Merge "[MEP] the user can't enable the psim when revmovable esim is enabled" into tm-qpr-dev am: 2cd07f51ef 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20116277

Change-Id: Ib62e9adf0e2bdac25821c9f70634c27b26515056
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-10-18 06:50:09 +00:00
SongFerng Wang
2cd07f51ef Merge "[MEP] the user can't enable the psim when revmovable esim is enabled" into tm-qpr-dev 2022-10-18 06:30:34 +00:00
Treehugger Robot
5e52bc9c74 Merge "Fix crash when showing error dialog in NetworkRequestDialogActivity" am: d791f7b967 am: 24e8db3335 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2255618

Change-Id: I506f283c0dccadcc940245195d5112ca7ec4c154
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-10-18 05:09:53 +00:00
Treehugger Robot
24e8db3335 Merge "Fix crash when showing error dialog in NetworkRequestDialogActivity" am: d791f7b967 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2255618

Change-Id: I34ec41a3b0cd28029595e70164501dd1350e96b1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-10-18 04:42:26 +00:00
Treehugger Robot
d791f7b967 Merge "Fix crash when showing error dialog in NetworkRequestDialogActivity" 2022-10-18 04:09:49 +00:00
TreeHugger Robot
88706bbf97 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 2fa81e2257 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Iff9e0babe8321174232ab58bf04271d4694edad9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-10-17 17:39:14 +00:00
Bill Yi
a3e06bcc92 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 10685ce812 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ia3b9a8ad96a76b8f49f308087532b8511cb153e5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-10-17 17:38:52 +00:00
TreeHugger Robot
49322b60f2 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 5aa59588f2 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I6049cffd60de136acddb4a8b3331968794605d7d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-10-17 17:38:36 +00:00
Bill Yi
40aa9f76b2 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 8b6197643d -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I1ba7fba17edc02926600f15d63a1ea2680aa1e09
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-10-17 17:38:16 +00:00
TreeHugger Robot
2fa81e2257 Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev 2022-10-17 16:49:37 +00:00
TreeHugger Robot
5aa59588f2 Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev 2022-10-17 16:49:37 +00:00
Julia Tuttle
8416222c25 Merge "Default to hiding silent notifications on lockscreen in Settings" into tm-qpr-dev am: 5d780a42eb 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20193426

Change-Id: I6b4ac70d7ca1d7c4fd76b42c6d26f7361ff3420d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-10-17 16:07:43 +00:00
Julia Tuttle
5d780a42eb Merge "Default to hiding silent notifications on lockscreen in Settings" into tm-qpr-dev 2022-10-17 14:56:20 +00:00
Shen Lin
72e5a7ea21 Fix crash when showing error dialog in NetworkRequestDialogActivity 
Fix: 253913148
Test: manual
Change-Id: I23593da1ef6d72806f22d3501b06a8e7abadb100
 2022-10-17 09:30:16 +08:00
Bill Yi
10685ce812 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I52af69635563e5f832ff9b2db1988ab1a0b8947a
 2022-10-15 15:51:11 -07:00
Bill Yi
8b6197643d Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I9e456fa02748875d1d19cb5e74440837eb5c6ba0
 2022-10-15 15:45:37 -07:00
Julia Tuttle
e9108aecd8 Default to hiding silent notifications on lockscreen in Settings 
Also, fix an errorprone issue.

Bug: 252815574
Test: atest ShowOnLockscreenNotificationPreferenceControllerTest
Change-Id: I46e6d0f15c69abe60ef8505d300e5205b3c71e53
 2022-10-15 01:24:19 -04:00
Betty Chang
90a1263b87 Merge "[LE Audio] Add LE Audio Devices in Sound Settings" into tm-qpr-dev am: b2269caa45 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20176143

Change-Id: I207add249654cc4963ee065b0b161e94c24e9b64
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-10-15 05:03:37 +00:00
Betty Chang
b2269caa45 Merge "[LE Audio] Add LE Audio Devices in Sound Settings" into tm-qpr-dev 2022-10-15 04:38:00 +00:00
Julia Tuttle
16b7c91e5e Fix some out-of-order imports am: 9f0efa68a1 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20193425

Change-Id: I85de5768359802bd1800bc88b7ab490631c280e4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-10-14 19:03:13 +00:00
changbetty
1096417464 [LE Audio] Add LE Audio Devices in Sound Settings 
- When connected to the LE Audio Device, it will display "Play XXX on
    LEAduioDeviceName" in Sound Settings.

  - When connected to the LE Audio Device, it will display the LE Audio
    device name in the "Take call on" list for you having a active call(Hands Free).

  - Remove the @Ignore annotation for all the tests and make test
    cases pass.

Bug: 240911615
Bug: 243494881
Test: manual test
Test: make RunSettingsRoboTests ROBOTEST_FILTER=AudioOutputSwitchPreferenceControllerTest
Test: make RunSettingsRoboTests ROBOTEST_FILTER=HandsFreeProfileOutputPreferenceControllerTest
Test: make RunSettingsRoboTests ROBOTEST_FILTER=MediaOutputPreferenceControllerTest
Change-Id: I10db59b33623495a9e9933556c78e20d81e405ea
 2022-10-14 06:10:52 +00:00
Julia Tuttle
9f0efa68a1 Fix some out-of-order imports 
Bug: 20188695
Test: build
Change-Id: I47d463f82bee4e1b22300eb4260dd38dbeb13c88
 2022-10-13 21:55:46 -04:00
Chloris Kuo
6e64305274 Disable Enhanced notifications setting when default NAS is not available am: 236eaed326 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20188999

Change-Id: I68d337b4d5b947a7e0af817cb0c76039df18dbf8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-10-13 20:42:21 +00:00
Chloris Kuo
236eaed326 Disable Enhanced notifications setting when default NAS is not available 
Test: NotificationAssistantPreferenceControllerTest
Bug: 251400808
Change-Id: Idec520013bea32cfaea0285f33c525a6e37f0124
(cherry picked from commit 873b8544e1)
 2022-10-13 16:27:35 +00:00
Treehugger Robot
61cc95f7d1 Merge "Fix "show system apps" status lost when switching on/off dark theme" am: df8e9c630a am: c0904055f4 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2253577

Change-Id: If5a0b0e899b0eea3110319c7df89bb23f932e77e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-10-13 15:19:20 +00:00
Treehugger Robot
c0904055f4 Merge "Fix "show system apps" status lost when switching on/off dark theme" am: df8e9c630a 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2253577

Change-Id: Ie35b84bc9e348997fc34f58ded21c84e191e6786
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-10-13 14:35:09 +00:00
Treehugger Robot
df8e9c630a Merge "Fix "show system apps" status lost when switching on/off dark theme" 2022-10-13 14:09:17 +00:00
Shen Lin
d956175333 Fix "show system apps" status lost when switching on/off dark theme 
Bug: 253388290
Test: manual and atest
Change-Id: I5833f94478c2faaf53d40652f0e7ce92adb3e8b6
 2022-10-13 12:19:11 +00:00
Behnam Heydarshahi
8b2496eb9e Merge "Add notification volume controller in settings" into tm-qpr-dev am: 7f6c833b89 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19940409

Change-Id: Iffd5dcd7eb9ad645807d9529f352582457dc3f0e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-10-12 20:07:05 +00:00
Behnam Heydarshahi
7f6c833b89 Merge "Add notification volume controller in settings" into tm-qpr-dev 2022-10-12 19:37:26 +00:00
TreeHugger Robot
047fd278c2 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 689350d4d4 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I982b13a627921fd135213e847df3fbae32976d62
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-10-12 14:13:30 +00:00
Bill Yi
d16666c5ba [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 8e5a2508d1 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ida7b0bfa901c3164611a5958dc8626254866e903
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-10-12 14:13:27 +00:00
TreeHugger Robot
5924d82da1 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 9b960b32e0 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Id789d09d65c356f51d59ac5673ec6bbba9f114ce
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-10-12 14:13:25 +00:00
Bill Yi
c1d1c86a35 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e729683b8f -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ie01c4539c17f7f2e236ed4d767dac2f8cff62e2d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-10-12 14:13:14 +00:00
TreeHugger Robot
f781e89469 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 38e1727150 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I2de50f60c22ef567f2a73b0fdecf2eb9bc4b769d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-10-12 14:12:47 +00:00
Bill Yi
d129e31815 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 3f2f1212a6 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I6ed4754a876010d7b3a204bdccda0f4129511dab
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-10-12 14:12:23 +00:00
TreeHugger Robot
689350d4d4 Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev 2022-10-12 13:38:54 +00:00
TreeHugger Robot
9b960b32e0 Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev 2022-10-12 13:38:54 +00:00
TreeHugger Robot
38e1727150 Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev 2022-10-12 13:38:54 +00:00
TreeHugger Robot
fa8bb92025 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: f4e14e153b -s ours am: 8859d2d131 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ifa4320cd538c88a8d1cb2500fe4c0d4efc23e6bc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-10-12 07:51:13 +00:00
Bill Yi
b829b80845 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: a1ec1e30df -s ours am: 46ef926c7d -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ied2b758130a2271060c9b3ced513e998d855bef7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-10-12 07:51:11 +00:00
TreeHugger Robot
99fe34343d [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: 4cddf997d6 -s ours am: fccca2d569 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I00992b6f3d158974a5077a4e7b163a6acdf673e4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-10-12 07:51:09 +00:00
Bill Yi
5cde47a835 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 3ff3434900 -s ours am: ec126d93fe -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I6c0cec7637baf7fedae1ca649e0512be6810d845
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-10-12 07:50:57 +00:00
TreeHugger Robot
b05c41db59 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: 24c7d47de2 -s ours am: 2f4c15f95f -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I1f4891497f4751e079b1168fd08f4be17c95a2a1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-10-12 07:50:32 +00:00
Bill Yi
3adffeec9f [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 171a00478b -s ours am: ce885622a7 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ia0ad188ee18eaa488deee5a44995498b7be16b2a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-10-12 07:50:07 +00:00
TreeHugger Robot
8859d2d131 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: f4e14e153b -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I3c72497e940e6341d2809211f64fa86a3b56bbe2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-10-12 07:25:53 +00:00
Bill Yi
46ef926c7d [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: a1ec1e30df -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ic6477cc86daa19ec48e92d6222fb3324e2be7a93
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-10-12 07:25:51 +00:00