Android/packages_apps_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
15,169 Commits 1 Branch 0 Tags
23c5e2c020b74cc0bbc779565a04935610f10e5e
Commit Graph

15169 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Adrian Roos
23c5e2c020 am dac08901: am 774b4a62: am 1f4049ed: Merge "Ask about redacted notifications after setting up a secure lock" into lmp-dev 
* commit 'dac0890101d7b422a86fd98483d1dc69015b3943':
  Ask about redacted notifications after setting up a secure lock
 2014-08-06 01:46:55 +00: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
af7b99e156 am a229de98: am 511cdef8: am 802ddf99: Settings: New application-level notification settings. 
* commit 'a229de9883cca049c882f688e918fc09764db67a':
  Settings: New application-level notification settings.
 2014-08-05 16:07:59 +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
feb37f5a38 am aec98bfd: (-s ours) am 434220e9: (-s ours) am f3dfd182: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev 
* commit 'aec98bfd138ffa127ddb2df4bef3571da2b80ddf':
  Import translations. DO NOT MERGE
 2014-08-05 01:11:01 +00: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
Geoff Mendal
31f9b19712 Merge "Import translations. DO NOT MERGE" 2014-08-05 00:34:22 +00:00
Geoff Mendal
7e403ef8fa Import translations. DO NOT MERGE 
Change-Id: Iacb475e5e04830517a0cf973e0692e8823475f1b
Auto-generated-cl: translation import
 2014-08-04 17:48:17 -07:00
Etan Cohen
d2db86fc4e am 8e1b39f1: am 75de12c2: am 572d2539: Radio Information UI for enabling/disabling debug settings of MO over VoLTE 
* commit '8e1b39f1365372ee201d1a5145561be9a5f1d3d9':
  Radio Information UI for enabling/disabling debug settings of MO over VoLTE
 2014-08-04 23:12:07 +00: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
f019b59266 am d76cce8b: am aa2c4979: am 86163b6b: Merge "[WifiSetup] Fixed setup strings CHAR LIMIT" into lmp-dev 
* commit 'd76cce8ba6889f78c0e940b0933d7f608c2e6fee':
  [WifiSetup] Fixed setup strings CHAR LIMIT
 2014-08-04 22:23:29 +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
262989cab6 am 4781e4a5: am 927b3dde: am 911de7fa: Settings: Wire up new doze opt-out setting. 
* commit '4781e4a5f9076f899738cdc91a523c98d41708b0':
  Settings: Wire up new doze opt-out setting.
 2014-08-04 19:13:59 +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
8f5767c3ac am ed36a8b1: am 3347624e: am 8c89e69b: Merge "Bluetooth: Multi HF support" into lmp-dev 
* commit 'ed36a8b134c33fc8b981b8dbf6d5859d70d358a0':
  Bluetooth: Multi HF support
 2014-08-04 00:24:33 +00: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
2621d33175 am 219a65cc: am 00265787: am 386e5ebb: Updated comments in strings.xml for translators. 
* commit '219a65cc0808e567a4ceff8d41197d3dae44207c':
  Updated comments in strings.xml for translators.
 2014-08-03 20:45:52 +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
99089e8990 am b86bd00a: am 0062d87a: am 249cf50b: Settings: Battery saver updates. 
* commit 'b86bd00a8862c6185fad1815345af662869fb68e':
  Settings: Battery saver updates.
 2014-08-03 02:02:21 +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
a567c6e1ef am 585d097b: am f712193b: am ca90af10: Toggle between profiles in VPN Settings 
* commit '585d097b65d4bfb1ac144972ee914084fca4cc21':
  Toggle between profiles in VPN Settings
 2014-08-01 21:00:38 +00:00
Zoltan Szatmary-Ban
b0a3e71e01 am 11ea340c: am 5120b21e: am f3d72098: Update Device Admins Settings screen 
* commit '11ea340c59abb7e521e6c9ad5250a5e28cbdb331':
  Update Device Admins Settings screen
 2014-08-01 20:59:20 +00:00
vandwalle
ec80c189f5 am 7809b159: 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 '7809b15975e34e30f37d1cae3aab0f3f15d0149e':
  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 20:59:17 +00:00
PauloftheWest
09db4fefd4 am dbaad4f9: am 3eb8a711: am 33734f58: Cheanged Call Manager\'s summary to be parameter. 
* commit 'dbaad4f99b70dfcc3aaf08d5e00852747afd08ee':
  Cheanged Call Manager's summary to be parameter.
 2014-08-01 20:59:16 +00:00
Svetoslav
650ca7a4c7 am a017a4a2: am f66c67db: am 0b4cf144: Merge "Removing lock screen app widget code" into lmp-dev 
* commit 'a017a4a202bf56708e1149e2235604a283e56b3b':
  Removing lock screen app widget code
 2014-08-01 20:59:15 +00:00
Amith Yamasani
e80f81accf am d1b5c1de: am f1602f81: am 9980cf7c: Merge "Dialog on phone shouldn\'t say tablet" into lmp-dev 
* commit 'd1b5c1deac126728c970e806e8bcfc04ac6bb87b':
  Dialog on phone shouldn't say tablet
 2014-08-01 20:59:14 +00:00
Adam Lesinski
f9890b6092 am 9b350ac6: am 6717ce01: am 366e7a20: Fix UsageStats permissions in Settings 
* commit '9b350ac6d0a4cf34b242f706339551f56ff3b477':
  Fix UsageStats permissions in Settings
 2014-08-01 20:59:14 +00:00
Alexandra Gherghina
aeac60adae am b5b10aa4: am 4d90a69d: am 80e1f1bf: Extract common functionality for profile spinner into Utils 
* commit 'b5b10aa4cf92db63ad4df2cf9a671e7bdc842843':
  Extract common functionality for profile spinner into Utils
 2014-08-01 20:59:13 +00:00
Alexandra Gherghina
a9d051ef4b am 1ea55469: am 9aaa3af4: am 6bcca8b7: Modify user spinner appearance to match mocks 
* commit '1ea554698e018da02d5a748b582d0496f68819e8':
  Modify user spinner appearance to match mocks
 2014-08-01 20:59:12 +00: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