Commit Graph

38135 Commits

Author SHA1 Message Date
Eric Schwarzenbach
4fefb21547 Merge "Change header of wifi detail page to "Network info"." 2017-07-14 18:06:24 +00:00
Jeff Sharkey
fc5a1740be Merge "Move "metered" persistence to WifiConfiguration." 2017-07-14 17:47:54 +00:00
Lei Yu
70966973a1 Merge "Add metric action for bt rename dialog" into oc-dr1-dev am: 8e1f509b5d
am: 23de6959af

Change-Id: I68b23030c05e9d0949675dc158f8fb7dd8ab6479
2017-07-14 17:38:25 +00:00
Lei Yu
23de6959af Merge "Add metric action for bt rename dialog" into oc-dr1-dev
am: 8e1f509b5d

Change-Id: If1fe01a9839c1c59ae02cd3c4cbea665ef6f1f3b
2017-07-14 17:31:00 +00:00
Lei Yu
8e1f509b5d Merge "Add metric action for bt rename dialog" into oc-dr1-dev 2017-07-14 17:19:32 +00:00
Julia Reynolds
153578ebc3 Merge "Remove automatic rule icons" into oc-dr1-dev am: 0ed32cae99
am: 1f14e49fa5

Change-Id: I16bf3668f5ba49d7ff471322bd68937c6da23d0d
2017-07-14 16:54:58 +00:00
Julia Reynolds
1f14e49fa5 Merge "Remove automatic rule icons" into oc-dr1-dev
am: 0ed32cae99

Change-Id: I195fbd43befb0945fe0db6ec891a1781a3f31119
2017-07-14 16:51:26 +00:00
TreeHugger Robot
0ed32cae99 Merge "Remove automatic rule icons" into oc-dr1-dev 2017-07-14 16:45:49 +00:00
Eric Schwarzenbach
f6c0004d91 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
2017-07-14 09:16:30 -07:00
Jeff Sharkey
dc09269c81 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
2017-07-14 09:47:03 -06:00
Julia Reynolds
1c3a291ffb Remove automatic rule icons
Test: code inspection
Change-Id: I7e585f485d3ba9318bf533e07e9fa7f1e1874d51
Fixes: 63623747
2017-07-14 10:03:56 -04:00
Philipp Weiß
036304f32d Merge "Bluetooth Settings Policy Transparency" 2017-07-14 09:51:14 +00:00
Rajeev Kumar
c57fa7f90c Merge "Data plans sync time settings preference." 2017-07-14 01:58:46 +00:00
Jeff Davidson
0c716a748a Merge "Don't show "Wipe eSIMs" checkbox for developers." into oc-dr1-dev am: 98f83d6129
am: 1b1e9928ab

Change-Id: I460c2575a83d0d2ea8d4e4108b2eb40748a16a91
2017-07-14 01:11:41 +00:00
Jeff Davidson
1b1e9928ab Merge "Don't show "Wipe eSIMs" checkbox for developers." into oc-dr1-dev
am: 98f83d6129

Change-Id: I2387b8d7cd32b9a7550e6a72c3189c6792bfd1ca
2017-07-14 01:09:09 +00:00
TreeHugger Robot
98f83d6129 Merge "Don't show "Wipe eSIMs" checkbox for developers." into oc-dr1-dev 2017-07-14 01:02:07 +00:00
Rajeev Kumar
a8ba46b355 Data plans sync time settings preference.
Note: These changes are required for Data balance UI.
Bug: 62349208
Test: make RunSettingsRoboTests -j40
Change-Id: Id52789f2a96dea5ff8c29699ac6fab79e3c5d1bf
2017-07-13 16:11:59 -07:00
TreeHugger Robot
7eee73a0c8 Merge "Don't use framework strings for formatting file sizes" 2017-07-13 23:11:42 +00:00
Rajeev Kumar
bb90de3a4c Merge "Manage data plans settings preference." 2017-07-13 22:59:01 +00:00
Fan Zhang
a7b04ed692 Merge "Show default app icon in default app screen." 2017-07-13 22:41:16 +00:00
TreeHugger Robot
b852f6de93 Merge "Bidi wrap ip address in Wifi config settings" 2017-07-13 22:19:25 +00:00
Lei Yu
080950bed9 Merge "Extend char limit for dialog title" into oc-dr1-dev am: 241fecbd79
am: 8a954ee7a6

Change-Id: Ieb4bc97b45ec9deaf5f5bb0c585c17bdc5ce3cf8
2017-07-13 22:04:26 +00:00
jackqdyulei
7190797b73 Add metric action for bt rename dialog
Bug: 63553537
Test: runtest -x BluetoothNetworkSettingsTests
Change-Id: Ic618133da513bb0c22ac4d79e5d7cb75412a93dd
2017-07-13 14:58:24 -07:00
Lei Yu
8a954ee7a6 Merge "Extend char limit for dialog title" into oc-dr1-dev
am: 241fecbd79

Change-Id: Icfc611300d9f4b0b1b95291fac950ed0924dbbf2
2017-07-13 21:49:11 +00:00
Lei Yu
241fecbd79 Merge "Extend char limit for dialog title" into oc-dr1-dev 2017-07-13 21:33:27 +00:00
Doris Ling
36c1934162 Merge "Fix mokey crash on swiping settings condition." into oc-dr1-dev am: a7f5953a02
am: be7044845d

Change-Id: I64412b26bacf567973989fbeaa2cfe2ca42e87b4
2017-07-13 21:28:54 +00:00
Doris Ling
be7044845d Merge "Fix mokey crash on swiping settings condition." into oc-dr1-dev
am: a7f5953a02

Change-Id: Ie6a5feec8bb8404ba2a2102c4311950dadf78a7d
2017-07-13 21:23:54 +00:00
TreeHugger Robot
a7f5953a02 Merge "Fix mokey crash on swiping settings condition." into oc-dr1-dev 2017-07-13 21:14:45 +00:00
TreeHugger Robot
cbedc3f0aa Merge "Fix failing user settings test cases." 2017-07-13 20:59:24 +00:00
Rajeev Kumar
36a808a81e Manage data plans settings preference.
Change-Id: I4e15921e793c8c336325e14bec8638d5f71dae17
Note: These changes are required for Data balance UI.
Bug: 62349208
Test: make RunSettingsRoboTests -j40
2017-07-13 13:56:01 -07:00
Fan Zhang
2ea6700336 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
2017-07-13 13:49:28 -07: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
0d8ae943d2 Bidi wrap ip address in Wifi config settings
Change-Id: Ic1b8a61dbb05abd71170a0b98e7d1b8e604bbdcb
Fix: 63670324
Test: robotests
2017-07-13 13:19:29 -07: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
Doris Ling
84c7739986 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
2017-07-13 11:00:29 -07:00
jackqdyulei
a5084d35dc Extend char limit for dialog title
Bug: 63396701
Test: Build
Change-Id: I6f873e42c52e66bab54de087ac7a478a9d6ce4f9
2017-07-13 10:25:39 -07:00
phweiss
df4bb2a84f 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
2017-07-13 18:47:30 +02: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