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

15026 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Amith Yamasani
494a1e3f71 am 23f8ea97: am f34c3501: Merge "Fix removal of optional settings tiles" into lmp-dev 
* commit '23f8ea97ee444091103e177db09cd710dd27ee5a':
  Fix removal of optional settings tiles
 2014-08-06 23:25:53 +00:00
Amith Yamasani
23f8ea97ee am f34c3501: Merge "Fix removal of optional settings tiles" into lmp-dev 
* commit 'f34c3501948190acf44defefba8eb161ec6dc07b':
  Fix removal of optional settings tiles
 2014-08-06 23:21:29 +00:00
Geoff Mendal
4975290b2b am 8116ff65: (-s ours) am a0b87a24: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev 
* commit '8116ff6506bf884d1c0c4bac6d4b4d59c35eb9e8':
  Import translations. DO NOT MERGE
 2014-08-06 19:55:43 +00:00
Geoff Mendal
8116ff6506 am a0b87a24: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev 
* commit 'a0b87a2436c95777dcb3b3a14660105aa63d0b80':
  Import translations. DO NOT MERGE
 2014-08-06 19:50:48 +00:00
Fabrice Di Meglio
00acf0a64a am 6d327ca8: am fa8950be: Merge "Fix bug #16800261 Settings app: Device administrator screen padding issue" into lmp-dev 
* commit '6d327ca8d126e00bf8785b5752c4d75d09fa231c':
  Fix bug #16800261 Settings app: Device administrator screen padding issue
 2014-08-06 19:49:56 +00:00
Fabrice Di Meglio
6d327ca8d1 am fa8950be: Merge "Fix bug #16800261 Settings app: Device administrator screen padding issue" into lmp-dev 
* commit 'fa8950be33c777d0305775ee3a364300d454f91b':
  Fix bug #16800261 Settings app: Device administrator screen padding issue
 2014-08-06 19:07:31 +00:00
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
fa8950be33 Merge "Fix bug #16800261 Settings app: Device administrator screen padding issue" into lmp-dev 2014-08-06 17:19:40 +00:00
Fabrice Di Meglio
06601e149e Fix bug #16800261 Settings app: Device administrator screen padding issue 
- remove listPreferredItemPaddingStart / listPreferredItemPaddingEnd from
the ListView and add it to the list item
- add missing 8dp end padding for the icon

Change-Id: I78696e5ee8e243771d23c86fa178de2f60b5c88d
 2014-08-06 11:25:39 -07: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
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
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
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