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

14960 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Dan Sandler
3d90389f4e am c242bf37: am bac0fc1f: Merge "Track moved Settings.Secure.LOCK_SCREEN_SHOW_NOTIFICATIONS." into lmp-dev 
* commit 'c242bf375bcb63bf29f88bec6dc4167b2c43ec25':
  Track moved Settings.Secure.LOCK_SCREEN_SHOW_NOTIFICATIONS.
 2014-08-06 18:09:17 +00:00
Dan Sandler
c242bf375b am bac0fc1f: Merge "Track moved Settings.Secure.LOCK_SCREEN_SHOW_NOTIFICATIONS." into lmp-dev 
* commit 'bac0fc1f6b448c41f9f3889cba2b93c718dc1788':
  Track moved Settings.Secure.LOCK_SCREEN_SHOW_NOTIFICATIONS.
 2014-08-06 18:05:45 +00:00
Dan Sandler
43b0f512d1 am 0ed91709: am 4bdf8b49: Merge "Replace missing resource." into lmp-dev 
* commit '0ed917098e7295dcc6f346df7e5adc19ead3f7da':
  Replace missing resource.
 2014-08-06 18:05:05 +00:00
Fabrice Di Meglio
0ecc58ff9b am 911a54df: am bce84e79: Merge "Fix bug #16712121 Add \'Experimental\' substring to \'High contrast text\'" into lmp-dev 
* commit '911a54df7de994a5a4b3c2593e268fcca772aa19':
  Fix bug #16712121 Add 'Experimental' substring to 'High contrast text'
 2014-08-06 18:05:04 +00:00
Dan Sandler
0ed917098e am 4bdf8b49: Merge "Replace missing resource." into lmp-dev 
* commit '4bdf8b498bf588f42368faf822f757fcd97a7959':
  Replace missing resource.
 2014-08-06 18:01:41 +00:00
Fabrice Di Meglio
911a54df7d am bce84e79: Merge "Fix bug #16712121 Add \'Experimental\' substring to \'High contrast text\'" into lmp-dev 
* commit 'bce84e798bbfbb9fd576cb785d90bf69cb3843e0':
  Fix bug #16712121 Add 'Experimental' substring to 'High contrast text'
 2014-08-06 18:01:40 +00:00
Fabrice Di Meglio
bce84e798b Merge "Fix bug #16712121 Add 'Experimental' substring to 'High contrast text'" into lmp-dev 2014-08-06 17:19:40 +00:00
Fabrice Di Meglio
df77106e94 Fix bug #16712121 Add 'Experimental' substring to 'High contrast text' 
- add "(Experimental)" as a summary text for "High contrast text"

Change-Id: I6faf1ea382e90a4f0dffcc8a093e4aa5a4653d23
 2014-08-06 10:55:39 -07:00
Alexandra Gherghina
1532a1828d am a456d886: am 1fcd7faa: Merge "Clears previously added cross-profile-intents" into lmp-dev 
* commit 'a456d886644052e9c32a826f32aaaa089e0104ee':
  Clears previously added cross-profile-intents
 2014-08-06 13:49:55 +00:00
Alexandra Gherghina
a456d88664 am 1fcd7faa: Merge "Clears previously added cross-profile-intents" into lmp-dev 
* commit '1fcd7faad666cfb56553c7313723a5c6fc8df3cb':
  Clears previously added cross-profile-intents
 2014-08-06 13:45:43 +00:00
Dianne Hackborn
82a1b54805 am b8e0e338: am dc77335e: Merge "Fix issue #16537318: clarify voice interaction strings." into lmp-dev 
* commit 'b8e0e338c49a122a770b53b9ce2543b026a79ce8':
  Fix issue #16537318: clarify voice interaction strings.
 2014-08-06 01:19:35 +00:00
Dianne Hackborn
b8e0e338c4 am dc77335e: Merge "Fix issue #16537318: clarify voice interaction strings." into lmp-dev 
* commit 'dc77335eda0edee8e8a72d04155aacad91ddc12c':
  Fix issue #16537318: clarify voice interaction strings.
 2014-08-06 01:13:15 +00:00
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
Dan Sandler
bac0fc1f6b Merge "Track moved Settings.Secure.LOCK_SCREEN_SHOW_NOTIFICATIONS." into lmp-dev 2014-08-05 00:35:13 +00:00
Dan Sandler
3e2afb6ef7 Track moved Settings.Secure.LOCK_SCREEN_SHOW_NOTIFICATIONS. 
Bug: 15331132
Change-Id: Ia80ccb2cfdf60116bd50601e60ff131619eafcc5
 2014-08-06 13:53:25 -04:00
Dan Sandler
a15e76d113 Replace missing resource. 
Bug: 16833578
Change-Id: I9ad1dc992577f6bfdc9d1201b6c13591a32f3fc8
 2014-08-06 13:53:25 -04:00
Dan Sandler
4bdf8b498b Merge "Replace missing resource." into lmp-dev 2014-08-05 00:35:13 +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
Alexandra Gherghina
1fcd7faad6 Merge "Clears previously added cross-profile-intents" into lmp-dev 2014-08-05 00:15:52 +00:00
Dianne Hackborn
dc77335eda Merge "Fix issue #16537318: clarify voice interaction strings." into lmp-dev 2014-08-04 23:42:57 +00:00
Dianne Hackborn
c783d23d52 Fix issue #16537318: clarify voice interaction strings. 
Change-Id: I7e2c379e28447fa83ecf9c53b064d7917253b880
 2014-08-05 14:45:53 -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