Commit Graph

61229 Commits

Author SHA1 Message Date
Alex Johnston
1f95535ead Merge "Retain FRP data when FR is invoked in Settings" into rvc-dev am: 7bc50ac2ef am: bbd65ff983
Change-Id: I9345f04b8ca27b370abd74e460e8f63b04b11888
2020-03-26 13:38:56 +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
7bc50ac2ef Merge "Retain FRP data when FR is invoked in Settings" into rvc-dev 2020-03-26 12:58:49 +00:00
TreeHugger Robot
b3721664fb Merge "Add unit tests for policy transparency on Fact Auth settings" into rvc-dev am: cb90ffafbb am: 706a7f19c2 am: 0a6e14020a
Change-Id: If511a167927c7fd19e7a6bd282b5c3c01b813177
2020-03-26 12:20:39 +00:00
TreeHugger Robot
0a6e14020a Merge "Add unit tests for policy transparency on Fact Auth settings" into rvc-dev am: cb90ffafbb am: 706a7f19c2
Change-Id: Iee2744338f3f022e8c56a1e548443bd6f055e136
2020-03-26 12:13:28 +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
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
Bonian Chen
c28f3e7ac0 Merge "[Settings] Change the restart policy for MobileNetworkActivity" into rvc-dev am: fbe5a997d3 am: ada7e519fd am: 10db7d421b
Change-Id: I93ab595816d0f4ff04da81b3b4563bc92ff71365
2020-03-26 10:24:37 +00:00
Jason Chiu
bdf001ac9c Merge "Add metric logs for special cases in Display and Battery page" into rvc-dev am: 1a9e99b2b1 am: 920924f5fe am: defd3892ce
Change-Id: Ib6ae8f9e79a709c50748381f4e599328df0de2f2
2020-03-26 10:24:27 +00:00
Alex Johnston
8d5a0d9e65 Merge "Fix keyboard overlap in work challenge landscape view" into rvc-dev am: a9bd149983 am: 5ccaa7e741 am: 8f02175692
Change-Id: Iaf224c87649b15d69a88a8f03be3371270d7a67f
2020-03-26 10:24:16 +00:00
Menghan Li
0793221e42 Merge "Remove the setSelectable() in ShortcutPrefrence" into rvc-dev am: b751a12a1c am: cfbd58ecc6 am: 6292c9bb58
Change-Id: Ie873d921878d46933321356d3f83bbb005dac99a
2020-03-26 10:24:03 +00:00
Bonian Chen
10db7d421b Merge "[Settings] Change the restart policy for MobileNetworkActivity" into rvc-dev am: fbe5a997d3 am: ada7e519fd
Change-Id: I849faf4ef5cc71dafdb04f1c06dac8bd91f33c57
2020-03-26 09:59:17 +00:00
Jason Chiu
defd3892ce Merge "Add metric logs for special cases in Display and Battery page" into rvc-dev am: 1a9e99b2b1 am: 920924f5fe
Change-Id: Ia494aa972af088cc2d77091ace9408e79ac6f1d5
2020-03-26 09:59:08 +00:00
Alex Johnston
8f02175692 Merge "Fix keyboard overlap in work challenge landscape view" into rvc-dev am: a9bd149983 am: 5ccaa7e741
Change-Id: I52dbe23cbaf8f9b854e16f0e0b540eb8bb193987
2020-03-26 09:59:03 +00:00
Menghan Li
6292c9bb58 Merge "Remove the setSelectable() in ShortcutPrefrence" into rvc-dev am: b751a12a1c am: cfbd58ecc6
Change-Id: Id412d26d34fa35efea678ab1d7b89c18c4fe770b
2020-03-26 09:58:57 +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
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
e919405e1d Merge "Disable metered preference in details page if unable to change" into rvc-dev am: bfcb8058ab am: a5852f43db am: bf73fdc64a
Change-Id: I99c1eb5d132302d8e9bb445b3b85c791f284bc88
2020-03-26 09:19:14 +00:00
Arc Wang
bf73fdc64a Merge "Disable metered preference in details page if unable to change" into rvc-dev am: bfcb8058ab am: a5852f43db
Change-Id: I3e9efe2798de0f02f5dcafdad82ed889966236ec
2020-03-26 09:05:46 +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
6ff9a84398 Merge "[Wi-Fi] Remove @Ignore unit tests" into rvc-dev am: ef84083712 am: 0dcef519de am: fcc478c8af
Change-Id: I3a2f104232744842fb8da18d0749710954dac4eb
2020-03-26 05:50:38 +00:00
TreeHugger Robot
fcc478c8af Merge "[Wi-Fi] Remove @Ignore unit tests" into rvc-dev am: ef84083712 am: 0dcef519de
Change-Id: I15f3d766f13866805c5cf0bb70c12b6a0a45236b
2020-03-26 05:32:28 +00:00
TreeHugger Robot
0dcef519de Merge "[Wi-Fi] Remove @Ignore unit tests" into rvc-dev am: ef84083712
Change-Id: Ia0a0b185195ac6710b24ff2d4a0e7673bb2b2a58
2020-03-26 05:21:16 +00:00
TreeHugger Robot
ef84083712 Merge "[Wi-Fi] Remove @Ignore unit tests" into rvc-dev 2020-03-26 05:03:03 +00:00
menghanli
c544ca53aa Revise Q behavior migration of accessibility edit dialog
Bug: 152455216
Test: manual test
Change-Id: Iacb73b23f72d9d58c858f8d7dc6abc472140985c
2020-03-26 04:06:22 +00:00
Arc Wang
12b662c34b Merge "[Wi-Fi] Fix unit test ssidPref_isSubscription_show" into rvc-dev am: b3c16d5d4f am: 45aa81bc52 am: f0715dfcbd
Change-Id: I802469ae67afe53622f6d4156f69bd1dd8437eae
2020-03-26 03:51:34 +00:00
Arc Wang
f0715dfcbd Merge "[Wi-Fi] Fix unit test ssidPref_isSubscription_show" into rvc-dev am: b3c16d5d4f am: 45aa81bc52
Change-Id: Ib1b34a836fcd02b625270d2603c2599e09dd1f8d
2020-03-26 03:35:57 +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
45aa81bc52 Merge "[Wi-Fi] Fix unit test ssidPref_isSubscription_show" into rvc-dev am: b3c16d5d4f
Change-Id: I6eb5c0ff3e8a2ee6081e501530bffaa43f7ccb8f
2020-03-26 03:19:34 +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
TreeHugger Robot
3b57d68796 [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 0747e57f25 -s ours am: 7b0240898e -s ours am: c7e9a41c3d -s ours
am skip reason: subject contains skip directive

Change-Id: I0b9182bf1b8283e9370c35cfd93f1af74de19617
2020-03-26 00:33:31 +00: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
c7e9a41c3d [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 0747e57f25 -s ours am: 7b0240898e -s ours
am skip reason: subject contains skip directive

Change-Id: I2b66b94bfbc19e8efb5b28b643ce939aff284d5b
2020-03-26 00:18:05 +00:00
TreeHugger Robot
7b0240898e [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 0747e57f25 -s ours
am skip reason: subject contains skip directive

Change-Id: I5b9ba04e3c149c1162acd9dba49ee1f64d694e0a
2020-03-26 00:03:19 +00:00
TreeHugger Robot
0747e57f25 Merge "Import translations. DO NOT MERGE" into rvc-dev 2020-03-25 23:47:17 +00:00
TreeHugger Robot
dfb13c2478 [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 34f2281e5a -s ours am: 368377efac -s ours am: 0d880d89ae -s ours
am skip reason: subject contains skip directive

Change-Id: If3460d6dac327cea23656c6e884cd02dde79c27d
2020-03-25 21:08:16 +00:00
TreeHugger Robot
0d880d89ae [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 34f2281e5a -s ours am: 368377efac -s ours
am skip reason: subject contains skip directive

Change-Id: I51c621b5358eb5bd4514ba31cbf896aad0e8544e
2020-03-25 20:56:21 +00:00