Zoltan Szatmary-Ban
9e07d6eb5b
am 9f6f453a: am 50946be4: am ec08228e: Merge "Badge texts correctly for accessibility in Settings" into lmp-dev
...
* commit '9f6f453a74e4021abce7148ba6d654cdf173a152':
Badge texts correctly for accessibility in Settings
2014-08-07 13:49:20 +00:00
Zoltan Szatmary-Ban
9f6f453a74
am 50946be4: am ec08228e: Merge "Badge texts correctly for accessibility in Settings" into lmp-dev
...
* commit '50946be41612f713f29041c39a1c324219c95b98':
Badge texts correctly for accessibility in Settings
2014-08-07 13:45:44 +00:00
Zoltan Szatmary-Ban
50946be416
am ec08228e: Merge "Badge texts correctly for accessibility in Settings" into lmp-dev
...
* commit 'ec08228ea9a3713fbfac05fe211fc931992788a2':
Badge texts correctly for accessibility in Settings
2014-08-07 13:41:42 +00:00
Sander Alewijnse
18c1fcf73a
am 400658ad: am 6173fed5: am 6a39bc68: Merge "Prevent launcher switching in Settings app." into lmp-dev
...
* commit '400658ad32a7c11b172557ebfab67cf423a20db7':
Prevent launcher switching in Settings app.
2014-08-07 12:05:38 +00:00
Sander Alewijnse
400658ad32
am 6173fed5: am 6a39bc68: Merge "Prevent launcher switching in Settings app." into lmp-dev
...
* commit '6173fed5a9afa1c410067e4840a3371b1c08490a':
Prevent launcher switching in Settings app.
2014-08-07 12:01:05 +00:00
Sander Alewijnse
6173fed5a9
am 6a39bc68: Merge "Prevent launcher switching in Settings app." into lmp-dev
...
* commit '6a39bc68aea91483804d2ab8635159803208095d':
Prevent launcher switching in Settings app.
2014-08-07 11:57:49 +00:00
Amith Yamasani
e36eaa3c8f
am 494a1e3f: am 23f8ea97: am f34c3501: Merge "Fix removal of optional settings tiles" into lmp-dev
...
* commit '494a1e3f7193718c1f12452ecf34f3ab3d2c8bdd':
Fix removal of optional settings tiles
2014-08-06 23:29:46 +00:00
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
d308d32c5e
am 4975290b: (-s ours) am 8116ff65: (-s ours) am a0b87a24: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev
...
* commit '4975290b2b311721ddeb76ee6a3de492f51afaa1':
Import translations. DO NOT MERGE
2014-08-06 23:01:06 +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
Fabrice Di Meglio
79e6107b4e
am 00acf0a6: am 6d327ca8: am fa8950be: Merge "Fix bug #16800261 Settings app: Device administrator screen padding issue" into lmp-dev
...
* commit '00acf0a64a5d62269adc567f164cc26e5b640b3b':
Fix bug #16800261 Settings app: Device administrator screen padding issue
2014-08-06 19:54:56 +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
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
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