Commit Graph

91032 Commits

Author SHA1 Message Date
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
Bonian Chen
0363e192c1 Merge "[Settings] Code Refactor - ActiveSubsciptionsListener" into sc-dev am: 97886470cb
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15076791

Change-Id: I238d3465742a9998da4553b644299c655b997710
2021-06-25 02:18:12 +00:00
Bonian Chen
f9aa12f4d9 Merge "Revert "[Settings] Code Refactor - ActiveSubsciptionsListener"" into sc-dev 2021-06-25 02:17:59 +00:00
Bonian Chen
49e4eb1151 Merge "[Settings] Code Refactor - ActiveSubsciptionsListener" into sc-dev am: 97886470cb
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15076791

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

Change-Id: I46192c9ae493e0716b6d39eea5516c0652e2be2e
2021-06-25 02:16:35 +00:00
Bonian Chen
7b8e05adab Revert "[Settings] Code Refactor - ActiveSubsciptionsListener"
This reverts commit 2a1344a50e.

Reason for revert: Missing some files which would lead to build breakage.

Change-Id: I8c63dea9b41598b563cbf5e5ff1c500cc51b7005
2021-06-25 02:10:43 +00:00
Bonian Chen
97886470cb Merge "[Settings] Code Refactor - ActiveSubsciptionsListener" into sc-dev 2021-06-25 01:59:05 +00:00
Jeremy Goldman
74597578ca LegacyVpnPreferenceTest added for Vpn settings
Ensure that the profile name is successfully stored, and that the title
of the preference corresponds to the name of the associated VpnProfile

Interesting issue occurred where the icon resource was not present the
first time the class was initialized, but not the second. Trying this
twice within the test resolved this issue.

Test: atest -c LegacyVpnPreferenceTest
Bug: 187245804
Change-Id: I325b155cb0afdb6ce134325944fe5651bf9a1233
2021-06-25 09:21:03 +08:00
Peter Kalauskas
8d37a2bb85 Make use of config for auto-created guest users
If frameworks config config_guestUserAutoCreated=true, then Settings
will:

 - Create a new guest user any time the current guest user is removed

 - Show "Guest" instead of "Add guest"

 - Show "Reset guest" instead of "Remove guest"

Bug: 188542158
Test: With config_guestUserAutoCreated=true, delete current guest user
      using adb (`adb shell cmd user list -v --all` to find the user
      ids, then remove each guest user with `adb shell pm remove-user
      <id>`), then as owner, open multi-users settings page. Check that
      there is a item for "Guest" instead of "Add guest". Select
      "Guest", then confirm there is an item for "Reset guest" (it
      should be disabled). Select "Switch to guest", then switch back to
      owner. Open the multi-users settings page again. Check that "Reset
      guest" is now enabled. Tap "Reset guest", and press confirmation
      button, named "Reset". You should be take back to the main
      multi-user settings page and still see "Guest". Wait a few
      seconds, then use adb to confirm there is a guest user present.
Test: With config_guestUserAutoCreated=true, switch to guest user, open
      multi-users settings page, check that there is an option to "Reset
      guest". Select "Reset guest", and press confirmation button, named
      "Reset". Phone should switch back to last active user, and QS tile
      should now show "Guest" instead of "Add guest". Run `adb shell cmd
      user list -v --all` to confirm guest has a new user id.
Test: With config_guestUserAutoCreated=false, confirm that "Add guest"
      and "Remove guest" features remain unchanged
Change-Id: I7d5b81bd2e5c6b999ae18cd6b1280ae0496db94b
2021-06-24 17:40:12 -07:00
TreeHugger Robot
86bde2c213 Merge "Import translations. DO NOT MERGE ANYWHERE" 2021-06-24 21:33:01 +00:00
TreeHugger Robot
d30b0c9cec [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 54c1ff8489 -s ours am: 0d307d31fa -s ours am: 9422f32573 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I84f97ce9449909d9808653bc62684e7bfec8e199
2021-06-24 21:01:57 +00:00
TreeHugger Robot
1621228ccd [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 54c1ff8489 -s ours am: 6225c4a3af -s ours am: 15118dbc4a -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ia09ff723fabbb664e7e2493ab26a8de9a3e53552
2021-06-24 21:01:28 +00:00
TreeHugger Robot
9422f32573 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 54c1ff8489 -s ours am: 0d307d31fa -s ours
am skip reason: subject contains skip directive

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

Change-Id: I2e87438d8d88e8cacc7583a7a82590d96d65f499
2021-06-24 20:52:29 +00:00
TreeHugger Robot
15118dbc4a [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 54c1ff8489 -s ours am: 6225c4a3af -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ia57333d8312b885835960bdc01e8a58a153f9af0
2021-06-24 20:52:08 +00:00
TreeHugger Robot
253b2d40c8 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 54c1ff8489 -s ours am: be8c22ca76 -s ours
am skip reason: subject contains skip directive

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

Change-Id: If63fcc899fd9e51524d67b6fb280b64992531366
2021-06-24 20:51:42 +00:00
TreeHugger Robot
ba76ed7723 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: 483f978ba7 -s ours am: b8bd54cd94 -s ours am: 510d842992 -s ours am: 48386d90db -s ours
am skip reason: subject contains skip directive

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

Change-Id: I03454bdc42fd56cc79b9fac3ed46e1577edfd140
2021-06-24 20:43:08 +00:00
Bill Yi
5bafb09498 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 8198514a9f -s ours am: 3e45d30cfb -s ours am: 6ace7cdcb2 -s ours am: 5026a41048 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ibb21eaaeef1ce59ae12ba029a31d2c213f5d87f6
2021-06-24 20:42:53 +00:00
TreeHugger Robot
64fadf60ef [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: fa6b455bd0 -s ours am: 0e1287502f -s ours am: cb3096af34 -s ours am: 9f8f4b76ef -s ours
am skip reason: subject contains skip directive

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

Change-Id: I4cf27e04655c46d7976c19327758a20a9318bf76
2021-06-24 20:42:37 +00:00
Bill Yi
623470d7f4 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 342b2ae851 -s ours am: 06ffb62957 -s ours am: 3716c2a75f -s ours am: 2aba6cdc90 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I4e3baaf8da2c84067ed7806815beca7dc161ad4b
2021-06-24 20:42:28 +00:00
TreeHugger Robot
6225c4a3af [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 54c1ff8489 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I573848bc5bd6cfd18ae7e73fe2b2679dc155261a
2021-06-24 20:42:25 +00:00
TreeHugger Robot
cf76e9ba84 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: edeef947e4 -s ours am: 2ac3bc7a2a -s ours am: 3cf6d9a4e8 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ic96831c4f8a71a4de35c7b6bc5fc60b97bb0d7a8
2021-06-24 20:41:44 +00:00
TreeHugger Robot
be8c22ca76 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 54c1ff8489 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I2a842384ca11e4bf25585941a48e734599135fb0
2021-06-24 20:41:38 +00:00
TreeHugger Robot
0d307d31fa [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 54c1ff8489 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I2c389114e954d04535003cb6fdf43d1591293013
2021-06-24 20:41:03 +00:00
TreeHugger Robot
48386d90db [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: 483f978ba7 -s ours am: b8bd54cd94 -s ours am: 510d842992 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I7a1d18fb20f856c2aedb7e2292d187e6d35c8e6b
2021-06-24 20:32:33 +00:00