Commit Graph

15222 Commits

Author SHA1 Message Date
John Spurlock
4781e4a5f9 am 927b3dde: am 911de7fa: Settings: Wire up new doze opt-out setting.
* commit '927b3dde46cc59131eb870887846a173d3305fb4':
  Settings: Wire up new doze opt-out setting.
2014-08-04 19:10:01 +00:00
John Spurlock
927b3dde46 am 911de7fa: Settings: Wire up new doze opt-out setting.
* commit '911de7fa8520f919cda673ae70c25f86ae0edf98':
  Settings: Wire up new doze opt-out setting.
2014-08-04 19:06:10 +00:00
John Spurlock
911de7fa85 Settings: Wire up new doze opt-out setting.
Add an item in Display settings for enabling or disabling
dozing.  The setting will only appear on devices that have
configured a doze component.

Bug:16703536
Change-Id: Iba5f0a25cef68924f5be5f858b4c396234a7a355
2014-08-04 14:53:28 -04:00
Matthew Xie
ed36a8b134 am 3347624e: am 8c89e69b: Merge "Bluetooth: Multi HF support" into lmp-dev
* commit '3347624efbe9f5d941275c895fd0f00e2fe9662f':
  Bluetooth: Multi HF support
2014-08-04 00:21:24 +00:00
Matthew Xie
3347624efb am 8c89e69b: Merge "Bluetooth: Multi HF support" into lmp-dev
* commit '8c89e69b5319fdc78181a9548ad794f2944831e4':
  Bluetooth: Multi HF support
2014-08-04 00:18:34 +00:00
PauloftheWest
219a65cc08 am 00265787: am 386e5ebb: Updated comments in strings.xml for translators.
* commit '0026578738ed65f05d3ff23d008590d7ac382409':
  Updated comments in strings.xml for translators.
2014-08-03 20:42:22 +00:00
PauloftheWest
0026578738 am 386e5ebb: Updated comments in strings.xml for translators.
* commit '386e5ebbc274ee18e8f4fb00bc51212a0b764ad7':
  Updated comments in strings.xml for translators.
2014-08-03 20:39:02 +00:00
PauloftheWest
386e5ebbc2 Updated comments in strings.xml for translators.
Bug: 16321904
Bug: 16340357
Change-Id: I5e4a854742a1f4e51c7aed2e786b2436260795ec
2014-08-03 19:50:22 +00:00
John Spurlock
b86bd00a88 am 0062d87a: am 249cf50b: Settings: Battery saver updates.
* commit '0062d87ae33d551f8ace0baea4c5ed0063cbceef':
  Settings: Battery saver updates.
2014-08-03 01:58:05 +00:00
John Spurlock
0062d87ae3 am 249cf50b: Settings: Battery saver updates.
* commit '249cf50b19c5b1d9ddce0667fb9d439fcdb6f033':
  Settings: Battery saver updates.
2014-08-03 01:54:21 +00:00
John Spurlock
249cf50b19 Settings: Battery saver updates.
- Fewer trigger level options, new default of 0 (never)
 - Use new shared feature description text (in framework)
 - Remove "always on", add new top-level switch bar.

Depends on the framework changes in I3d1ded1eec9e63e7d97469486f6a320e1bebbccd

Bug:16214395
Change-Id: Ia01186cfeb19d00672f62cc84787584b4dcc1143
2014-08-02 17:23:46 -04:00
Zoltan Szatmary-Ban
585d097b65 am f712193b: am ca90af10: Toggle between profiles in VPN Settings
* commit 'f712193bc7c72da9854e8b5c9b0019e6381b5caf':
  Toggle between profiles in VPN Settings
2014-08-01 14:55:08 +00:00
Zoltan Szatmary-Ban
f712193bc7 am ca90af10: Toggle between profiles in VPN Settings
* commit 'ca90af1064f966c1ef764a3388020c94ba4a1121':
  Toggle between profiles in VPN Settings
2014-08-01 14:50:00 +00:00
Zoltan Szatmary-Ban
ca90af1064 Toggle between profiles in VPN Settings
This adds a spinner to the VPN settings screen which can be used to toggle
between the Settings app in the primary and managed profile so that the user
can edit settings belonging to both profiles.

Bug:16030111
Change-Id: I3b800264c634900412e8eebdbcf43a2b6913c2be
2014-08-01 14:41:57 +00:00
Zoltan Szatmary-Ban
11ea340c59 am 5120b21e: am f3d72098: Update Device Admins Settings screen
* commit '5120b21eeb41a1769d781c39eead21e909fd92b1':
  Update Device Admins Settings screen
2014-08-01 13:52:28 +00:00
vandwalle
7809b15975 am 56543b17: am 5cd9063d: Merge "The Settings app is listening to wpa_supplicant state change so as to update the state of the AccessPoint objects and present Wifi state to the user." into lmp-dev
* commit '56543b171d3173458c32c4c7174b1f286ff85775':
  The Settings app is listening to wpa_supplicant state change so as to update the state of the AccessPoint objects and present Wifi state to the user.
2014-08-01 13:50:41 +00:00
PauloftheWest
dbaad4f99b am 3eb8a711: am 33734f58: Cheanged Call Manager\'s summary to be parameter.
* commit '3eb8a711fe367468bd8bdca4df446ce966b717d7':
  Cheanged Call Manager's summary to be parameter.
2014-08-01 13:50:26 +00:00
Svetoslav
a017a4a202 am f66c67db: am 0b4cf144: Merge "Removing lock screen app widget code" into lmp-dev
* commit 'f66c67db4688fa906011731c9755aee86adb77f8':
  Removing lock screen app widget code
2014-08-01 13:50:09 +00:00
Amith Yamasani
d1b5c1deac am f1602f81: am 9980cf7c: Merge "Dialog on phone shouldn\'t say tablet" into lmp-dev
* commit 'f1602f811a25c5dcbb821653090f1fce2ffa3b7a':
  Dialog on phone shouldn't say tablet
2014-08-01 13:49:45 +00:00
Adam Lesinski
9b350ac6d0 am 6717ce01: am 366e7a20: Fix UsageStats permissions in Settings
* commit '6717ce010993c94f8d071ae64c54c99d46e537b8':
  Fix UsageStats permissions in Settings
2014-08-01 13:48:56 +00:00
Alexandra Gherghina
b5b10aa4cf am 4d90a69d: am 80e1f1bf: Extract common functionality for profile spinner into Utils
* commit '4d90a69da3841462c8272b89867bbb4edb3e8db2':
  Extract common functionality for profile spinner into Utils
2014-08-01 13:48:42 +00:00
Alexandra Gherghina
1ea554698e am 9aaa3af4: am 6bcca8b7: Modify user spinner appearance to match mocks
* commit '9aaa3af4b5e07f9e88e485c8d3db21f0f993932f':
  Modify user spinner appearance to match mocks
2014-08-01 13:48:41 +00:00
Zoltan Szatmary-Ban
5120b21eeb am f3d72098: Update Device Admins Settings screen
* commit 'f3d72098b0008a9a8e137985d7fbc0e0470adc9c':
  Update Device Admins Settings screen
2014-08-01 11:51:26 +00:00
Zoltan Szatmary-Ban
f3d72098b0 Update Device Admins Settings screen
The MDM is a Device Admin for the managed profile. The users should be able to see that it exists
and it is controlling the device, but they should not be able to change it.

Bug: 15558397

Change-Id: Ief372b606f1085f73c98ace97f2c1d9ac5fe3257
2014-08-01 09:29:33 +00:00
Maurice Lam
86163b6bcd Merge "[WifiSetup] Fixed setup strings CHAR LIMIT" into lmp-dev 2014-08-01 08:29:25 +00:00
Maurice Lam
a6e7f3dd93 [WifiSetup] Fixed setup strings CHAR LIMIT
Bumped the CHAR LIMIT of "Skip" button to 20, and added the same CHAR
LIMIT to "Next".

Bug: 16116325
Change-Id: Iafdab3712fdbfac0c53d3ef73d1da8910bc9433b
2014-08-04 15:11:33 -07:00
Matthew Xie
8c89e69b53 Merge "Bluetooth: Multi HF support" into lmp-dev 2014-08-01 01:46:21 +00:00
Nitin Srivastava
b0b9855e80 Bluetooth: Multi HF support
1. The connected sinks are not disconnected from
HeadsetProfile when new sink is connecting.
2. Also return correct connection status for
specific HS.
3. Sets priority for specific HS while disconnecting.
bug 16519158

Change-Id: I62c6629cf11129733aab8a835adcd51e014b3860
2014-08-03 17:12:50 -07:00
vandwalle
56543b171d am 5cd9063d: Merge "The Settings app is listening to wpa_supplicant state change so as to update the state of the AccessPoint objects and present Wifi state to the user." into lmp-dev
* commit '5cd9063df2cb5e578326d7bc94c0487b884ece31':
  The Settings app is listening to wpa_supplicant state change so as to update the state of the AccessPoint objects and present Wifi state to the user.
2014-07-31 23:17:45 +00:00
PauloftheWest
3eb8a711fe am 33734f58: Cheanged Call Manager\'s summary to be parameter.
* commit '33734f58d5894829c5821c39727f6dae2c951167':
  Cheanged Call Manager's summary to be parameter.
2014-07-31 22:33:52 +00:00
PauloftheWest
33734f58d5 Cheanged Call Manager's summary to be parameter.
Bug: 16300328
Change-Id: I4a3a4a80060ac6d464adc5f666d02dabe635707c
2014-07-31 22:27:16 +00:00
Svetoslav
f66c67db46 am 0b4cf144: Merge "Removing lock screen app widget code" into lmp-dev
* commit '0b4cf14400a42a3d0f461386f22d3dd7d69dd88f':
  Removing lock screen app widget code
2014-07-31 21:55:09 +00:00
vandwalle
5cd9063df2 Merge "The Settings app is listening to wpa_supplicant state change so as to update the state of the AccessPoint objects and present Wifi state to the user." into lmp-dev 2014-07-31 21:50:52 +00:00
vandwalle
3b5e4e2421 The Settings app is listening to wpa_supplicant state change so as to update the state of the AccessPoint objects and present Wifi state to the user.
This is not right because wpa_supplicant states are transient (for instance when the WiFi Layer, at Layer 2, is going thru some harmless spurious disconnection cycle due to WiFi signal fluctuation). This cause the state of the WiFi Network to appear to be unstable to the user.

Hence, I removed dependencies on wpa_supplicant internal state.

In addition so as to improve debugging, I added the BSSID to the Wifi Verbose Logging string which is shown in wifi picker alongside the current network. This string only appear when a user goes into Developper Options and enable WiFi Verbose Logging.

The below bug is an example of situation where a spurious disconnect (a coupld seconds) handled by wpa_supplicant can cause the WiFi Settings to indicate that the link is unstable.

Bug:16140888 Wifi best network selection not smooth


Change-Id: I0e7c6b86262b88ed993c46fcdcdbab4d9b1f5ea1
2014-07-31 22:27:57 +00:00
Amith Yamasani
f1602f811a am 9980cf7c: Merge "Dialog on phone shouldn\'t say tablet" into lmp-dev
* commit '9980cf7c9927451b1370dab8afb8357542c10e8c':
  Dialog on phone shouldn't say tablet
2014-07-31 20:52:42 +00:00
Adam Lesinski
6717ce0109 am 366e7a20: Fix UsageStats permissions in Settings
* commit '366e7a20c4d716c3d260faef929f0e8d6be267fb':
  Fix UsageStats permissions in Settings
2014-07-31 19:14:54 +00:00
Adam Lesinski
366e7a20c4 Fix UsageStats permissions in Settings
AppOpsManager returns all permission for all users. We need
to check that the permission we're getting is actually for
our user.

Change-Id: I8287d2dc1959d4a22c19ebb2d24136324e04cd2b
2014-07-31 19:12:09 +00:00
Alexandra Gherghina
4d90a69da3 am 80e1f1bf: Extract common functionality for profile spinner into Utils
* commit '80e1f1bfdb814a08fb8b07b2e279285d495042e9':
  Extract common functionality for profile spinner into Utils
2014-07-31 18:43:06 +00:00
Alexandra Gherghina
9aaa3af4b5 am 6bcca8b7: Modify user spinner appearance to match mocks
* commit '6bcca8b7ae3fab4609f67f32a52a10d4143093a9':
  Modify user spinner appearance to match mocks
2014-07-31 18:43:06 +00:00
Alexandra Gherghina
80e1f1bfdb Extract common functionality for profile spinner into Utils
Bug: 16645615
Change-Id: Ic8928fff8294cd99eeb86b69b44b8e4128cadf92
2014-07-31 18:38:47 +00:00
Alexandra Gherghina
2d0e57ddaa am ea01d406: am 6b3b7514: Update icon and text for a managed profile
* commit 'ea01d4062faa136566a09f0ee75e702abfe1df5a':
  Update icon and text for a managed profile
2014-07-31 13:28:48 +00:00
Alexandra Gherghina
ea01d4062f am 6b3b7514: Update icon and text for a managed profile
* commit '6b3b751492d01b23b87a4ee6b807dc00c3b5770e':
  Update icon and text for a managed profile
2014-07-31 13:07:02 +00:00
Alexandra Gherghina
6bcca8b7ae Modify user spinner appearance to match mocks
Bug: 16518801
Change-Id: I30aa65251d4a4aaa80dbde5881fc56fffb7d54f7
2014-07-31 11:31:24 +01:00
Alexandra Gherghina
6b3b751492 Update icon and text for a managed profile
Bug: 16369104
Change-Id: I15d25910332d92e1638cdc63422e7e28c2f07d85
2014-07-31 10:24:16 +00:00
Geoff Mendal
6dd54c30ce am c8f7dff0: (-s ours) am 86bf735a: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev
* commit 'c8f7dff0bb14a4af78f33999b00bf25577b86657':
  Import translations. DO NOT MERGE
2014-07-31 01:52:48 +00:00
Geoff Mendal
c8f7dff0bb am 86bf735a: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev
* commit '86bf735aae6714225a4c12bb032efebebbbfca84':
  Import translations. DO NOT MERGE
2014-07-31 01:49:18 +00:00
PauloftheWest
fceeab3cb0 am 52d98cac: am d94e78b4: Merge "Fixed crash when changing orientation in the Add Networks dialog." into lmp-dev
* commit '52d98cac7f26b62cff73c52d0fa11fdf21a4b0d3':
  Fixed crash when changing orientation in the Add Networks dialog.
2014-07-30 22:32:36 +00:00
PauloftheWest
52d98cac7f am d94e78b4: Merge "Fixed crash when changing orientation in the Add Networks dialog." into lmp-dev
* commit 'd94e78b4b2434259abb72563ee431b8312210ce0':
  Fixed crash when changing orientation in the Add Networks dialog.
2014-07-30 22:26:36 +00:00
Julia Reynolds
195d825105 am c39fcc87: am a71d7056: Merge "Fix issue with pin prompt." into lmp-dev
* commit 'c39fcc87a7970f371d7afce3ed9ff6bffd258fb7':
  Fix issue with pin prompt.
2014-07-30 20:59:15 +00:00
Julia Reynolds
c39fcc87a7 am a71d7056: Merge "Fix issue with pin prompt." into lmp-dev
* commit 'a71d7056503121fea26ce58fa8996871b4b10d25':
  Fix issue with pin prompt.
2014-07-30 20:54:56 +00:00