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
31505ca0b3
RESTRICT AUTOMERGE am: bfa7a75545
am: d67e22c122
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12998688
Change-Id: I1a046e98511c50641b0fcb42b97233b3fa36e6dd
2020-12-07 16:58:33 +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
Eugene Susla
d67e22c122
RESTRICT AUTOMERGE am: bfa7a75545
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12998688
Change-Id: Id7909dd47451e3fbd02b5ca3ce4643cdd1da6715
2020-12-07 16:44:22 +00:00
Xin Li
07ccb42665
DO NOT MERGE - Merge RQ1A.201205.011
...
Bug: 172690556
Merged-In: I3f7d41c196569c0cb61e89cfc270b957e2f0add5
Change-Id: Id2d9c4f56beae280e6299b6695185577a1521345
2020-12-07 00:39:43 -08:00
Wesley.CW Wang
974f359a26
Add Battery Defender feature to Settings am: 7ccb54feb6
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13108999
Change-Id: I3b172988dd71c520ac6e1d286ae055243cb723e0
2020-12-07 08:29:16 +00:00
TreeHugger Robot
538f5420ac
Merge "Fine tune the icon size for some pages"
2020-12-07 08:14:17 +00:00
Wesley.CW Wang
7ccb54feb6
Add Battery Defender feature to Settings
...
- Adding new tips of Battery Defender, will be presented once battery is overheated
- Launch Help Center article of battery overheat when clicking Battery Defender tip
Screenshots: https://screenshot.googleplex.com/7jUibTJANgR6UQ6.png
https://screenshot.googleplex.com/tUj2LLi87SfndBN.png
Bug: 172794045
Bug: 173497281
Bug: 173496188
Test: make RunSettingsRoboTests -j40
Merged-In: Ibb106a5d42cdf6232abf9ddf4b3225bdcebccf4a
Change-Id: Id400cec248a87dd27194d93bdf035e43bbcb7f4f
2020-12-07 08:06:22 +00:00
Manish Singh
b309d3af6d
Merge "Introduce new preference indicating user control."
2020-12-07 06:50:23 +00:00
TreeHugger Robot
cbbc224e4d
Merge "Fix output switcher will show 2 media sessions in some use cases" into rvc-qpr-dev am: 9ccf19cb9f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13109545
Change-Id: I5f2c4d8549c28d1c91d81b7808183b0c97700dda
2020-12-07 06:47:40 +00:00
TreeHugger Robot
9ccf19cb9f
Merge "Fix output switcher will show 2 media sessions in some use cases" into rvc-qpr-dev
2020-12-07 06:29:43 +00:00
Hugh Chen
d1da284831
Fix output switcher will show 2 media sessions in some use cases
...
Before this CL, we didn't check whether the remote session existed
in the list before. If the priority of a remote session is higher than
a local session, it causes us to return the local session even if
the list has a remote session.
This CL uses a list to cache package names of remote sessions.
If the local session has the same package name of the remote session
then don't return the local session.
Bug: 169052790
Test: make -j42 RunSettingsRoboTests
Change-Id: I2726a3deb397f646e4c74a8c445dde6fafb694a8
Merged-In: I2726a3deb397f646e4c74a8c445dde6fafb694a8
(cherry picked from commit 3a7293cbbf
)
2020-12-07 06:28:52 +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
Xiao Ma
ea12357dfa
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-07 04:54:37 +00:00
Xin Li
c19e729570
DO NOT MERGE - Mark RQ1A.201004.001 as merged am: 835215964f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13176357
Change-Id: I64db73472e9ad6b504a65033d2850cb0863af448
2020-12-07 04:01:20 +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
Xin Li
835215964f
DO NOT MERGE - Mark RQ1A.201004.001 as merged
...
Bug: 172690556
Change-Id: I32dff08f7cea0c4e645c653d1b63945b775b1078
2020-12-06 14:43:21 -08: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
Jiashen Wang
8271561a76
[SIM Dialog Migration] Enable SIM operation dialog in Settings
...
Change Settings to not call SubscriptionManager#setSubscriptionEnabled.
Instead, make Settings call EuiccManager APIs directly.
Design: https://docs.google.com/document/d/1wb5_hoBkZVbkXGNWHbx4Jf61swjfxsJzkytiTzJosYo/edit?usp=sharing
Bug: 160819390
Test: Manually tested eSIM profile enabling.
Change-Id: I56bbcbb9ccb886b0f9249e67c5a6a6444bb7dd45
2020-12-05 21:48:09 -08: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
Jiashen Wang
74614a2865
Fix the dialog presist issue after toggling pSIM
...
Bug: 170507290
Test: Manually tested it.
Change-Id: I202ff83bfa72d998ba70774d1998bc827b1b0c8e
2020-12-04 15:32:06 -08: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