OSDN Git Service
Fan Zhang [Fri, 14 Jul 2017 20:05:23 +0000 (13:05 -0700)]
Use app context to init WifiP2pManager.
Change-Id: Ib1a2ef1c0b8c3e72557aafb68b8b5e8677fbacc7
Fix:
32767308
Test: heapdump
Eric Schwarzenbach [Fri, 14 Jul 2017 18:06:24 +0000 (18:06 +0000)]
Merge "Change header of wifi detail page to "Network info"."
Jeff Sharkey [Fri, 14 Jul 2017 17:47:54 +0000 (17:47 +0000)]
Merge "Move "metered" persistence to WifiConfiguration."
Lei Yu [Fri, 14 Jul 2017 17:38:25 +0000 (17:38 +0000)]
Merge "Add metric action for bt rename dialog" into oc-dr1-dev am:
8e1f509b5d
am:
23de6959af
Change-Id: I68b23030c05e9d0949675dc158f8fb7dd8ab6479
Lei Yu [Fri, 14 Jul 2017 17:31:00 +0000 (17:31 +0000)]
Merge "Add metric action for bt rename dialog" into oc-dr1-dev
am:
8e1f509b5d
Change-Id: If1fe01a9839c1c59ae02cd3c4cbea665ef6f1f3b
Lei Yu [Fri, 14 Jul 2017 17:19:32 +0000 (17:19 +0000)]
Merge "Add metric action for bt rename dialog" into oc-dr1-dev
Julia Reynolds [Fri, 14 Jul 2017 16:54:58 +0000 (16:54 +0000)]
Merge "Remove automatic rule icons" into oc-dr1-dev am:
0ed32cae99
am:
1f14e49fa5
Change-Id: I16bf3668f5ba49d7ff471322bd68937c6da23d0d
Julia Reynolds [Fri, 14 Jul 2017 16:51:26 +0000 (16:51 +0000)]
Merge "Remove automatic rule icons" into oc-dr1-dev
am:
0ed32cae99
Change-Id: I195fbd43befb0945fe0db6ec891a1781a3f31119
TreeHugger Robot [Fri, 14 Jul 2017 16:45:49 +0000 (16:45 +0000)]
Merge "Remove automatic rule icons" into oc-dr1-dev
Eric Schwarzenbach [Wed, 12 Jul 2017 23:58:32 +0000 (16:58 -0700)]
Change header of wifi detail page to "Network info".
Creates a lifecycle observer to modify the action bar.
Bug:
37252029
Test: make -j40 RunSettingsRoboTests
Change-Id: Iff48ed51f533c3b7b2a099f83c3216ae975f061f
Jeff Sharkey [Wed, 12 Jul 2017 16:56:57 +0000 (10:56 -0600)]
Move "metered" persistence to WifiConfiguration.
For a long time we've had a nasty tangled dependency between Wi-Fi
and NPMS, since they both persisted different details for configured
networks. As part of preparing for new carrier data plan APIs, move
the tracking of meteredness over to WifiConfiguration.
We've never really supported "unmetered" mobile networks inside the
framework, so remove the option to configure those flags.
Replace MeteredPreference.notifyChanged() with explicit listener
to avoid confusing an invalidation pass as expression of user intent
to change metered values.
Bug:
63391323
Test: builds, boots, Wi-Fi policy is upgraded
Exempt-From-Owner-Approval: No owner was found for changed files.
Change-Id: If8a6e12650d1d060a729ed1a80f07ebb65e0ffd7
Julia Reynolds [Fri, 14 Jul 2017 14:03:56 +0000 (10:03 -0400)]
Remove automatic rule icons
Test: code inspection
Change-Id: I7e585f485d3ba9318bf533e07e9fa7f1e1874d51
Fixes:
63623747
Philipp Weiß [Fri, 14 Jul 2017 09:51:14 +0000 (09:51 +0000)]
Merge "Bluetooth Settings Policy Transparency"
Rajeev Kumar [Fri, 14 Jul 2017 01:58:46 +0000 (01:58 +0000)]
Merge "Data plans sync time settings preference."
Jeff Davidson [Fri, 14 Jul 2017 01:11:41 +0000 (01:11 +0000)]
Merge "Don't show "Wipe eSIMs" checkbox for developers." into oc-dr1-dev am:
98f83d6129
am:
1b1e9928ab
Change-Id: I460c2575a83d0d2ea8d4e4108b2eb40748a16a91
Jeff Davidson [Fri, 14 Jul 2017 01:09:09 +0000 (01:09 +0000)]
Merge "Don't show "Wipe eSIMs" checkbox for developers." into oc-dr1-dev
am:
98f83d6129
Change-Id: I2387b8d7cd32b9a7550e6a72c3189c6792bfd1ca
TreeHugger Robot [Fri, 14 Jul 2017 01:02:07 +0000 (01:02 +0000)]
Merge "Don't show "Wipe eSIMs" checkbox for developers." into oc-dr1-dev
Rajeev Kumar [Thu, 13 Jul 2017 01:46:37 +0000 (18:46 -0700)]
Data plans sync time settings preference.
Note: These changes are required for Data balance UI.
Bug:
62349208
Test: make RunSettingsRoboTests -j40
Change-Id: Id52789f2a96dea5ff8c29699ac6fab79e3c5d1bf
TreeHugger Robot [Thu, 13 Jul 2017 23:11:42 +0000 (23:11 +0000)]
Merge "Don't use framework strings for formatting file sizes"
Rajeev Kumar [Thu, 13 Jul 2017 22:59:01 +0000 (22:59 +0000)]
Merge "Manage data plans settings preference."
Fan Zhang [Thu, 13 Jul 2017 22:41:16 +0000 (22:41 +0000)]
Merge "Show default app icon in default app screen."
TreeHugger Robot [Thu, 13 Jul 2017 22:19:25 +0000 (22:19 +0000)]
Merge "Bidi wrap ip address in Wifi config settings"
Lei Yu [Thu, 13 Jul 2017 22:04:26 +0000 (22:04 +0000)]
Merge "Extend char limit for dialog title" into oc-dr1-dev am:
241fecbd79
am:
8a954ee7a6
Change-Id: Ieb4bc97b45ec9deaf5f5bb0c585c17bdc5ce3cf8
jackqdyulei [Tue, 11 Jul 2017 18:15:25 +0000 (11:15 -0700)]
Add metric action for bt rename dialog
Bug:
63553537
Test: runtest -x BluetoothNetworkSettingsTests
Change-Id: Ic618133da513bb0c22ac4d79e5d7cb75412a93dd
Lei Yu [Thu, 13 Jul 2017 21:49:11 +0000 (21:49 +0000)]
Merge "Extend char limit for dialog title" into oc-dr1-dev
am:
241fecbd79
Change-Id: Icfc611300d9f4b0b1b95291fac950ed0924dbbf2
Lei Yu [Thu, 13 Jul 2017 21:33:27 +0000 (21:33 +0000)]
Merge "Extend char limit for dialog title" into oc-dr1-dev
Doris Ling [Thu, 13 Jul 2017 21:28:54 +0000 (21:28 +0000)]
Merge "Fix mokey crash on swiping settings condition." into oc-dr1-dev am:
a7f5953a02
am:
be7044845d
Change-Id: I64412b26bacf567973989fbeaa2cfe2ca42e87b4
Doris Ling [Thu, 13 Jul 2017 21:23:54 +0000 (21:23 +0000)]
Merge "Fix mokey crash on swiping settings condition." into oc-dr1-dev
am:
a7f5953a02
Change-Id: Ie6a5feec8bb8404ba2a2102c4311950dadf78a7d
TreeHugger Robot [Thu, 13 Jul 2017 21:14:45 +0000 (21:14 +0000)]
Merge "Fix mokey crash on swiping settings condition." into oc-dr1-dev
TreeHugger Robot [Thu, 13 Jul 2017 20:59:24 +0000 (20:59 +0000)]
Merge "Fix failing user settings test cases."
Rajeev Kumar [Wed, 12 Jul 2017 21:50:54 +0000 (14:50 -0700)]
Manage data plans settings preference.
Change-Id: I4e15921e793c8c336325e14bec8638d5f71dae17
Note: These changes are required for Data balance UI.
Bug:
62349208
Test: make RunSettingsRoboTests -j40
Fan Zhang [Tue, 11 Jul 2017 23:26:58 +0000 (16:26 -0700)]
Show default app icon in default app screen.
- Renamed AdvancedAppSettings to DefaultAppSettings.
- Add logic to DefaultAppPreferenceController to also display icon.
- Modified DefautlAssistPrefController to suppress gear icon, and use
the controller in default app setting UI to display icon.
- Remove dynamic injected payment setting activity and create the
setting statically in xml.
- Add DefaultPaymentSettingsPreference to display default payment app
title (no icon because we can't get it)
Change-Id: I6b8c768da0bafe5ec9a85ba9c79c7993b449be25
Fix:
36458534
Test: robotests
Fan Zhang [Thu, 13 Jul 2017 20:37:02 +0000 (20:37 +0000)]
Merge "UI refresh on bluetooth list page" into oc-dr1-dev am:
c0ca084622
am:
303c330068 -s ours
Change-Id: If546dd6a7e1db80253052692053012f10c85b8f8
Fan Zhang [Thu, 13 Jul 2017 20:19:29 +0000 (13:19 -0700)]
Bidi wrap ip address in Wifi config settings
Change-Id: Ic1b8a61dbb05abd71170a0b98e7d1b8e604bbdcb
Fix:
63670324
Test: robotests
Fan Zhang [Thu, 13 Jul 2017 20:17:28 +0000 (20:17 +0000)]
Merge "UI refresh on bluetooth list page" into oc-dr1-dev
am:
c0ca084622
Change-Id: I92846eec6bcbb67862b8ad1cf6447623a2dc3ab0
TreeHugger Robot [Thu, 13 Jul 2017 20:05:25 +0000 (20:05 +0000)]
Merge "UI refresh on bluetooth list page" into oc-dr1-dev
Antony Sargent [Thu, 13 Jul 2017 20:00:37 +0000 (20:00 +0000)]
Merge "Make sure PIN edit control is focused" into oc-dr1-dev am:
61e61d96d1
am:
d1b5116213
Change-Id: I1df59b4c237b0daff4f5c44a444d35df8cc77cb0
Antony Sargent [Thu, 13 Jul 2017 19:54:27 +0000 (19:54 +0000)]
Merge "Make sure PIN edit control is focused" into oc-dr1-dev
am:
61e61d96d1
Change-Id: Ib144b0ad110528d4d72fb15c5e463f0b24d5baed
TreeHugger Robot [Thu, 13 Jul 2017 19:41:01 +0000 (19:41 +0000)]
Merge "Make sure PIN edit control is focused" into oc-dr1-dev
Bill Yi [Thu, 13 Jul 2017 19:04:42 +0000 (19:04 +0000)]
Import translations. DO NOT MERGE am:
76a81a9803 -s ours
am:
cc6a61a958 -s ours
Change-Id: Ib1cd100a921d6f2f4a9dae2dca59b6e974218e03
Doris Ling [Thu, 13 Jul 2017 19:03:08 +0000 (12:03 -0700)]
Fix failing user settings test cases.
Update preference text to match latest label.
Change-Id: I3de544bea99c193507ee3b1451dd3c67049af07c
Fix:
63665308
Test: make SettingsTests
Bill Yi [Thu, 13 Jul 2017 18:54:57 +0000 (18:54 +0000)]
Import translations. DO NOT MERGE
am:
76a81a9803 -s ours
Change-Id: Ib6cb72d96e117cddae5c4acfc81d9c2d61a33f6b
Fan Zhang [Wed, 12 Jul 2017 17:18:54 +0000 (10:18 -0700)]
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
Doris Ling [Wed, 12 Jul 2017 19:28:16 +0000 (12:28 -0700)]
Fix mokey crash on swiping settings condition.
When the condition card is being swiped, add null check for the
retrieved Condition to ensure it is still valid before trying to
dismiss it.
Change-Id: I265091a5fe290e359fa9a6e16b1d87c03894c1b8
Fix:
63624859
Test: make RunSettingsRoboTests
jackqdyulei [Thu, 13 Jul 2017 17:25:39 +0000 (10:25 -0700)]
Extend char limit for dialog title
Bug:
63396701
Test: Build
Change-Id: I6f873e42c52e66bab54de087ac7a478a9d6ce4f9
phweiss [Fri, 2 Jun 2017 17:04:56 +0000 (19:04 +0200)]
Bluetooth Settings Policy Transparency
If handleStateChanged() is called after
maybeEnforceRestriction, the disabled switch will be
enabled again, only to be disabled when the user touches it.
Bug:
37737621
Test: make RunSettingsRoboTests -j40 ROBOTEST_FILTER=*BluetoothEnablerTest
Change-Id: I3086806dfd6d911d6d7fca1f1d30fa7d8b8757d1
Bill Yi [Thu, 13 Jul 2017 14:56:00 +0000 (07:56 -0700)]
Import translations. DO NOT MERGE
Change-Id: Id689260565e4f98a7f6b4aa08668e5b102d28b1e
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Bill Yi [Thu, 13 Jul 2017 14:43:29 +0000 (07:43 -0700)]
Import translations. DO NOT MERGE
Change-Id: I37194325f1fdfff4d6706c2b5bc5b2447f1c5e29
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Antony Sargent [Thu, 13 Jul 2017 00:29:10 +0000 (17:29 -0700)]
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
Phil Weaver [Wed, 12 Jul 2017 23:35:03 +0000 (23:35 +0000)]
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
Phil Weaver [Wed, 12 Jul 2017 23:31:33 +0000 (23:31 +0000)]
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
Phil Weaver [Wed, 12 Jul 2017 23:30:24 +0000 (23:30 +0000)]
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
Phil Weaver [Wed, 12 Jul 2017 23:29:06 +0000 (23:29 +0000)]
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
Phil Weaver [Wed, 12 Jul 2017 23:22:23 +0000 (23:22 +0000)]
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
Phil Weaver [Wed, 12 Jul 2017 23:22:21 +0000 (23:22 +0000)]
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
Phil Weaver [Wed, 12 Jul 2017 23:15:51 +0000 (23:15 +0000)]
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
Phil Weaver [Wed, 12 Jul 2017 23:08:49 +0000 (23:08 +0000)]
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
TreeHugger Robot [Wed, 12 Jul 2017 23:05:58 +0000 (23:05 +0000)]
Merge "UI refresh on bluetooth list page"
Phil Weaver [Wed, 12 Jul 2017 23:02:11 +0000 (23:02 +0000)]
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
Roozbeh Pournader [Wed, 12 Jul 2017 18:37:59 +0000 (11:37 -0700)]
Don't use framework strings for formatting file sizes
Modify various formatters to avoid using framework strings for
formatting file sizes.
Also update README instructions for running unit tests.
Bug:
36994779
Test: adb shell am instrument -w -e class com.android.settings.utils.FileSizeFormatterTest com.android.settings.tests.unit/android.support.test.runner.AndroidJUnitRunner
Test: make -j RunSettingsRoboTests
Change-Id: I4035f26d29408b64389892a4a2379b4823f8ac96
Phil Weaver [Wed, 12 Jul 2017 22:56:17 +0000 (22:56 +0000)]
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
Phil Weaver [Wed, 12 Jul 2017 22:50:05 +0000 (22:50 +0000)]
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
Phil Weaver [Wed, 12 Jul 2017 22:41:40 +0000 (22:41 +0000)]
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
Phil Weaver [Wed, 12 Jul 2017 22:35:43 +0000 (22:35 +0000)]
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
Phil Weaver [Wed, 12 Jul 2017 22:29:09 +0000 (22:29 +0000)]
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
jackqdyulei [Wed, 12 Jul 2017 22:28:28 +0000 (22:28 +0000)]
Merge "Fix bug in DevicePickerFragment" into oc-dr1-dev am:
0e467d594e
am:
ba757bb235
Change-Id: I64e8378be62775844191b8394cae203c58e4b2fd
jackqdyulei [Wed, 12 Jul 2017 22:26:28 +0000 (22:26 +0000)]
Merge "Fix bug in DevicePickerFragment" into oc-dr1-dev
am:
0e467d594e
Change-Id: I692d1064b16ed98104eed14ec57caa250e2a703c
Phil Weaver [Wed, 12 Jul 2017 22:23:16 +0000 (22:23 +0000)]
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
TreeHugger Robot [Wed, 12 Jul 2017 22:20:00 +0000 (22:20 +0000)]
Merge "Fix bug in DevicePickerFragment" into oc-dr1-dev
Phil Weaver [Wed, 12 Jul 2017 22:19:08 +0000 (22:19 +0000)]
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
Phil Weaver [Wed, 12 Jul 2017 22:13:16 +0000 (22:13 +0000)]
DO NOT MERGE Back-port ag/
2491664 am:
9a14484b38 am:
840b78e19e am:
bebc9f9f3c -s ours am:
98e0930394 -s ours
am:
df045253a4
Change-Id: I1ec6fc85e78e081fba4858c8cb4bd7aa2751811c
Phil Weaver [Wed, 12 Jul 2017 22:06:35 +0000 (22:06 +0000)]
DO NOT MERGE Back-port ag/
2491664 am:
9a14484b38 am:
840b78e19e am:
bebc9f9f3c -s ours
am:
98e0930394 -s ours
Change-Id: I8de29bde0bf73adde876e6cba0e4e61de6e4f2cb
Phil Weaver [Wed, 12 Jul 2017 21:59:38 +0000 (21:59 +0000)]
DO NOT MERGE Back-port ag/
2491664 am:
9a14484b38 am:
840b78e19e
am:
bebc9f9f3c -s ours
Change-Id: I1d6d10dace8425eb21bacd9582404e876da2db7c
Phil Weaver [Wed, 12 Jul 2017 21:55:38 +0000 (21:55 +0000)]
DO NOT MERGE Back-port ag/
2491664 am:
9a14484b38
am:
840b78e19e
Change-Id: I5b2add698df347db16bfedb196793ea77b70f8a8
Phil Weaver [Wed, 12 Jul 2017 21:43:49 +0000 (21:43 +0000)]
DO NOT MERGE Back-port ag/
2491664
am:
9a14484b38
Change-Id: Ie1a9075d996f38ac8bbe56e19880bbfd6b9f9a96
Rajeev Kumar [Wed, 12 Jul 2017 20:53:52 +0000 (20:53 +0000)]
Merge "Data plans setting peference."
Phil Weaver [Tue, 11 Jul 2017 18:34:40 +0000 (11:34 -0700)]
DO NOT MERGE Back-port ag/
2491664
Bug:
62196835
Test: Verify overlays disappear on a11y capabilities
dialog.
Change-Id: Icbd00799e4b12cde9d17d3d0abbd38d9643b26c4
Salvador Martinez [Wed, 12 Jul 2017 20:49:51 +0000 (20:49 +0000)]
Merge "Fix mistake in conditional + test" into oc-dr1-dev am:
ab2d96de83
am:
96e4b8f9f4
Change-Id: I751d0464ce85d6838bd045cbc431f3dc4c3b1405
Salvador Martinez [Wed, 12 Jul 2017 20:47:14 +0000 (20:47 +0000)]
Merge "Fix mistake in conditional + test" into oc-dr1-dev
am:
ab2d96de83
Change-Id: I3514020da43434388b8be25a281c28d3d3b6deea
TreeHugger Robot [Wed, 12 Jul 2017 20:41:27 +0000 (20:41 +0000)]
Merge "Fix mistake in conditional + test" into oc-dr1-dev
Fan Zhang [Wed, 12 Jul 2017 17:18:54 +0000 (10:18 -0700)]
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
Ajay Nadathur [Wed, 12 Jul 2017 20:09:22 +0000 (20:09 +0000)]
Merge "Remove next button from FingerprintEnroll screen" into oc-dr1-dev am:
d1bac25518
am:
4aaa52d1d6
Change-Id: Ib8d8d766bccd6ce1d91ecdb752fc2581edb50898
Ajay Nadathur [Wed, 12 Jul 2017 20:07:19 +0000 (20:07 +0000)]
Merge "Remove next button from FingerprintEnroll screen" into oc-dr1-dev
am:
d1bac25518
Change-Id: Ib5269308dfd159b0bf535421ae9bc65628aee3e6
TreeHugger Robot [Wed, 12 Jul 2017 20:03:14 +0000 (20:03 +0000)]
Merge "Remove next button from FingerprintEnroll screen" into oc-dr1-dev
jackqdyulei [Wed, 12 Jul 2017 19:30:02 +0000 (12:30 -0700)]
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
TreeHugger Robot [Wed, 12 Jul 2017 19:34:54 +0000 (19:34 +0000)]
Merge "Disable lift-to-wake when always-on is checked"
Rajeev Kumar [Tue, 11 Jul 2017 22:44:46 +0000 (15:44 -0700)]
Data plans setting peference.
Change-Id: Ieb2aa67ab98140aa90501227345a15ad64cf124c
Note: These changes are required for Data balance UI.
Bug:
62349208
Test: make RunSettingsRoboTests -j40
Salvador Martinez [Tue, 11 Jul 2017 23:15:44 +0000 (16:15 -0700)]
Fix mistake in conditional + test
This CL fixes a mixup that was in a conditional that determined
what was shown on the battery settings page. Additionally, it adds
a simple test to help ensure that this does not regress in the
future.
Test: Robotest
Bug:
63158794
Change-Id: I8af4843ef6d798b5114c97b2f1b99dd29fa5f412
Ajay Nadathur [Wed, 12 Jul 2017 18:11:47 +0000 (18:11 +0000)]
Merge "Do not show options if screen lock types is empty" into oc-dr1-dev am:
0bde6dcb18
am:
3d627974d6
Change-Id: Ib062bcdfc23008dab14622e4741fca6dc30e5950
Ajay Nadathur [Wed, 12 Jul 2017 18:04:26 +0000 (18:04 +0000)]
Merge "Do not show options if screen lock types is empty" into oc-dr1-dev
am:
0bde6dcb18
Change-Id: I7b2ba35b04f53e28ad98eec54b8fe42811a6eb8d
Ajay Nadathur [Wed, 12 Jul 2017 17:53:07 +0000 (17:53 +0000)]
Merge "Do not show options if screen lock types is empty" into oc-dr1-dev
Geoffrey Pitsch [Mon, 10 Jul 2017 14:30:05 +0000 (10:30 -0400)]
Disable lift-to-wake when always-on is checked
The setting has little to no meaning when AOD is on.
Test: make
ROBOTEST_FILTER=AmbientDisplayAlwaysOnPreferenceControllerTest
RunSettingsRoboTests -j
Bug:
62391405
Change-Id:If5492227755ca81ec0bcf921a81e2bfd33a85b9c
Daniel Nishi [Wed, 12 Jul 2017 17:33:32 +0000 (17:33 +0000)]
Merge "Fix filter bug for non-internal app filtering." into oc-dr1-dev am:
bce83f8c71
am:
eba886f045
Change-Id: Ib1b6f17ef73222cfeebe163c6a43112f74ffa898
Daniel Nishi [Wed, 12 Jul 2017 17:26:57 +0000 (17:26 +0000)]
Merge "Fix filter bug for non-internal app filtering." into oc-dr1-dev
am:
bce83f8c71
Change-Id: I9ab99b706f8d545294ebacc5e204d90e94c9ea32
Geoffrey Pitsch [Wed, 12 Jul 2017 17:14:54 +0000 (17:14 +0000)]
Merge "Disable lift-to-wake when always-on is checked" into oc-dr1-dev am:
00ac782f3e
am:
329bab9e1b -s ours
Change-Id: I8c12da6716c37f68e253b504e14755ada40a9e2e
Daniel Nishi [Wed, 12 Jul 2017 17:13:46 +0000 (17:13 +0000)]
Merge "Fix filter bug for non-internal app filtering." into oc-dr1-dev
Geoffrey Pitsch [Wed, 12 Jul 2017 16:59:26 +0000 (16:59 +0000)]
Merge "Disable lift-to-wake when always-on is checked" into oc-dr1-dev
am:
00ac782f3e
Change-Id: I5151ab5ba2ed2dfb94460a118705b3f68a18f777
TreeHugger Robot [Wed, 12 Jul 2017 16:59:24 +0000 (16:59 +0000)]
Merge "Use pref controller to get non-indexable in network setting"
Geoffrey Pitsch [Wed, 12 Jul 2017 16:50:48 +0000 (16:50 +0000)]
Merge "Disable lift-to-wake when always-on is checked" into oc-dr1-dev
Doris Ling [Wed, 12 Jul 2017 03:22:57 +0000 (03:22 +0000)]
Merge "Update spacing and background color for condition/suggestion." into oc-dr1-dev am:
91ca9f60e9
am:
a674aa69c2 -s ours
Change-Id: I8c03e500a6d50eb9f7085d217a6ec0d92bbba873
OSDN Git Service
