Eric Schwarzenbach
eb5ceb94e4
Change wifi detail buttons to match App buttons.
...
Matches color, size and padding.
Bug: 37252029
Test: manual
Change-Id: Ib0d73d8971eef1ecb234f61fc1bfcf294832e594
2017-07-13 16:13:35 -07:00
TreeHugger Robot
cbedc3f0aa
Merge "Fix failing user settings test cases."
2017-07-13 20:59:24 +00:00
Fan Zhang
538c1347bf
Merge "UI refresh on bluetooth list page" into oc-dr1-dev am: c0ca084622
...
am: 303c330068
-s ours
Change-Id: If546dd6a7e1db80253052692053012f10c85b8f8
2017-07-13 20:37:02 +00:00
Fan Zhang
303c330068
Merge "UI refresh on bluetooth list page" into oc-dr1-dev
...
am: c0ca084622
Change-Id: I92846eec6bcbb67862b8ad1cf6447623a2dc3ab0
2017-07-13 20:17:28 +00:00
TreeHugger Robot
c0ca084622
Merge "UI refresh on bluetooth list page" into oc-dr1-dev
2017-07-13 20:05:25 +00:00
Antony Sargent
27afdf0c26
Merge "Make sure PIN edit control is focused" into oc-dr1-dev am: 61e61d96d1
...
am: d1b5116213
Change-Id: I1df59b4c237b0daff4f5c44a444d35df8cc77cb0
2017-07-13 20:00:37 +00:00
Antony Sargent
d1b5116213
Merge "Make sure PIN edit control is focused" into oc-dr1-dev
...
am: 61e61d96d1
Change-Id: Ib144b0ad110528d4d72fb15c5e463f0b24d5baed
2017-07-13 19:54:27 +00:00
TreeHugger Robot
61e61d96d1
Merge "Make sure PIN edit control is focused" into oc-dr1-dev
2017-07-13 19:41:01 +00:00
Bill Yi
c7c0cfc1ec
Import translations. DO NOT MERGE am: 76a81a9803
-s ours
...
am: cc6a61a958
-s ours
Change-Id: Ib1cd100a921d6f2f4a9dae2dca59b6e974218e03
2017-07-13 19:04:42 +00:00
Doris Ling
83327ec2ab
Fix failing user settings test cases.
...
Update preference text to match latest label.
Change-Id: I3de544bea99c193507ee3b1451dd3c67049af07c
Fix: 63665308
Test: make SettingsTests
2017-07-13 12:03:08 -07:00
Bill Yi
cc6a61a958
Import translations. DO NOT MERGE
...
am: 76a81a9803
-s ours
Change-Id: Ib6cb72d96e117cddae5c4acfc81d9c2d61a33f6b
2017-07-13 18:54:57 +00:00
Fan Zhang
7b9568c10d
UI refresh on bluetooth list page
...
- xml layout clean up
- add "Device name" preference, tapping will bring up rename dialog
- Remove tap target from original device_name pref
Merged-In: I6e9764dbb6c51f94be6d6a61d5a6401141407409
Change-Id: I9cb67cc557a9b932d7cf795a8d4a6fb5215c4365
Fix: 62890841
Fix: 62891178
Test: robotests
2017-07-13 11:08:18 -07:00
Bill Yi
76a81a9803
Import translations. DO NOT MERGE
...
Change-Id: Id689260565e4f98a7f6b4aa08668e5b102d28b1e
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
2017-07-13 07:56:00 -07:00
Bill Yi
7adc541aca
Import translations. DO NOT MERGE
...
Change-Id: I37194325f1fdfff4d6706c2b5bc5b2447f1c5e29
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
2017-07-13 07:43:29 -07:00
Antony Sargent
4d7df06eb4
Make sure PIN edit control is focused
...
When doing Bluetooth pairing and the dialog reqesting a PIN comes up, we
want the PIN field to be focused and the keyboard to be shown. This fixes
a regression from N.
Bug: 62857671
Test: make RunSettingsRoboTests
Change-Id: I00dabfda737b6ac61b50518e11f21e5f9a5a1be1
2017-07-12 17:34:36 -07:00
Phil Weaver
84040fdb8b
DO NOT MERGE Back-port ag/2491664 am: 9a14484b38
am: 840b78e19e
am: bebc9f9f3c
-s ours am: 98e0930394
-s ours am: df045253a4
am: b72ffa47a4
-s ours am: bb12830bf9
am: 4a40ef7688
am: a486c82d9c
am: 24aaf4d7ad
-s ours am: e9d2bdc380
am: 8bf67896d6
am: 254bbe84a3
am: 8870bd7c5a
am: 23a6d1d953
-s ours am: 9e63322457
am: c7b3f1f905
...
am: 81c87862db
Change-Id: If38d5dac8b4a43c51ca647196057a229afa86ca2
2017-07-12 23:35:03 +00:00
Phil Weaver
ce17970f6d
DO NOT MERGE Back-port ag/2491664 am: 9a14484b38
am: 840b78e19e
am: bebc9f9f3c
-s ours am: 98e0930394
-s ours am: df045253a4
am: b72ffa47a4
-s ours am: bb12830bf9
am: 4a40ef7688
am: a486c82d9c
am: 24aaf4d7ad
-s ours am: e9d2bdc380
am: 8bf67896d6
am: 254bbe84a3
am: 8870bd7c5a
am: 23a6d1d953
-s ours am: 9e63322457
am: 3393f0ff26
...
am: f23fdd0ac7
Change-Id: I19c37ab72069c35ed34f2a9692e4c79b5d89dcc6
2017-07-12 23:31:33 +00:00
Phil Weaver
81c87862db
DO NOT MERGE Back-port ag/2491664 am: 9a14484b38
am: 840b78e19e
am: bebc9f9f3c
-s ours am: 98e0930394
-s ours am: df045253a4
am: b72ffa47a4
-s ours am: bb12830bf9
am: 4a40ef7688
am: a486c82d9c
am: 24aaf4d7ad
-s ours am: e9d2bdc380
am: 8bf67896d6
am: 254bbe84a3
am: 8870bd7c5a
am: 23a6d1d953
-s ours am: 9e63322457
...
am: c7b3f1f905
Change-Id: Ia201c1ff1a04744e8b326c63fe6a63e45dec91c6
2017-07-12 23:30:24 +00:00
Phil Weaver
f23fdd0ac7
DO NOT MERGE Back-port ag/2491664 am: 9a14484b38
am: 840b78e19e
am: bebc9f9f3c
-s ours am: 98e0930394
-s ours am: df045253a4
am: b72ffa47a4
-s ours am: bb12830bf9
am: 4a40ef7688
am: a486c82d9c
am: 24aaf4d7ad
-s ours am: e9d2bdc380
am: 8bf67896d6
am: 254bbe84a3
am: 8870bd7c5a
am: 23a6d1d953
-s ours am: 9e63322457
...
am: 3393f0ff26
Change-Id: I46a111c138cd7a226e33556ab7ef3bb2dbf00b1a
2017-07-12 23:29:06 +00:00
Phil Weaver
c7b3f1f905
DO NOT MERGE Back-port ag/2491664 am: 9a14484b38
am: 840b78e19e
am: bebc9f9f3c
-s ours am: 98e0930394
-s ours am: df045253a4
am: b72ffa47a4
-s ours am: bb12830bf9
am: 4a40ef7688
am: a486c82d9c
am: 24aaf4d7ad
-s ours am: e9d2bdc380
am: 8bf67896d6
am: 254bbe84a3
am: 8870bd7c5a
am: 23a6d1d953
-s ours
...
am: 9e63322457
Change-Id: I96336a9618789cab1760ea651323c3f8982741e2
2017-07-12 23:22:23 +00:00
Phil Weaver
3393f0ff26
DO NOT MERGE Back-port ag/2491664 am: 9a14484b38
am: 840b78e19e
am: bebc9f9f3c
-s ours am: 98e0930394
-s ours am: df045253a4
am: b72ffa47a4
-s ours am: bb12830bf9
am: 4a40ef7688
am: a486c82d9c
am: 24aaf4d7ad
-s ours am: e9d2bdc380
am: 8bf67896d6
am: 254bbe84a3
am: 8870bd7c5a
am: 23a6d1d953
-s ours
...
am: 9e63322457
Change-Id: I5255b1ea7f562b654a0d018f7e9662748f744ea9
2017-07-12 23:22:21 +00:00
Phil Weaver
9e63322457
DO NOT MERGE Back-port ag/2491664 am: 9a14484b38
am: 840b78e19e
am: bebc9f9f3c
-s ours am: 98e0930394
-s ours am: df045253a4
am: b72ffa47a4
-s ours am: bb12830bf9
am: 4a40ef7688
am: a486c82d9c
am: 24aaf4d7ad
-s ours am: e9d2bdc380
am: 8bf67896d6
am: 254bbe84a3
am: 8870bd7c5a
...
am: 23a6d1d953
-s ours
Change-Id: Ic4747be59996146ac76509581e390afc99ebe876
2017-07-12 23:15:51 +00:00
Phil Weaver
23a6d1d953
DO NOT MERGE Back-port ag/2491664 am: 9a14484b38
am: 840b78e19e
am: bebc9f9f3c
-s ours am: 98e0930394
-s ours am: df045253a4
am: b72ffa47a4
-s ours am: bb12830bf9
am: 4a40ef7688
am: a486c82d9c
am: 24aaf4d7ad
-s ours am: e9d2bdc380
am: 8bf67896d6
am: 254bbe84a3
...
am: 8870bd7c5a
Change-Id: I4a9a2124db4e45793d969be6c3e33479524e01c9
2017-07-12 23:08:49 +00:00
TreeHugger Robot
a2070f9a4f
Merge "UI refresh on bluetooth list page"
2017-07-12 23:05:58 +00:00
Phil Weaver
8870bd7c5a
DO NOT MERGE Back-port ag/2491664 am: 9a14484b38
am: 840b78e19e
am: bebc9f9f3c
-s ours am: 98e0930394
-s ours am: df045253a4
am: b72ffa47a4
-s ours am: bb12830bf9
am: 4a40ef7688
am: a486c82d9c
am: 24aaf4d7ad
-s ours am: e9d2bdc380
am: 8bf67896d6
...
am: 254bbe84a3
Change-Id: I87ffde2e35401e7d027ddae59bbbeddbe6ed91dc
2017-07-12 23:02:11 +00:00
Phil Weaver
254bbe84a3
DO NOT MERGE Back-port ag/2491664 am: 9a14484b38
am: 840b78e19e
am: bebc9f9f3c
-s ours am: 98e0930394
-s ours am: df045253a4
am: b72ffa47a4
-s ours am: bb12830bf9
am: 4a40ef7688
am: a486c82d9c
am: 24aaf4d7ad
-s ours am: e9d2bdc380
...
am: 8bf67896d6
Change-Id: If3df05ce2112fb26b53651f51d47987d4f8582ca
2017-07-12 22:56:17 +00:00
Phil Weaver
8bf67896d6
DO NOT MERGE Back-port ag/2491664 am: 9a14484b38
am: 840b78e19e
am: bebc9f9f3c
-s ours am: 98e0930394
-s ours am: df045253a4
am: b72ffa47a4
-s ours am: bb12830bf9
am: 4a40ef7688
am: a486c82d9c
am: 24aaf4d7ad
-s ours
...
am: e9d2bdc380
Change-Id: I568b19d74265138d2f5cb563491c379bcfbb18aa
2017-07-12 22:50:05 +00:00
Phil Weaver
e9d2bdc380
DO NOT MERGE Back-port ag/2491664 am: 9a14484b38
am: 840b78e19e
am: bebc9f9f3c
-s ours am: 98e0930394
-s ours am: df045253a4
am: b72ffa47a4
-s ours am: bb12830bf9
am: 4a40ef7688
am: a486c82d9c
...
am: 24aaf4d7ad
-s ours
Change-Id: Ibf0c76ba5e9059cd87282cefa9b0c7724ed64128
2017-07-12 22:41:40 +00:00
Phil Weaver
24aaf4d7ad
DO NOT MERGE Back-port ag/2491664 am: 9a14484b38
am: 840b78e19e
am: bebc9f9f3c
-s ours am: 98e0930394
-s ours am: df045253a4
am: b72ffa47a4
-s ours am: bb12830bf9
am: 4a40ef7688
...
am: a486c82d9c
Change-Id: Ib92175b78417bda6e58da2b93e37143a428852c0
2017-07-12 22:35:43 +00:00
Phil Weaver
a486c82d9c
DO NOT MERGE Back-port ag/2491664 am: 9a14484b38
am: 840b78e19e
am: bebc9f9f3c
-s ours am: 98e0930394
-s ours am: df045253a4
am: b72ffa47a4
-s ours am: bb12830bf9
...
am: 4a40ef7688
Change-Id: I6d627519091040c4d64841210003de8aa1471f53
2017-07-12 22:29:09 +00:00
jackqdyulei
236be82872
Merge "Fix bug in DevicePickerFragment" into oc-dr1-dev am: 0e467d594e
...
am: ba757bb235
Change-Id: I64e8378be62775844191b8394cae203c58e4b2fd
2017-07-12 22:28:28 +00:00
jackqdyulei
ba757bb235
Merge "Fix bug in DevicePickerFragment" into oc-dr1-dev
...
am: 0e467d594e
Change-Id: I692d1064b16ed98104eed14ec57caa250e2a703c
2017-07-12 22:26:28 +00:00
Phil Weaver
4a40ef7688
DO NOT MERGE Back-port ag/2491664 am: 9a14484b38
am: 840b78e19e
am: bebc9f9f3c
-s ours am: 98e0930394
-s ours am: df045253a4
am: b72ffa47a4
-s ours
...
am: bb12830bf9
Change-Id: I51e797becf12a2c21e04eb5e701b44cad5f8045f
2017-07-12 22:23:16 +00:00
TreeHugger Robot
0e467d594e
Merge "Fix bug in DevicePickerFragment" into oc-dr1-dev
2017-07-12 22:20:00 +00:00
Phil Weaver
bb12830bf9
DO NOT MERGE Back-port ag/2491664 am: 9a14484b38
am: 840b78e19e
am: bebc9f9f3c
-s ours am: 98e0930394
-s ours am: df045253a4
...
am: b72ffa47a4
-s ours
Change-Id: Idc84d1fbeb9e6bcb219c231af4565b666d2d1f00
2017-07-12 22:19:08 +00:00
Phil Weaver
b72ffa47a4
DO NOT MERGE Back-port ag/2491664 am: 9a14484b38
am: 840b78e19e
am: bebc9f9f3c
-s ours am: 98e0930394
-s ours
...
am: df045253a4
Change-Id: I1ec6fc85e78e081fba4858c8cb4bd7aa2751811c
2017-07-12 22:13:16 +00:00
Phil Weaver
df045253a4
DO NOT MERGE Back-port ag/2491664 am: 9a14484b38
am: 840b78e19e
am: bebc9f9f3c
-s ours
...
am: 98e0930394
-s ours
Change-Id: I8de29bde0bf73adde876e6cba0e4e61de6e4f2cb
2017-07-12 22:06:35 +00:00
Phil Weaver
98e0930394
DO NOT MERGE Back-port ag/2491664 am: 9a14484b38
am: 840b78e19e
...
am: bebc9f9f3c
-s ours
Change-Id: I1d6d10dace8425eb21bacd9582404e876da2db7c
2017-07-12 21:59:38 +00:00
Phil Weaver
bebc9f9f3c
DO NOT MERGE Back-port ag/2491664 am: 9a14484b38
...
am: 840b78e19e
Change-Id: I5b2add698df347db16bfedb196793ea77b70f8a8
2017-07-12 21:55:38 +00:00
Phil Weaver
840b78e19e
DO NOT MERGE Back-port ag/2491664
...
am: 9a14484b38
Change-Id: Ie1a9075d996f38ac8bbe56e19880bbfd6b9f9a96
2017-07-12 21:43:49 +00:00
Rajeev Kumar
82ee7cf14f
Merge "Data plans setting peference."
2017-07-12 20:53:52 +00:00
Phil Weaver
9a14484b38
DO NOT MERGE Back-port ag/2491664
...
Bug: 62196835
Test: Verify overlays disappear on a11y capabilities
dialog.
Change-Id: Icbd00799e4b12cde9d17d3d0abbd38d9643b26c4
2017-07-12 20:50:13 +00:00
Salvador Martinez
42e65d11b9
Merge "Fix mistake in conditional + test" into oc-dr1-dev am: ab2d96de83
...
am: 96e4b8f9f4
Change-Id: I751d0464ce85d6838bd045cbc431f3dc4c3b1405
2017-07-12 20:49:51 +00:00
Salvador Martinez
96e4b8f9f4
Merge "Fix mistake in conditional + test" into oc-dr1-dev
...
am: ab2d96de83
Change-Id: I3514020da43434388b8be25a281c28d3d3b6deea
2017-07-12 20:47:14 +00:00
TreeHugger Robot
ab2d96de83
Merge "Fix mistake in conditional + test" into oc-dr1-dev
2017-07-12 20:41:27 +00:00
Fan Zhang
f57e167375
UI refresh on bluetooth list page
...
- xml layout clean up
- add "Device name" preference, tapping will bring up rename dialog
- Remove tap target from original device_name pref
Change-Id: I6e9764dbb6c51f94be6d6a61d5a6401141407409
Bug: 62890841
Bug: 62891178
Test: robotests
2017-07-12 13:24:25 -07:00
Ajay Nadathur
7d66e044d4
Merge "Remove next button from FingerprintEnroll screen" into oc-dr1-dev am: d1bac25518
...
am: 4aaa52d1d6
Change-Id: Ib8d8d766bccd6ce1d91ecdb752fc2581edb50898
2017-07-12 20:09:22 +00:00
Ajay Nadathur
4aaa52d1d6
Merge "Remove next button from FingerprintEnroll screen" into oc-dr1-dev
...
am: d1bac25518
Change-Id: Ib5269308dfd159b0bf535421ae9bc65628aee3e6
2017-07-12 20:07:19 +00:00
TreeHugger Robot
d1bac25518
Merge "Remove next button from FingerprintEnroll screen" into oc-dr1-dev
2017-07-12 20:03:14 +00:00
jackqdyulei
5fbdfddb13
Fix bug in DevicePickerFragment
...
BluetoothProgressCategory will add a no device preference if it is
not scanning and no device is added to the list. Since
DeviceListFragment doesn't report its scanning status correctly, it will
show "No nearby device" even though it is scanning.
This cl add control code for BluetoothProgressCategory in
DeviceListFragment, which avoid the unnecessary no device preference.
Bug: 62492822
Test: RunSettingsRoboTests
Change-Id: Ic49f21cb58a80dcd37c5737800181263ae876ebc
2017-07-12 12:38:12 -07:00