PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
15,436 Commits 1 Branch 0 Tags
f3aa4abd4b51c8d0fd51f95bc90586d465ec1712
Commit Graph

15436 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
cb4d523e0a Merge "Import translations. DO NOT MERGE" 2014-08-05 00:29:22 +00:00
Geoff Mendal
e9549f3f54 Import translations. DO NOT MERGE 
Change-Id: I28b69c77cd7ff36b91cc7f8ab634a16fb965fcd2
Auto-generated-cl: translation import
 2014-08-06 12:36:11 -07:00
Dan Sandler
6be9a8e779 am 3d90389f: am c242bf37: am bac0fc1f: Merge "Track moved Settings.Secure.LOCK_SCREEN_SHOW_NOTIFICATIONS." into lmp-dev 
* commit '3d90389f4e8a5dc8ac03535f4b8979969da2b9a4':
  Track moved Settings.Secure.LOCK_SCREEN_SHOW_NOTIFICATIONS.
 2014-08-06 18:17:00 +00:00
Dan Sandler
06fd8fd70d am 43b0f512: am 0ed91709: am 4bdf8b49: Merge "Replace missing resource." into lmp-dev 
* commit '43b0f512d10a4ca1c1e33744cfdc796b3d1aea9c':
  Replace missing resource.
 2014-08-06 18:08:44 +00:00
Fabrice Di Meglio
64579fcb17 am 0ecc58ff: am 911a54df: am bce84e79: Merge "Fix bug #16712121 Add \'Experimental\' substring to \'High contrast text\'" into lmp-dev 
* commit '0ecc58ff9bbc1d718156d094845d8363c28aec5a':
  Fix bug #16712121 Add 'Experimental' substring to 'High contrast text'
 2014-08-06 18:08:44 +00:00
Alexandra Gherghina
a55eb4b5ea am 1532a182: am a456d886: am 1fcd7faa: Merge "Clears previously added cross-profile-intents" into lmp-dev 
* commit '1532a1828d17d3147578d07227e89a4a3f3159bf':
  Clears previously added cross-profile-intents
 2014-08-06 17:39:41 +00:00
Dianne Hackborn
02ff050ed9 am 82a1b548: am b8e0e338: am dc77335e: Merge "Fix issue #16537318: clarify voice interaction strings." into lmp-dev 
* commit '82a1b548057363600eb6166febbb3baae5365836':
  Fix issue #16537318: clarify voice interaction strings.
 2014-08-06 17:36:02 +00:00
Svet Ganov
429d805afb am fbbd5cab: am 4f60e481: am c15c0c07: Add support for widgets in user profiles 
* commit 'fbbd5caba482c0686ee3c3548bfae852a8804eef':
  Add support for widgets in user profiles
 2014-08-06 17:34:21 +00:00
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
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
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
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
Geoff Mendal
a0b87a2436 Merge "Import translations. DO NOT MERGE" into lmp-dev 2014-08-05 00:29:22 +00:00
Geoff Mendal
8e89e6d644 Import translations. DO NOT MERGE 
Change-Id: I9d45348a4c9fab36e1c23ddf01b3c5c2cb535f56
Auto-generated-cl: translation import
 2014-08-06 12:23:02 -07:00
Zoltan Szatmary-Ban
ec08228ea9 Merge "Badge texts correctly for accessibility in Settings" into lmp-dev 2014-08-05 00:19:02 +00:00
Zoltan Szatmary-Ban
ebb36ec920 Badge texts correctly for accessibility in Settings 
If an app is a managed profile's app then its label should read correctly by TalkBack.
Affected screens: Data Usage, Location, Battery.

Bug:16053981
Change-Id: I393c0ebf56917032d619b1e39b4bf141ee236981
 2014-08-07 14:15:14 +01:00
Sander Alewijnse
6a39bc68ae Merge "Prevent launcher switching in Settings app." into lmp-dev 2014-08-05 00:19:02 +00:00
Sander Alewijnse
cd40220372 Prevent launcher switching in Settings app. 
User won't be able to switch to launchers that do not support
managed profiles.
Additional explanation is shown in text under the name of the
launcher.

Bug:15099904

Change-Id: I12470bf396d41ef47d463ef42835964aacda9719
 2014-08-07 12:48:22 +01:00
Amith Yamasani
f34c350194 Merge "Fix removal of optional settings tiles" into lmp-dev 2014-08-05 00:19:02 +00:00
Amith Yamasani
57fd5fd84b Fix removal of optional settings tiles 
Bug: 16654819

Fix the way the tiles get removed so the index is not out of sync
and there's no double deletion of entries.

Change-Id: I18da6b633884f51418c11afb0e177b49ca085fd0
 2014-08-06 15:48:10 -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
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