Edgar Wang
890fc578f8
Merge "Correct confirm message in Reset options -> Erase all data(factory rest)" into rvc-dev am: d981e24705
...
Change-Id: If1815f491e3824dfe75e2e677a4effbddb7f73fe
2020-03-27 05:53:21 +00:00
Edgar Wang
d981e24705
Merge "Correct confirm message in Reset options -> Erase all data(factory rest)" into rvc-dev
2020-03-27 05:40:33 +00:00
Stanley Wang
06cecd534b
Merge "Fix security issue for using mock location without permission." into qt-qpr1-dev am: 0b76ef19b5
am: b97e3163de
...
Change-Id: Ic0ed3b423535e29aa54bbe89779ca46e1529f2c6
2020-03-27 03:29:19 +00:00
TreeHugger Robot
35adcca607
Merge "Update customize button title when state changed" into rvc-dev am: b11a46cfd5
...
Change-Id: Ida02e3e49ab0210d8494d6e919b5048895f1eae0
2020-03-27 03:28:47 +00:00
Stanley Wang
b97e3163de
Merge "Fix security issue for using mock location without permission." into qt-qpr1-dev am: 0b76ef19b5
...
Change-Id: I033881dc09b05940f3bf5915de8df09e7c4f762c
2020-03-27 03:20:50 +00:00
TreeHugger Robot
b11a46cfd5
Merge "Update customize button title when state changed" into rvc-dev
2020-03-27 03:17:25 +00:00
Stanley Wang
0b76ef19b5
Merge "Fix security issue for using mock location without permission." into qt-qpr1-dev
2020-03-27 03:09:09 +00:00
Philip P. Moltmann
e7466934b7
Merge "Only check op in Settings UI" into rvc-dev am: 1e812204e4
...
Change-Id: I3a36b7b0561cb630c115e000294e32fe378a94a1
2020-03-27 00:47:23 +00:00
Xiangyu/Malcolm Chen
0e4d8aa531
Merge "Show footer to notify user no 5G in DSDS mode." into rvc-dev am: b0a5905d08
...
Change-Id: Id7cec642292dab8ec19bb33ab8247d7f3b0d2865
2020-03-27 00:44:30 +00:00
Philip P. Moltmann
1e812204e4
Merge "Only check op in Settings UI" into rvc-dev
2020-03-27 00:25:38 +00:00
Xiangyu/Malcolm Chen
b0a5905d08
Merge "Show footer to notify user no 5G in DSDS mode." into rvc-dev
2020-03-27 00:24:23 +00:00
TreeHugger Robot
908fff9099
Merge "DND Bypassing Apps redesign" into rvc-dev am: 7440bf7034
...
Change-Id: Ibc83796466da9e39440c205d47ba059b4908175f
2020-03-26 21:06:30 +00:00
TreeHugger Robot
7440bf7034
Merge "DND Bypassing Apps redesign" into rvc-dev
2020-03-26 20:54:33 +00:00
Malcolm Chen
b5e7565175
Show footer to notify user no 5G in DSDS mode.
...
Bug: 151657272
Test: manual and robotests
Change-Id: I5df95528aae12b43a15389b8048f14d9508272f3
2020-03-26 10:31:42 -07:00
Beverly
f707950ee7
DND Bypassing Apps redesign
...
- Add link in DND Conversations Page to the overall conversations list
Settings page
- Add custom_rule xml pages for custom schedule rule settings for
messages and calls (so the UI is the same as before the message/calls
redesign)
- Change app exceptions to display apps with subtext indicating which
notitfication channels are allowed to bypass dnd (previously, would
display each channel individually)
- Add individual AppBypassDnd channel pages where users can decide which
channels will bypass DND for an app on a single page
(AppChannelsBypassingDndSettings)
- Only remove dnd bypassing apps preferences from the preference list if the list changed,
else just update the preference itself to avoid the list from flashing
Test: make RunSettingsRoboTests7
Bug: 151845457
Change-Id: If12d8921e1405aefb1066acc2ef5c55d216fe47a
2020-03-26 16:49:17 +00:00
TreeHugger Robot
6b37d4d4f1
Merge "[Wi-Fi] Refactor AddAppNetworksFragment to use WifiEntry but not AccessPoint." into rvc-dev am: 6f16992d3c
...
Change-Id: I8e2d6cf302840e650f19caf6290f49542bcdd5f0
2020-03-26 15:05:36 +00:00
TreeHugger Robot
6f16992d3c
Merge "[Wi-Fi] Refactor AddAppNetworksFragment to use WifiEntry but not AccessPoint." into rvc-dev
2020-03-26 14:57:44 +00:00
Alex Johnston
47415a0a45
Merge "Retain FRP data when FR is invoked in Settings" into rvc-dev am: 7bc50ac2ef
...
Change-Id: Ib57653e7b2937b6375b2aa287622a900083e723c
2020-03-26 13:19:43 +00:00
Alex Johnston
7bc50ac2ef
Merge "Retain FRP data when FR is invoked in Settings" into rvc-dev
2020-03-26 12:58:49 +00:00
TreeHugger Robot
6b754f1582
Merge "Add unit tests for policy transparency on Fact Auth settings" into rvc-dev am: cb90ffafbb
...
Change-Id: Iab2416e3b76b379674fc9e834a192ecf42521f0d
2020-03-26 12:01:04 +00:00
govenliu
0fc956bc57
[Wi-Fi] Refactor AddAppNetworksFragment to use WifiEntry but not AccessPoint.
...
Because WifiTracker2 refactoring in framework side is done, Settings App need to refactor AddAppNetworksFragment to use WifiEntry but not AccessPoint.
Bug: 152454787
Test: make RunSettingsRoboTests ROBOTEST_FILTER=AddAppNetworksFragmentTest
Change-Id: Ica2fb7e7fcac112140e5d64f3e4193222c974352
2020-03-26 19:48:51 +08:00
TreeHugger Robot
cb90ffafbb
Merge "Add unit tests for policy transparency on Fact Auth settings" into rvc-dev
2020-03-26 11:47:07 +00:00
Treehugger Robot
818a2050f5
[automerger skipped] Merge "Verify BluetoothDevice is not null before calling BluetoothHearingAid System APIs" am: 1ed4e81385
am: 533c10f747
-s ours
...
am skip reason: Change-Id Ic6de2ccd81dc66ce79afcd91f18e92e959c8b12b with SHA-1 5bce75f0fb
is in history
Change-Id: I61e7864306d785ca4553e779bb7fe65fd5f317c9
2020-03-26 10:41:05 +00:00
Alex Johnston
74260a733f
Retain FRP data when FR is invoked in Settings
...
* If the device is an organization-owned managed
profile device and a FRP policy is set, the
factory reset protection data is no longer
erased from factory reset in Settings.
Bug: 148847767
Test: manual testing
Change-Id: Iebaf2446f23626b24db37f5173dc77f9dee25ba9
2020-03-26 10:29:52 +00:00
Treehugger Robot
533c10f747
Merge "Verify BluetoothDevice is not null before calling BluetoothHearingAid System APIs" am: 1ed4e81385
...
Change-Id: I3ab6b4458babf1bfd43c89fb74ae451cf05f9022
2020-03-26 10:25:32 +00:00
Treehugger Robot
1ed4e81385
Merge "Verify BluetoothDevice is not null before calling BluetoothHearingAid System APIs"
2020-03-26 10:07:30 +00:00
Bonian Chen
e8bfc75f22
Merge "[Settings] Change the restart policy for MobileNetworkActivity" into rvc-dev am: fbe5a997d3
...
Change-Id: Ie50623f8d49b5acd37b872f65033f34376125a69
2020-03-26 09:53:59 +00:00
Jason Chiu
5299084eb6
Merge "Add metric logs for special cases in Display and Battery page" into rvc-dev am: 1a9e99b2b1
...
Change-Id: I4b61b4e0ff2f1bbc4bc99597e099cf254f16cb88
2020-03-26 09:53:51 +00:00
Bonian Chen
fbe5a997d3
Merge "[Settings] Change the restart policy for MobileNetworkActivity" into rvc-dev
2020-03-26 09:47:54 +00:00
Jason Chiu
1a9e99b2b1
Merge "Add metric logs for special cases in Display and Battery page" into rvc-dev
2020-03-26 09:47:18 +00:00
Bonian Chen
d412e06c39
[Settings] Change the restart policy for MobileNetworkActivity
...
Prevent recreating the fragment in MobileNetworkActivity when the
subId is the same.
Bug: 141833767
Test: m RunSettingsRoboTests -j ROBOTEST_FILTER=MobileNetworkActivityTest
Change-Id: I8167781fb462efa310a5d6bac76d880dbc9b6bfc
2020-03-26 17:44:17 +08:00
Alex Johnston
573a22387b
Merge "Fix keyboard overlap in work challenge landscape view" into rvc-dev am: a9bd149983
...
Change-Id: I007ef55417cf0e0bb6ec95a1fc67beb4afc2ad78
2020-03-26 09:42:20 +00:00
Menghan Li
cabc215a21
Merge "Remove the setSelectable() in ShortcutPrefrence" into rvc-dev am: b751a12a1c
...
Change-Id: Ia62fdeb9f02129c3f22c0e4be581ce46e1bf6ff4
2020-03-26 09:42:11 +00:00
Alex Johnston
a9bd149983
Merge "Fix keyboard overlap in work challenge landscape view" into rvc-dev
2020-03-26 09:40:20 +00:00
Menghan Li
b751a12a1c
Merge "Remove the setSelectable() in ShortcutPrefrence" into rvc-dev
2020-03-26 09:32:14 +00:00
Arc Wang
f6fe32971f
Merge "Disable metered preference in details page if unable to change" into rvc-dev am: bfcb8058ab
...
Change-Id: Ic5a663d485d0660bed0451a4aec31f46527c8bf5
2020-03-26 08:42:58 +00:00
Arc Wang
bfcb8058ab
Merge "Disable metered preference in details page if unable to change" into rvc-dev
2020-03-26 08:33:39 +00:00
menghanli
250e54cdab
Remove the setSelectable() in ShortcutPrefrence
...
- The title is grey color, not black color as excepted
- The voice access issue is fixed by holder.itemView.setFocusable
Bug: 148989269
Test: manual test
Change-Id: Ie0d8a48cd87e0e28b2833641de265751f2fcfb8c
2020-03-26 06:08:31 +00:00
TreeHugger Robot
fee338d8a1
Merge "[Wi-Fi] Remove @Ignore unit tests" into rvc-dev am: ef84083712
...
Change-Id: I02996d3ae6179cc37409d79134139fbed4798ccf
2020-03-26 05:21:10 +00:00
TreeHugger Robot
ef84083712
Merge "[Wi-Fi] Remove @Ignore unit tests" into rvc-dev
2020-03-26 05:03:03 +00:00
Jason Chiu
26343b82ee
Add metric logs for special cases in Display and Battery page
...
Bug: 137559984
Test: robotest
Change-Id: I60f6237ac2c533306879f46ee4c25d54002cf0e9
2020-03-26 11:31:39 +08:00
Arc Wang
9e06b953fb
Merge "[Wi-Fi] Fix unit test ssidPref_isSubscription_show" into rvc-dev am: b3c16d5d4f
...
Change-Id: I1473a6583f392f6bfcb9da85a3335e0be6cb3406
2020-03-26 03:19:48 +00:00
Arc Wang
249f629b22
[Wi-Fi] Remove @Ignore unit tests
...
Remove @Ignore in these objects:
ConfigureWifiSettingsTest
TetherServiceTest.java
WifiTetherSecurityPreferenceControllerTest.java
WifiSettings2Test
Bug: 151696220
Test: make RunSettingsRoboTests -j ROBOTEST_FILTER=com.android.settings.wifi
Change-Id: I19bdc251d76161218454c1b5f58421efab33cec0
2020-03-26 11:18:27 +08:00
Arc Wang
b3c16d5d4f
Merge "[Wi-Fi] Fix unit test ssidPref_isSubscription_show" into rvc-dev
2020-03-26 03:07:33 +00:00
hughchen
bc5f2fad33
Update customize button title when state changed
...
- This CL update customize button title when
onCustomizedButtonStateChanged() is called.
- Add test case
Bug: 152002708
Test: make -j42 RunSettingsRoboTests
Change-Id: I85c9cf90305757e279c058db2875e303b4add437
2020-03-26 10:40:16 +08:00
Quang Luong
b9b09b0474
Disable metered preference in details page if unable to change
...
Wifi networks that cannot change their metered preference (such as
suggested networks) should have their metered preference in the network
details page greyed out and unselectable.
Bug: 151159939
Test: manual - build and visual verification
Change-Id: I8507cd6f39bed5e32884fbf667dffb3f330d8b56
2020-03-25 17:31:44 -07:00
TreeHugger Robot
bf13b7193b
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 0747e57f25
-s ours
...
am skip reason: subject contains skip directive
Change-Id: Ia910d27ca3d2630116a6a2e506e938e308af58c2
2020-03-26 00:04:16 +00:00
TreeHugger Robot
0747e57f25
Merge "Import translations. DO NOT MERGE" into rvc-dev
2020-03-25 23:47:17 +00:00
Rahul Sabnis
86cfb387ef
Verify BluetoothDevice is not null before calling BluetoothHearingAid
...
System APIs
Bug: 149238489
Test: Manual
Merged-In: Ic6de2ccd81dc66ce79afcd91f18e92e959c8b12b
Change-Id: Ic6de2ccd81dc66ce79afcd91f18e92e959c8b12b
2020-03-25 13:57:29 -07:00
TreeHugger Robot
ef7f5eb1e0
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 34f2281e5a
-s ours
...
am skip reason: subject contains skip directive
Change-Id: I9eef91e1bbfc759859ab74263f3cdce63b90765e
2020-03-25 20:45:54 +00:00