Adrian Roos
f11a6ddaf2
Revert "Merge "Update Utils#getTetheringLabel usage on Settings" am: 2b1e3a971f am: ddf3efb070 am: 8c38e9543e" am: d99faa25c0
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13754174
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Iaae85597ea364bab628f8fce9230d7887c4f6466
2021-03-03 15:39:29 +00:00
Adrian Roos
d99faa25c0
Revert "Merge "Update Utils#getTetheringLabel usage on Settings" am: 2b1e3a971f am: ddf3efb070 am: 8c38e9543e"
...
This reverts commit 0df55e1eb4 .
Reason for revert: Other CLs in topic were skipped, but this one wasn't, which broke sc-dev.
Change-Id: Icf61dae071416381ea11cbe74cd92ae934c3047e
2021-03-03 14:51:42 +00:00
Paul Hu
d41839e69e
Merge "Update Utils#getTetheringLabel usage on Settings" am: 2b1e3a971f am: ddf3efb070 am: 8c38e9543e am: 0df55e1eb4
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1601653
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I49005966712f2d6aee155375546ae5554aa6bce1
2021-03-03 13:38:25 +00:00
Paul Hu
0df55e1eb4
Merge "Update Utils#getTetheringLabel usage on Settings" am: 2b1e3a971f am: ddf3efb070 am: 8c38e9543e
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1601653
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I4332292590088a0453cd7cfa2dc66f775e2d79dd
2021-03-03 13:27:16 +00:00
TreeHugger Robot
551319a151
Merge "Return RESULT_OK RequestManageCredentials" into sc-dev am: 42ac293a53
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13754167
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ibe97019bc21e9c44a97b57d61da05091d4de790d
2021-03-03 13:03:35 +00:00
TreeHugger Robot
10c997f5bb
Merge "Refactor Usb settings" into sc-dev am: decaeda453
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13736527
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ibb5da138a1dbdd6fde3daf48c2a4de0988505297
2021-03-03 13:03:27 +00:00
TreeHugger Robot
42ac293a53
Merge "Return RESULT_OK RequestManageCredentials" into sc-dev
2021-03-03 12:43:13 +00:00
TreeHugger Robot
decaeda453
Merge "Refactor Usb settings" into sc-dev
2021-03-03 12:12:24 +00:00
Alex Johnston
c82767f627
Return RESULT_OK RequestManageCredentials
...
Bug: 177979648
Test: Manual testing
Change-Id: I3b4968131f8c7b811752704808d0ef4df617a658
2021-03-03 11:30:46 +00:00
TreeHugger Robot
65046b06a3
Merge "[Fix]Test cast fail at BaseBluetoothDialogPreferenceTest" into sc-dev am: d1718c3a15
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13746319
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I0bfb4405902d4a11100a8302345b23468637f7c2
2021-03-03 10:54:49 +00:00
Thiebaud Weksteen
7e310adec6
Merge "Add summary for 2G toggle option" into sc-dev am: c1110efc19
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13740891
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Iee2648d4cd5487fbc8ef647802c861140ae1f79b
2021-03-03 10:53:30 +00:00
Hugh Chen
0091ae6142
Refactor Usb settings
...
1. Rename ShouldIgnoreClickEvent() to isClickEventIgnored().
2. Use TetheringManager instead of ConnectivityManager.
Bug: 175651578
Test: make -j42 RunSettingsRoboTests
Change-Id: I37c49694257b7575550b5a905e293b5d056ba1bf
2021-03-03 18:13:17 +08:00
TreeHugger Robot
d1718c3a15
Merge "[Fix]Test cast fail at BaseBluetoothDialogPreferenceTest" into sc-dev
2021-03-03 10:10:41 +00:00
Thiebaud Weksteen
c1110efc19
Merge "Add summary for 2G toggle option" into sc-dev
2021-03-03 09:23:49 +00:00
Tim Peng
d6eb5237e2
[Fix]Test cast fail at BaseBluetoothDialogPreferenceTest
...
Bug: 181740451
Test: make -j50 RunSettingsRoboTests
Change-Id: I8b786272f50680e9e388ca64bb8d3410b85b327a
2021-03-03 17:02:07 +08:00
Paul Hu
8c38e9543e
Merge "Update Utils#getTetheringLabel usage on Settings" am: 2b1e3a971f am: ddf3efb070
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1601653
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Iccd3b694b9e9f4ac1658093923c923a98d83ccfb
2021-03-03 08:07:19 +00:00
Sally Yuen
bd7a6cc05e
Merge "[Reduce Bright Colors] Add labels to intensity slider" into sc-dev am: aaff760df0
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13501303
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I081571447b34652fffc03f5eba756c6d88db2a8f
2021-03-03 03:23:10 +00:00
Sally Yuen
aaff760df0
Merge "[Reduce Bright Colors] Add labels to intensity slider" into sc-dev
2021-03-03 03:03:35 +00:00
Minche Li
d8b3c23f77
Merge "Hides the settings entry in Magnification Settings if device is not supported" into sc-dev am: ecf1c07e63
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13732407
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I8f08f51b0ff9df1ef9a1b4c609155fdd102cef80
2021-03-03 03:00:54 +00:00
Paul Hu
ddf3efb070
Merge "Update Utils#getTetheringLabel usage on Settings" am: 2b1e3a971f
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1601653
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I51b526d575a540cfb7ab6cef8be5d096f3660728
2021-03-03 02:59:37 +00:00
Minche Li
ecf1c07e63
Merge "Hides the settings entry in Magnification Settings if device is not supported" into sc-dev
2021-03-03 02:24:09 +00:00
Paul Hu
2b1e3a971f
Merge "Update Utils#getTetheringLabel usage on Settings"
2021-03-03 02:15:22 +00:00
Sudheer Shanka
303438ea68
Merge "Update DataSaverBackend to use NetworkPolicyManager.Listener." am: 90f59be59a am: bf29c73cb7 am: 1e04fd7a05 am: 521bf40280
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1612821
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I644594be3f6bb7d402ba6ba60b549624a1457110
2021-03-03 01:15:46 +00:00
Sudheer Shanka
521bf40280
Merge "Update DataSaverBackend to use NetworkPolicyManager.Listener." am: 90f59be59a am: bf29c73cb7 am: 1e04fd7a05
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1612821
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I2aac37f3686f6d46e3cace0dcbd0c4a4886e1cfb
2021-03-03 00:36:23 +00:00
Bonian Chen
d929097128
Merge "[Settings] Only display backup calling when more than 1 SIM" into sc-dev am: 3f211d4c64
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13715532
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Idbaa1dae43d694a447761f46d3f48dd255e1b50d
2021-03-03 00:18:58 +00:00
Sudheer Shanka
1e04fd7a05
Merge "Update DataSaverBackend to use NetworkPolicyManager.Listener." am: 90f59be59a am: bf29c73cb7
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1612821
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I1959ff61fdc91f0006d9eda91ccde6917025e07c
2021-03-02 23:54:36 +00:00
Bonian Chen
3f211d4c64
Merge "[Settings] Only display backup calling when more than 1 SIM" into sc-dev
2021-03-02 23:19:24 +00:00
Sudheer Shanka
bf29c73cb7
Merge "Update DataSaverBackend to use NetworkPolicyManager.Listener." am: 90f59be59a
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1612821
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Iac6d23d86624419bc716c70a4150090e907928b7
2021-03-02 23:01:32 +00:00
Sudheer Shanka
90f59be59a
Merge "Update DataSaverBackend to use NetworkPolicyManager.Listener."
2021-03-02 21:55:30 +00:00
Treehugger Robot
e696e52fd3
Merge "Wellbeing Package needs to be enabled by default" am: b6dc427c50 am: 9059706e7b am: bfa57a33ee am: 2a6d2e4a2d
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1587086
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I011ebcf279e1efb16399efe6222a63e8f80c7571
2021-03-02 21:05:12 +00:00
Jordan Liu
94ad94e726
Turn off translations for string am: 00f07cf138
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13679745
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I7a459119adba2fa177e2a01d635bcc26d15aa470
2021-03-02 21:04:30 +00:00
Treehugger Robot
2a6d2e4a2d
Merge "Wellbeing Package needs to be enabled by default" am: b6dc427c50 am: 9059706e7b am: bfa57a33ee
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1587086
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ibe6db36fc0039d10f352756b2c8d398a225c6a55
2021-03-02 20:38:41 +00:00
Treehugger Robot
bfa57a33ee
Merge "Wellbeing Package needs to be enabled by default" am: b6dc427c50 am: 9059706e7b
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1587086
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ibd1aa5ea04aa3ff22ece59fe04bc69c7e15385bd
2021-03-02 19:47:20 +00:00
Treehugger Robot
9059706e7b
Merge "Wellbeing Package needs to be enabled by default" am: b6dc427c50
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1587086
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I12e20519ac29f802f9983dcf27f313388b33829c
2021-03-02 19:05:16 +00:00
Sally Yuen
b3d9280c3f
Merge "Call into ColorDisplayManager for RBC slider range" into sc-dev am: 4d5a03da7e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13688354
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I8322e261f22e96fd9e05700f6aff0d90a94628e3
2021-03-02 18:39:46 +00:00
Sally Yuen
d10678e2bf
Merge "[Reduce Bright Colors] reorder preferences" into sc-dev am: 18923596c4
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13501300
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ic68068d76c144c2a622b03aac056a90a42db0140
2021-03-02 18:38:50 +00:00
Jordan Liu
00f07cf138
Turn off translations for string
...
Also move to config.xml and rename config_*.
Bug: 178490564
Test: no behavior change, follow up with testers to make sure manual
test is fixed
Change-Id: Idc1828c936121928e13ecf11f5437c3488f87565
2021-03-02 18:09:47 +00:00
sallyyuen
6a22201c7c
[Reduce Bright Colors] Add labels to intensity slider
...
Test: Manual
Bug: b/128465252
Change-Id: I278aed9a7da552d787c7b5426504f6f429d4d6ab
2021-03-02 09:46:45 -08:00
Sally Yuen
4d5a03da7e
Merge "Call into ColorDisplayManager for RBC slider range" into sc-dev
2021-03-02 17:38:30 +00:00
Sally Yuen
18923596c4
Merge "[Reduce Bright Colors] reorder preferences" into sc-dev
2021-03-02 17:31:15 +00:00
Thiébaud Weksteen
fc593b92c2
Add summary for 2G toggle option
...
Bug: 181667681
Test: build & manually verify toggle text
Change-Id: Ie086b2e3e277b4bfd612bf2a4437e48fa931c1c0
2021-03-02 17:59:17 +01:00
Bonian Chen
a9a411e3df
[Settings] Only display backup calling when more than 1 SIM
...
Backup calling only available when more than 1 SIM available.
Bug: 179802059
Test: on device
Change-Id: I24e5eb9e1a7064c3ea65389fbb00c0ff2a5852ed
2021-03-02 21:14:53 +08:00
Sudheer Shanka
0a476f5f53
Update DataSaverBackend to use NetworkPolicyManager.Listener.
...
This will avoid having to update this every time we
add a new callback.
Test: treehugger
Change-Id: Ic34e3eac87d207eb2ffff7430fdf3b77871ae812
2021-03-02 13:05:43 +00:00
TreeHugger Robot
845a518a04
Merge "Avoid double-badging application icon in the dialog" into sc-dev am: c752d2e25b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13698226
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ie8c1cbb51fe5e4ef06a851f5efc4809e9bafc77f
2021-03-02 09:03:07 +00:00
TreeHugger Robot
c752d2e25b
Merge "Avoid double-badging application icon in the dialog" into sc-dev
2021-03-02 07:57:25 +00:00
TreeHugger Robot
3e6049272e
Merge "Make sucUsePartnerResource configurable" into sc-dev am: 22c45731f5
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13710507
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Iba1a0d39ff8c2163c287da29950dda6061b3cc66
2021-03-02 07:20:44 +00:00
TreeHugger Robot
48c2433c49
Merge "Make Reset Wi-Fi, mobile & bluetooth scrollable" into sc-dev am: 637eeefb53
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13710511
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I97df85bdeacdd0d9032bbef7aa7800e1dc9db736
2021-03-02 07:20:21 +00:00
mincheli
3d41fe560b
Hides the settings entry in Magnification Settings if device is not supported
...
If the device doesn't support magnification area, we should hide the
settings entry in mangification settings
Bug: 177371954
Test: atest ToggleScreenMagnificationPreferenceFragmentTest
Change-Id: I41fc3177f86c6a19e3ef0d2fbe5e052d77c1cb47
2021-03-02 06:56:59 +00:00
TreeHugger Robot
22c45731f5
Merge "Make sucUsePartnerResource configurable" into sc-dev
2021-03-02 06:45:46 +00:00
TreeHugger Robot
637eeefb53
Merge "Make Reset Wi-Fi, mobile & bluetooth scrollable" into sc-dev
2021-03-02 06:17:55 +00:00