Commit Graph

90341 Commits

Author SHA1 Message Date
Wendy Sung
664e1e676b Merge "Add Adaptive Preferences Lottie File for Dark Mode" into sc-dev am: 29da5abcb1 am: 1d909e6649
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15056868

Change-Id: I3729981cd4282cf60a55122e45d708a9d7d59acc
2021-06-25 16:57:32 +00:00
Rajeev Kumar
7dc3bb906b Merge "Make use of config for auto-created guest users" into sc-dev am: f11fdb3e50 am: 2381645bda am: 4e7b43a73e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14988090

Change-Id: I81f1518348dda9fabaa2cec99c5bc2c3a77b5684
2021-06-25 16:41:06 +00:00
Julia Reynolds
4b548cfc8e Merge "Disable additional pkgs on DND perm page" into sc-dev am: 3d22e9775a am: d802ef1614 am: 94542a34b8
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15109118

Change-Id: I15ee404cb12972526fac4477d511da4a9d52971c
2021-06-25 16:40:38 +00:00
Zimuzo Ezeozue
4c694093ad Merge "Update string to enable transcode via MTP" into sc-dev am: 17608ff21a am: d6bb420ffa am: 069f836135
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15095781

Change-Id: I4dd6910993a9fc3409e022ca9400497fe63f86c2
2021-06-25 16:40:19 +00:00
Wendy Sung
15ace50e18 Merge "Add Adaptive Preferences Lottie File for Dark Mode" into sc-dev am: 29da5abcb1 am: 5b40172e5a am: a3404607fc
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15056868

Change-Id: I95af54f6986921f8e8817f8ee3907dc3653b89ae
2021-06-25 16:39:55 +00:00
Rajeev Kumar
4e7b43a73e Merge "Make use of config for auto-created guest users" into sc-dev am: f11fdb3e50 am: 2381645bda
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14988090

Change-Id: I5b64bcbcca1ce9c85a554e1f0c578f920a7ab3ce
2021-06-25 16:39:19 +00:00
Rajeev Kumar
b16e89ac1a Merge "Make use of config for auto-created guest users" into sc-dev am: f11fdb3e50 am: bbe37e2764 am: f3f3db186f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14988090

Change-Id: I7adbc49cce6b1cdcc7d414f2e7a86cf7ae844a66
2021-06-25 16:34:25 +00:00
Julia Reynolds
ebefd615d8 Merge "Disable additional pkgs on DND perm page" into sc-dev am: 3d22e9775a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15109118

Change-Id: I910d0976c26d0e1df0760e75b8c3117d36afd892
2021-06-25 16:29:45 +00:00
Zimuzo Ezeozue
73c1c1017c Merge "Update string to enable transcode via MTP" into sc-dev am: 17608ff21a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15095781

Change-Id: Ief22b91b41b4ae0d44bc8ec20560800132bdd712
2021-06-25 16:29:18 +00:00
Wendy Sung
1d909e6649 Merge "Add Adaptive Preferences Lottie File for Dark Mode" into sc-dev am: 29da5abcb1
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15056868

Change-Id: I4bd718dfdc506824e5e9ff96e5218cf433408804
2021-06-25 16:28:22 +00:00
Rajeev Kumar
2381645bda Merge "Make use of config for auto-created guest users" into sc-dev am: f11fdb3e50
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14988090

Change-Id: I13f62a014f6f300a8d5aa9b69d47760cff3896de
2021-06-25 16:25:33 +00:00
Julia Reynolds
94542a34b8 Merge "Disable additional pkgs on DND perm page" into sc-dev am: 3d22e9775a am: d802ef1614
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15109118

Change-Id: Ib285f72bf98de1308b5fc8aa9cebbac42011e467
2021-06-25 16:24:14 +00:00
Zimuzo Ezeozue
069f836135 Merge "Update string to enable transcode via MTP" into sc-dev am: 17608ff21a am: d6bb420ffa
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15095781

Change-Id: Ic0894449254aaf0e2488c7f92b224208f5095496
2021-06-25 16:23:51 +00:00
Wendy Sung
a3404607fc Merge "Add Adaptive Preferences Lottie File for Dark Mode" into sc-dev am: 29da5abcb1 am: 5b40172e5a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15056868

Change-Id: Ice4e40cdeba942a35761fd444d4719f6f3d64138
2021-06-25 16:23:10 +00:00
Rajeev Kumar
f3f3db186f Merge "Make use of config for auto-created guest users" into sc-dev am: f11fdb3e50 am: bbe37e2764
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14988090

Change-Id: Ia011f75e7b19175da595dd59518739a5c31db1b5
2021-06-25 16:17:36 +00:00
Julia Reynolds
d69276d59e Merge "Disable additional pkgs on DND perm page" into sc-dev am: 3d22e9775a am: 8d4d54998d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15109118

Change-Id: I840b45fe8f8440dfd8d0f7b55ef614e373f1e854
2021-06-25 15:16:29 +00:00
Julia Reynolds
8d4d54998d Merge "Disable additional pkgs on DND perm page" into sc-dev am: 3d22e9775a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15109118

Change-Id: Ia5ab926a59272d2940522e69319dc1b13dcb85c2
2021-06-25 15:07:38 +00:00
Julia Reynolds
d802ef1614 Merge "Disable additional pkgs on DND perm page" into sc-dev am: 3d22e9775a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15109118

Change-Id: I74b2da6ee478465ba6d3c4106fa6b13d1c9751cf
2021-06-25 15:07:27 +00:00
Julia Reynolds
3d22e9775a Merge "Disable additional pkgs on DND perm page" into sc-dev 2021-06-25 14:56:13 +00:00
Julia Reynolds
4c7981eb0d Disable additional pkgs on DND perm page
Because they will always have access because they hold
the permission to manage notifications.

Test: manual
Fixes: 191973668
Change-Id: I456aec41b401bba6f10d9ea969e2fb8c4300825d
2021-06-25 09:17:41 -04:00
Zimuzo Ezeozue
a70c21373f Merge "Update string to enable transcode via MTP" into sc-dev am: 17608ff21a am: 0eebaf719e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15095781

Change-Id: I24f18d35110a9ec0748addc5fde327f7aaf2fc2e
2021-06-25 08:49:04 +00:00
Syaoran Kuo
a78bd84d95 Merge "Bug fix: null string will cause exception in checkStringInAdbCommandOutput" 2021-06-25 08:41:45 +00:00
Zimuzo Ezeozue
0eebaf719e Merge "Update string to enable transcode via MTP" into sc-dev am: 17608ff21a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15095781

Change-Id: I1aac8ae7f7145ab0adb2961fb9059f47fd41e93e
2021-06-25 08:36:54 +00:00
Zimuzo Ezeozue
d6bb420ffa Merge "Update string to enable transcode via MTP" into sc-dev am: 17608ff21a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15095781

Change-Id: Idd4a78318f86ecf39a1fd7397518705d7aaf7c5d
2021-06-25 08:36:09 +00:00
Zimuzo Ezeozue
17608ff21a Merge "Update string to enable transcode via MTP" into sc-dev 2021-06-25 08:24:27 +00:00
Syaoran Kuo
5148311d60 Bug fix: null string will cause exception in checkStringInAdbCommandOutput
Bug: 192036015
Test: atest com.android.settings.fuelgauge.batterysaver.BatterySaverButtonPreferenceControllerComponentTest#test_check_battery_saver_button
Change-Id: Ifc73c8c9d6b5fabca6af5ea604f23a789b99d217
https://atp.googleplex.com/test_runs/128222905
2021-06-25 08:10:15 +00:00
Jeremy Goldman
e212e16d41 Merge "AppPreferenceTest created for VpnSettings" 2021-06-25 08:06:44 +00:00
Bonian Chen
5422f8aac8 Merge "[Settings] Code Refactor - ActiveSubsciptionsListener" 2021-06-25 05:13:56 +00:00
Jeremy Goldman
9e51e4cb76 AppPreferenceTest created for VpnSettings
This sets up the unit test and checks the basic functionality of the
3rd party vpn preference.

Test: atest -c AppPreferenceTest
Bug: 187245804
Change-Id: I3037db27711fd5c2bbc8421e0827dcfa58ab21e8
2021-06-25 13:08:19 +08:00
Wendy Sung
0470dba81f Merge "Add Adaptive Preferences Lottie File for Dark Mode" into sc-dev am: 29da5abcb1 am: 8c857823e4
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15056868

Change-Id: I8508f70b53461be91e9c96c3a59c1988d889c715
2021-06-25 03:47:23 +00:00
Rajeev Kumar
e3ec77a405 Merge "Make use of config for auto-created guest users" into sc-dev am: f11fdb3e50 am: 811cc971ce
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14988090

Change-Id: Idfb492057728e4613dc244d38baf113fff99ac9f
2021-06-25 03:46:49 +00:00
Wendy Sung
5b40172e5a Merge "Add Adaptive Preferences Lottie File for Dark Mode" into sc-dev am: 29da5abcb1
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15056868

Change-Id: I4f1a59ca2ad058f590505ab878906a94a6e99599
2021-06-25 03:30:22 +00:00
Wendy Sung
8c857823e4 Merge "Add Adaptive Preferences Lottie File for Dark Mode" into sc-dev am: 29da5abcb1
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15056868

Change-Id: Idc1748648b255d38fa1a4b6fe04a4dbc1910a605
2021-06-25 03:30:05 +00:00
Rajeev Kumar
811cc971ce Merge "Make use of config for auto-created guest users" into sc-dev am: f11fdb3e50
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14988090

Change-Id: Ic7fe5344e6a75d60eab7767b2f89cadc7ec1d2b2
2021-06-25 03:29:49 +00:00
Rajeev Kumar
bbe37e2764 Merge "Make use of config for auto-created guest users" into sc-dev am: f11fdb3e50
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14988090

Change-Id: Ia9aa5400789d91d6131c54d0daa85586c07f0228
2021-06-25 03:27:43 +00:00
Wendy Sung
29da5abcb1 Merge "Add Adaptive Preferences Lottie File for Dark Mode" into sc-dev 2021-06-25 03:22:41 +00:00
Rajeev Kumar
f11fdb3e50 Merge "Make use of config for auto-created guest users" into sc-dev 2021-06-25 03:15:35 +00:00
Bonian Chen
9de0bb62b3 Merge "Revert "[Settings] Code Refactor - ActiveSubsciptionsListener"" into sc-dev am: f9aa12f4d9 am: ec4ccdcc5a am: 98957e6d49
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15102531

Change-Id: I7554768a0f5bfac8fd670f906dcf812386f45da5
2021-06-25 02:42:50 +00:00
Bonian Chen
b26ffb1701 Merge "Revert "[Settings] Code Refactor - ActiveSubsciptionsListener"" into sc-dev am: f9aa12f4d9 am: d2e5971ed1 am: d4f8302d9c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15102531

Change-Id: Ic1c9a80373a2730e26c675403d4255f244e324bf
2021-06-25 02:42:38 +00:00
Bonian Chen
f850f4df8a Merge "[Settings] Code Refactor - ActiveSubsciptionsListener" into sc-dev am: 97886470cb am: 55e18777c2 am: 2c29f25fbf
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15076791

Change-Id: I159d680ff716021b3f345975bf9b9eab7501926b
2021-06-25 02:42:31 +00:00
Bonian Chen
ce24c49591 Merge "[Settings] Code Refactor - ActiveSubsciptionsListener" into sc-dev am: 97886470cb am: 0363e192c1 am: 43402ead79
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15076791

Change-Id: I26f9cbd70a6ac3891c384a6bb856074ad4fd055b
2021-06-25 02:42:01 +00:00
Bonian Chen
98957e6d49 Merge "Revert "[Settings] Code Refactor - ActiveSubsciptionsListener"" into sc-dev am: f9aa12f4d9 am: ec4ccdcc5a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15102531

Change-Id: I29a959946e7981617465cb1bd5a964d01dc27869
2021-06-25 02:29:30 +00:00
Bonian Chen
d4f8302d9c Merge "Revert "[Settings] Code Refactor - ActiveSubsciptionsListener"" into sc-dev am: f9aa12f4d9 am: d2e5971ed1
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15102531

Change-Id: I3fb7018e458943a14ad8494cca1c81814d7fff15
2021-06-25 02:28:51 +00:00
Bonian Chen
2c29f25fbf Merge "[Settings] Code Refactor - ActiveSubsciptionsListener" into sc-dev am: 97886470cb am: 55e18777c2
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15076791

Change-Id: I7b576a70724d448f33eb13b08bdcfb4ee17ef927
2021-06-25 02:28:35 +00:00
Bonian Chen
43402ead79 Merge "[Settings] Code Refactor - ActiveSubsciptionsListener" into sc-dev am: 97886470cb am: 0363e192c1
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15076791

Change-Id: I11b97060982cd68afd566479265dca5d9f1d6aed
2021-06-25 02:28:25 +00:00
Bonian Chen
58b9fac2e9 Merge "Revert "[Settings] Code Refactor - ActiveSubsciptionsListener"" into sc-dev am: f9aa12f4d9 am: e8bb21dde2
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15102531

Change-Id: Idba44549100166ea8118f61d5cbd3a935cc9959a
2021-06-25 02:27:44 +00:00
Bonian Chen
69b052a2e3 Merge "[Settings] Code Refactor - ActiveSubsciptionsListener" into sc-dev am: 97886470cb am: 49e4eb1151
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15076791

Change-Id: I2b8370c7b7bab117251269df256eee966153f42d
2021-06-25 02:27:38 +00:00
Bonian Chen
e8bb21dde2 Merge "Revert "[Settings] Code Refactor - ActiveSubsciptionsListener"" into sc-dev am: f9aa12f4d9
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15102531

Change-Id: Ib425e48777ea0088798c6f1fc37af1f24b609c9a
2021-06-25 02:21:36 +00:00
Bonian Chen
ec4ccdcc5a Merge "Revert "[Settings] Code Refactor - ActiveSubsciptionsListener"" into sc-dev am: f9aa12f4d9
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15102531

Change-Id: I3887bffb67f908015d62f4eecb3891ed64f0c822
2021-06-25 02:21:32 +00:00
Bonian Chen
d2e5971ed1 Merge "Revert "[Settings] Code Refactor - ActiveSubsciptionsListener"" into sc-dev am: f9aa12f4d9
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15102531

Change-Id: Id38b8ee7895c18dd8211f7b4caf0d307c924f1d0
2021-06-25 02:18:37 +00:00