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
Automerger Merge Worker
04be843ab3
Merge "Merge "Retain FRP data when FR is invoked in Settings" into rvc-dev am: 7bc50ac2ef am: 47415a0a45" into rvc-d1-dev-plus-aosp
2020-03-26 13:39:05 +00:00
Alex Johnston
ff02f246c9
Merge "Retain FRP data when FR is invoked in Settings" into rvc-dev am: 7bc50ac2ef am: 47415a0a45
...
Change-Id: I7ad8727e62802411caea66fab8e81decd6878abb
2020-03-26 13:39:00 +00:00
Alex Johnston
cf38af6de6
Merge "Retain FRP data when FR is invoked in Settings" into rvc-dev am: 7bc50ac2ef am: bbd65ff983
...
Change-Id: Ic438fc8b8ba8a62cb718f18a5edb83066f132efe
2020-03-26 13:38:54 +00:00
Alex Johnston
bbd65ff983
Merge "Retain FRP data when FR is invoked in Settings" into rvc-dev am: 7bc50ac2ef
...
Change-Id: I259abdec68097485aa875e802a3e39b6098fba9c
2020-03-26 13:19:57 +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
Tobias Thierer
a854ddae3d
OWNERS: Remove tobiast.
...
Test: Manual CL review only.
Bug: 152399425
Change-Id: Ifca2d6e8ecd59a924c6e5d8ca60749be5d5c8728
2020-03-26 12:17:00 +00:00
TreeHugger Robot
52c1c77d93
Merge "Add unit tests for policy transparency on Fact Auth settings" into rvc-dev am: cb90ffafbb am: 6b754f1582
...
Change-Id: I99769d190e98a66a89c6716191384e4ae0fb4a6e
2020-03-26 12:13:27 +00:00
TreeHugger Robot
c228661d69
Merge "Add unit tests for policy transparency on Fact Auth settings" into rvc-dev am: cb90ffafbb am: 706a7f19c2
...
Change-Id: Ieb74e58728260f1b4e0a0d064e4d2e6062cd6c52
2020-03-26 12:13:17 +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
TreeHugger Robot
706a7f19c2
Merge "Add unit tests for policy transparency on Fact Auth settings" into rvc-dev am: cb90ffafbb
...
Change-Id: I42908a919e7d1e5cf3730a3be9ed5005f3dc29a8
2020-03-26 12:00:53 +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
4f6b63056c
[automerger skipped] Merge "Verify BluetoothDevice is not null before calling BluetoothHearingAid System APIs" am: 1ed4e81385 am: 533c10f747 -s ours am: 818a2050f5 -s ours
...
am skip reason: Change-Id Ic6de2ccd81dc66ce79afcd91f18e92e959c8b12b with SHA-1 5bce75f0fb
2020-03-26 10:55:21 +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
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
6e7dcb8d97
Merge "[Settings] Change the restart policy for MobileNetworkActivity" into rvc-dev am: fbe5a997d3 am: e8bfc75f22
...
Change-Id: If9a3e39059d46f75d422e98799177c786513e1da
2020-03-26 09:59:29 +00:00
Jason Chiu
321061ca3f
Merge "Add metric logs for special cases in Display and Battery page" into rvc-dev am: 1a9e99b2b1 am: 5299084eb6
...
Change-Id: I5984c063934b324c9096c9774ff333b8000acc74
2020-03-26 09:59:21 +00:00
Bonian Chen
f63423f5da
Merge "[Settings] Change the restart policy for MobileNetworkActivity" into rvc-dev am: fbe5a997d3 am: ada7e519fd
...
Change-Id: I5d88ede47c721d2db2521477631ee87ec02922c5
2020-03-26 09:59:10 +00:00
Automerger Merge Worker
7fed1961e4
Merge "Merge "Fix keyboard overlap in work challenge landscape view" into rvc-dev am: a9bd149983 am: 573a22387b" into rvc-d1-dev-plus-aosp
2020-03-26 09:59:08 +00:00
Automerger Merge Worker
6217097f81
Merge "Merge "Add metric logs for special cases in Display and Battery page" into rvc-dev am: 1a9e99b2b1 am: 920924f5fe" into rvc-d1-dev-plus-aosp
2020-03-26 09:59:07 +00:00
Alex Johnston
6fd8b1ee7b
Merge "Fix keyboard overlap in work challenge landscape view" into rvc-dev am: a9bd149983 am: 573a22387b
...
Change-Id: Ie1c74100280e00a7926d963ed84aef8349e70d06
2020-03-26 09:59:04 +00:00
Jason Chiu
436fd363a2
Merge "Add metric logs for special cases in Display and Battery page" into rvc-dev am: 1a9e99b2b1 am: 920924f5fe
...
Change-Id: Id7aeee1a04db2574632d676bcbba972734ca4cb2
2020-03-26 09:59:00 +00:00
Automerger Merge Worker
e3d76788f7
Merge "Merge "Remove the setSelectable() in ShortcutPrefrence" into rvc-dev am: b751a12a1c am: cabc215a21" into rvc-d1-dev-plus-aosp
2020-03-26 09:58:59 +00:00
Menghan Li
1c33b0298e
Merge "Remove the setSelectable() in ShortcutPrefrence" into rvc-dev am: b751a12a1c am: cabc215a21
...
Change-Id: Ia26e16bbe00299699a71ad1a7876205f743d8313
2020-03-26 09:58:57 +00:00
Alex Johnston
f44f0fba0e
Merge "Fix keyboard overlap in work challenge landscape view" into rvc-dev am: a9bd149983 am: 5ccaa7e741
...
Change-Id: If4b06927cdf811b370ed50159578c1c243339042
2020-03-26 09:58:53 +00:00
Menghan Li
b8d0e246ca
Merge "Remove the setSelectable() in ShortcutPrefrence" into rvc-dev am: b751a12a1c am: cfbd58ecc6
...
Change-Id: If08f487a59f18220deedbb2b6433e9580c444850
2020-03-26 09:58:43 +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
ada7e519fd
Merge "[Settings] Change the restart policy for MobileNetworkActivity" into rvc-dev am: fbe5a997d3
...
Change-Id: Ibb1ccf9625f7aa7d644bd5f4071068af007507ec
2020-03-26 09:53:41 +00:00
Jason Chiu
920924f5fe
Merge "Add metric logs for special cases in Display and Battery page" into rvc-dev am: 1a9e99b2b1
...
Change-Id: Ib03b1c15256365b1b18f3d0b76e4d567fb3880d0
2020-03-26 09:53:28 +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
5ccaa7e741
Merge "Fix keyboard overlap in work challenge landscape view" into rvc-dev am: a9bd149983
...
Change-Id: Ieeff9f5cd40716539fc9d13fb81701d1bcd7b3d9
2020-03-26 09:42:05 +00:00
Menghan Li
cfbd58ecc6
Merge "Remove the setSelectable() in ShortcutPrefrence" into rvc-dev am: b751a12a1c
...
Change-Id: I7656da884d4d656b7d4cba9b12bcf017b3e5edcb
2020-03-26 09:41:57 +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
b81a72522e
Merge "Disable metered preference in details page if unable to change" into rvc-dev am: bfcb8058ab am: a5852f43db
...
Change-Id: If56aafde70b9e77ffbe360c540aed4aecf5eeec8
2020-03-26 09:06:21 +00:00
Arc Wang
ea10d71cee
Merge "Disable metered preference in details page if unable to change" into rvc-dev am: bfcb8058ab am: f6fe32971f
...
Change-Id: I7142c068dec1fefc46df6bf8236f883f378c5523
2020-03-26 09:05:48 +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
a5852f43db
Merge "Disable metered preference in details page if unable to change" into rvc-dev am: bfcb8058ab
...
Change-Id: I26626866efd6779ef17964b0efff32f2b36bd84b
2020-03-26 08:42:47 +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
e8a39aef59
Merge "[Wi-Fi] Remove @Ignore unit tests" into rvc-dev am: ef84083712 am: fee338d8a1
...
Change-Id: I15995e42123cfa45a0d4f43da202d7f8734b0977
2020-03-26 05:32:23 +00:00
