Eugene Susla
7e23f84f86
[automerger skipped] RESTRICT AUTOMERGE am: bd4d6d8138
-s ours am: 7bd20e27ab
am: 90a1422f8c
-s ours am: 5dcdc8c8f4
am: 1d609a5c58
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12998691
Change-Id: I51ed92c6fdb3f220d35f103442e38de394cd64ba
2020-12-07 18:05:39 +00:00
Eugene Susla
1d609a5c58
[automerger skipped] RESTRICT AUTOMERGE am: bd4d6d8138
-s ours am: 7bd20e27ab
am: 90a1422f8c
-s ours am: 5dcdc8c8f4
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12998691
Change-Id: I2b946cac02eadf48759cd1111b1396a4f96edb5a
2020-12-07 17:37:46 +00:00
Eugene Susla
5dcdc8c8f4
[automerger skipped] RESTRICT AUTOMERGE am: bd4d6d8138
-s ours am: 7bd20e27ab
am: 90a1422f8c
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12998691
Change-Id: If59a3b1d966223a067f4dc3eb54a3628b3232efc
2020-12-07 17:21:19 +00:00
Eugene Susla
d47834acea
[automerger skipped] RESTRICT AUTOMERGE am: bfa7a75545
am: 83410e3295
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12998688
Change-Id: I38ee04804349442bb4baf255b1c06bb0d31d7f27
2020-12-07 17:06:00 +00:00
Eugene Susla
90a1422f8c
[automerger skipped] RESTRICT AUTOMERGE am: bd4d6d8138
-s ours am: 7bd20e27ab
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12998691
Change-Id: I0805128072ee688c6ff33e9ab3de25bc693bf077
2020-12-07 17:05:46 +00:00
Eugene Susla
7bd20e27ab
[automerger skipped] RESTRICT AUTOMERGE am: bd4d6d8138
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12998691
Change-Id: Ia78ec5e90df9f6b8744c30cde67806eaff01ccbb
2020-12-07 16:45:24 +00:00
Eugene Susla
83410e3295
RESTRICT AUTOMERGE am: bfa7a75545
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12998688
Change-Id: I6d3be61a4672694ad89dc8f49513a89e78002920
2020-12-07 16:45:23 +00:00
TreeHugger Robot
538f5420ac
Merge "Fine tune the icon size for some pages"
2020-12-07 08:14:17 +00:00
Manish Singh
b309d3af6d
Merge "Introduce new preference indicating user control."
2020-12-07 06:50:23 +00:00
Weng Su
cdb843d932
Merge "[Provider Model] Add Airplane-safe networks slice"
2020-12-07 06:23:55 +00:00
TreeHugger Robot
ab00a8dd36
Merge "[Provider Model] Modify the class name to GenericSwitchController"
2020-12-07 06:13:48 +00:00
Manish Singh
47445745be
Introduce new preference indicating user control.
...
If the user enables this, then that means that we will respect user's
choices for all the preferences, i.e. we will not update the preferences
based on the updates from server.
On the other hand, if it's disabled, then the rest of the preferences
would not be considered. And we'd decide their values based on the
values from the DeviceConfig (which in turn come from the server).
The controller for the default-transcoding-behavior for apps was also
added.
Also, renaming the set prop key for enabling-transcode to match the one
in DeviceConfig - transcode_enabled.
And while we were at it, we renamed the stirng from "disabling
transcoding for all apps" to "enabling transcoding for all apps"; and
also changed the controller to enable (instead of disable) transcoding.
BUG:169327180
Test: manual testing. And added unit test for
TranscodeUserControlPreferenceControllerTest.
Change-Id: If9b9face51b669f5177be8bfa18f44471f531058
2020-12-07 03:53:14 +00:00
TreeHugger Robot
6cabec175c
[automerger skipped] Merge "Fix output switcher will show 2 media session when remote playing" into rvc-qpr-dev am: d7cf95ef74
am: 436633ab5d
-s ours
...
am skip reason: Change-Id I80479d35b2bb2e353cf41f41f457f2dfd15cadbf with SHA-1 e16a8077b5
is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13109544
Change-Id: I430e84b4a8c1b5ae9a4305509c750537a5ffcc45
2020-12-07 03:44:05 +00:00
TreeHugger Robot
436633ab5d
Merge "Fix output switcher will show 2 media session when remote playing" into rvc-qpr-dev am: d7cf95ef74
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13109544
Change-Id: I5ca519b1a3475afb9697bc76b20f550997afda2b
2020-12-07 03:29:14 +00:00
TreeHugger Robot
d7cf95ef74
Merge "Fix output switcher will show 2 media session when remote playing" into rvc-qpr-dev
2020-12-07 03:07:25 +00:00
Xiao Ma
b763de8493
Merge "Update the Warning text about the visibility of device name."
2020-12-07 00:21:43 +00:00
Treehugger Robot
35390be7be
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 4d181cc04f
-s ours am: 11b0105b98
-s ours am: 209710e0ba
-s ours
...
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1518870
Change-Id: I93a642f4a12fe277fbb8479f36c4627d7a4fd530
2020-12-06 17:20:57 +00:00
TreeHugger Robot
403e0ce867
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: e5350c9e20
-s ours am: 9f9300d38b
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13174152
Change-Id: I476255b5f59d5b8014a345dcc39a1ae5d51271b6
2020-12-06 17:20:44 +00:00
Treehugger Robot
209710e0ba
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 4d181cc04f
-s ours am: 11b0105b98
-s ours
...
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1518870
Change-Id: Ib768abcf5080d9973e38b1b21c3c881e1c8b4d88
2020-12-06 17:06:48 +00:00
TreeHugger Robot
9f9300d38b
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: e5350c9e20
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13174152
Change-Id: I635569dfc187ffd874bd4c9189039608ba762b08
2020-12-06 17:06:17 +00:00
Treehugger Robot
11b0105b98
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 4d181cc04f
-s ours
...
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1518870
Change-Id: Iafacdf7b241ac8c7f4aa65861f885868bc4578dc
2020-12-06 16:38:51 +00:00
TreeHugger Robot
e5350c9e20
Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master
2020-12-06 16:22:59 +00:00
Treehugger Robot
2c2a56b7cc
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 97bc1fcff7
-s ours am: 7c2ed6be16
-s ours am: b07d67eeaf
-s ours
...
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1519229
Change-Id: Iad49ac4afe76b8c35934414fe6db8eec566d22e3
2020-12-06 16:20:44 +00:00
Treehugger Robot
b07d67eeaf
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 97bc1fcff7
-s ours am: 7c2ed6be16
-s ours
...
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1519229
Change-Id: I719c254b4796c4dd1d53dc30e0f53d63b3e75fce
2020-12-06 16:06:01 +00:00
Treehugger Robot
4d181cc04f
Merge "Import translations. DO NOT MERGE ANYWHERE"
2020-12-06 16:05:53 +00:00
Treehugger Robot
7c2ed6be16
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 97bc1fcff7
-s ours
...
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1519229
Change-Id: I215cb3c7612b323dd67437d31dfee850b8a12227
2020-12-06 15:48:44 +00:00
Treehugger Robot
97bc1fcff7
Merge "Import translations. DO NOT MERGE ANYWHERE"
2020-12-06 15:36:04 +00:00
Bill Yi
10caa304c0
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I6e8d356f279ba834c5493badcb5a0f8e7b916c6c
2020-12-06 12:37:23 +00:00
Bill Yi
b9a5248b95
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I518f13a32c239dfc98b053ad002d31577cd41a9a
2020-12-06 12:10:17 +00:00
Bonian Chen
ac77c237d8
Merge "[Settings][Test] Fix Junit test failure - MobileNetworkSwitchControllerTest"
2020-12-06 01:46:32 +00:00
Bill Yi
a815a12c40
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I267bdda4fe2a243d548b1842e9a08950e61069c0
2020-12-05 16:49:34 -08:00
TreeHugger Robot
9f27b4d633
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: 448ec6b5fe
-s ours am: 8e913664b5
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13168703
Change-Id: Ieec85d570818e565a2d0c2bd6f4d9fe4eb5f7941
2020-12-05 02:08:21 +00:00
TreeHugger Robot
8e913664b5
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: 448ec6b5fe
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13168703
Change-Id: Id2a91ce9acfc651d32f9a3ca46f52612a8904eb7
2020-12-05 01:55:42 +00:00
TreeHugger Robot
448ec6b5fe
Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master
2020-12-05 01:04:28 +00:00
Bill Yi
47416e4fde
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: d890249a20
-s ours am: d582948ff6
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13168705
Change-Id: If1e7a719cbe03f43b12a87a6b2eefe7d7c31315f
2020-12-05 00:18:28 +00:00
Bill Yi
d582948ff6
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: d890249a20
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13168705
Change-Id: Ibdf3ca3e032c9eba6d58bfca5409556ede8d15e7
2020-12-05 00:10:24 +00:00
Bonian Chen
eaabc5969e
[Settings][Test] Fix Junit test failure - MobileNetworkSwitchControllerTest
...
android.test.UiThreadTest has been deprecated.
This is a change migrate it into androidx.test.annotation.UiThreadTest
Bug: 174832214
Change-Id: I38f35e7602a269a018510723c199a7259d704b4e
Test: atest -c MobileNetworkSwitchControllerTest
2020-12-04 12:51:10 +00:00
Bill Yi
d890249a20
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I106d32515484c4ad081b1a0bc2bf01d79b5097ad
2020-12-04 03:58:02 -08:00
Bill Yi
d0f3a4ca19
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I2d0e585779a9e28de3aeb1eb8ca3246a09b717d4
2020-12-04 03:09:46 -08:00
Wesley.CW Wang
1f8853d37b
Update Settings Battery Defender strings am: 45a02ee994
am: 15cad1e712
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13146801
Change-Id: Ifc196dd2f2e3b381186aed5276ab74dd5d23cbd5
2020-12-04 04:11:10 +00:00
Wesley.CW Wang
15cad1e712
Update Settings Battery Defender strings am: 45a02ee994
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13146801
Change-Id: I9b6d03d465b981e13da2f056680d04f6f4f3ec6e
2020-12-04 03:39:03 +00:00
Xiao Ma
27963ed6a4
Update the Warning text about the visibility of device name.
...
After enabling DHCP hostname option, the device name will be carried
in the DHCP packets when connecting to a Wi-Fi network, which is also
visible for the DHCP server (upstream AP or hotspot). Update the warning
text correspondingly.
Bug: 174644890
Test: m
Test: manual test to verify the warning text has been updated when
changing the device name.(Settings > About Phone > Device name).
Change-Id: I031a03deb8d20fb3b3a217b0fa7d45aa1b3330d1
2020-12-04 10:23:12 +09:00
Kevin Chyn
edb5aab5b9
Merge changes I7cdf5fc4,I701baf06
...
* changes:
Start udfps enroll after activity animates in
Update portrait enrollment for UDFPS
2020-12-03 19:18:58 +00:00
Wesley.CW Wang
45a02ee994
Update Settings Battery Defender strings
...
Bug: 172794045
Test: make SettingsRoboTests
Change-Id: Ia9612fe891431869dc8e84e78db952ac8f1ab3dc
2020-12-03 19:00:44 +00:00
TreeHugger Robot
0c114e5c58
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: ec47b9a783
-s ours am: 1710016924
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13161901
Change-Id: I5a38a20ebe422f734564c7ac2eec228502fd066f
2020-12-03 18:08:35 +00:00
Weng Su
6c430b370d
[Provider Model] Modify the class name to GenericSwitchController
...
- The generic class can be used for multiple controllers
Bug: 174022082
Test:
- atest -c AirplaneSafeNetworksPreferenceControllerTest
- make RunSettingsRoboTests
ROBOTEST_FILTER=AllInOneTetherPreferenceControllerTest
- make RunSettingsRoboTests
ROBOTEST_FILTER=AutomaticStorageManagementSwitchPreferenceControllerTest
- make RunSettingsRoboTests
ROBOTEST_FILTER=WifiPrimarySwitchPreferenceControllerTest
Change-Id: I7d50ae3e6228005eb6dfb0a6c1a2f870c41330f2
2020-12-03 17:40:37 +00:00
TreeHugger Robot
1710016924
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: ec47b9a783
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13161901
Change-Id: I2cb6d59d77c7d4671660f064f492f3337a176709
2020-12-03 17:18:05 +00:00
TreeHugger Robot
ec47b9a783
Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev
2020-12-03 16:51:46 +00:00
Bill Yi
4b1662623a
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Ied07776386dcf321cb8405f5f972bc792b696da4
2020-12-03 14:54:31 +00:00
Weng Su
96af1674f8
[Provider Model] Add Airplane-safe networks slice
...
- Hide slice when Airplane Mode is off
- Show slice when Airplane Mode is on
- Show "View airplane-safe networks" when Wi-Fi is disabled
- Show "Turn off Airplane Mode" when Wi-Fi is enabled
- Tap "View airplane-safe networks" will set Wi-Fi enabled
- Tap "Turn off Airplane Mode" will set airplane Mode off
- Plan to update the slice to Button style in next cl
- Screenshot
https://screenshot.googleplex.com/7wHoqvTjaScHXVm
Bug: 173413889
Test:
- atest -c AirplaneSafeNetworksSliceTest
- adb shell am start -a
android.settings.panel.action.INTERNET_CONNECTIVITY
Change-Id: Idcd70348728db2da91582697aaeb4bbf4da117c6
2020-12-03 13:29:56 +00:00