Android/packages_apps_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
14,940 Commits 1 Branch 0 Tags
fbbd5caba482c0686ee3c3548bfae852a8804eef
Commit Graph

14940 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Svet Ganov
fbbd5caba4 am 4f60e481: am c15c0c07: Add support for widgets in user profiles 
* commit '4f60e481105886c38f3545c3583f052d24e6dc42':
  Add support for widgets in user profiles
 2014-08-05 22:30:48 +00:00
Svet Ganov
4f60e48110 am c15c0c07: Add support for widgets in user profiles 
* commit 'c15c0c078e65dfd8c10cf646fcd556cc26a6f62d':
  Add support for widgets in user profiles
 2014-08-05 22:25:06 +00:00
Svet Ganov
c15c0c078e Add support for widgets in user profiles 
bug:14991269

Change-Id: I7f71787bf5e5278230063b9d3bafac96a0680682
 2014-08-05 15:21:25 -07:00
Adrian Roos
dac0890101 am 774b4a62: am 1f4049ed: Merge "Ask about redacted notifications after setting up a secure lock" into lmp-dev 
* commit '774b4a626a4c63096bef43c2957b14277349d605':
  Ask about redacted notifications after setting up a secure lock
 2014-08-05 19:16:49 +00:00
Adrian Roos
774b4a626a am 1f4049ed: Merge "Ask about redacted notifications after setting up a secure lock" into lmp-dev 
* commit '1f4049edfe1937ce19c7d93a5576ea03db83ad50':
  Ask about redacted notifications after setting up a secure lock
 2014-08-05 19:12:22 +00:00
John Spurlock
a229de9883 am 511cdef8: am 802ddf99: Settings: New application-level notification settings. 
* commit '511cdef85d8ba86fb34a907ab0a9170b095ee7cd':
  Settings: New application-level notification settings.
 2014-08-05 16:04:08 +00:00
John Spurlock
511cdef85d am 802ddf99: Settings: New application-level notification settings. 
* commit '802ddf99f57e316d0fd87c2cfeed5dc3a0cfa8fe':
  Settings: New application-level notification settings.
 2014-08-05 15:13:07 +00:00
John Spurlock
802ddf99f5 Settings: New application-level notification settings. 
- Convert the old application-level dialog to an activity.
 - Move the settings icon to the new activity (out of the list).
 - Add a custom application header, similar to the switch bar style.
 - Use the ubiquitous vector gear for the settings icon.
 - Migrate old checkboxes to switch prefs, add new summaries.
 - Remove obsolete artifacts.

Bug:16396715
Change-Id: I857e3cf448b79f44fe1c242e6020f5214434c00c
 2014-08-05 11:08:03 -04:00
Geoff Mendal
aec98bfd13 am 434220e9: (-s ours) am f3dfd182: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev 
* commit '434220e93cb3eb6df665b204238148f83c48b53e':
  Import translations. DO NOT MERGE
 2014-08-05 01:07:09 +00:00
Geoff Mendal
434220e93c am f3dfd182: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev 
* commit 'f3dfd182e17c91ae4cd9e40a96308b83fdaefb49':
  Import translations. DO NOT MERGE
 2014-08-05 01:03:22 +00:00
Adrian Roos
1f4049edfe Merge "Ask about redacted notifications after setting up a secure lock" into lmp-dev 2014-08-05 00:35:13 +00:00
Adrian Roos
6f60f7ed22 Ask about redacted notifications after setting up a secure lock 
Bug: 14437890
Change-Id: I54cf355242375e8c7968c7d27c441fbd0a54cef2
 2014-08-05 20:54:47 +02:00
Geoff Mendal
f3dfd182e1 Merge "Import translations. DO NOT MERGE" into lmp-dev 2014-08-05 00:34:22 +00:00
Geoff Mendal
c47db9c9fa Import translations. DO NOT MERGE 
Change-Id: If24e248354ae999208643fb8f91b0c0a9e7de233
Auto-generated-cl: translation import
 2014-08-04 17:35:58 -07:00
Etan Cohen
8e1b39f136 am 75de12c2: am 572d2539: Radio Information UI for enabling/disabling debug settings of MO over VoLTE 
* commit '75de12c2d6c8eecc11680d2cbef83e3998e9a084':
  Radio Information UI for enabling/disabling debug settings of MO over VoLTE
 2014-08-04 23:07:57 +00:00
Etan Cohen
75de12c2d6 am 572d2539: Radio Information UI for enabling/disabling debug settings of MO over VoLTE 
* commit '572d25398297049a4da3042d58b1ccecf3514e4d':
  Radio Information UI for enabling/disabling debug settings of MO over VoLTE
 2014-08-04 23:00:46 +00:00
Etan Cohen
572d253982 Radio Information UI for enabling/disabling debug settings of MO over VoLTE 
Change-Id: Ib05ff460ac6001c511113e80a63707a073908637
 2014-08-04 22:57:15 +00:00
Maurice Lam
d76cce8ba6 am aa2c4979: am 86163b6b: Merge "[WifiSetup] Fixed setup strings CHAR LIMIT" into lmp-dev 
* commit 'aa2c49799fabecec7145c09ccc54a693859cbf49':
  [WifiSetup] Fixed setup strings CHAR LIMIT
 2014-08-04 22:20:01 +00:00
Maurice Lam
aa2c49799f am 86163b6b: Merge "[WifiSetup] Fixed setup strings CHAR LIMIT" into lmp-dev 
* commit '86163b6bcd8da9ea77ef6a3f3cf84ab31780246d':
  [WifiSetup] Fixed setup strings CHAR LIMIT
 2014-08-04 22:15:16 +00:00
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