Alexandra Gherghina
ecd1fac93d
am 6d09e061
: am 4a45be2f
: Merge "Move global sync settings dialogs to the right screen" into lmp-dev
...
* commit '6d09e061ef6fd524e39b8d9ff87ba586c17c2d32':
Move global sync settings dialogs to the right screen
2014-07-29 15:36:14 +00:00
Alexandra Gherghina
13d7bc4c8a
am c7142442
: am 9017d3fd
: Update the resource name to the new ic_corp prefix one.
...
* commit 'c7142442e617c99d0a67ea0de5c57b26c4ca5206':
Update the resource name to the new ic_corp prefix one.
2014-07-29 15:31:52 +00:00
Alexandra Gherghina
6d09e061ef
am 4a45be2f
: Merge "Move global sync settings dialogs to the right screen" into lmp-dev
...
* commit '4a45be2ff83e1b3b9bd52be523639d100311bec3':
Move global sync settings dialogs to the right screen
2014-07-29 15:31:48 +00:00
Alexandra Gherghina
c7142442e6
am 9017d3fd
: Update the resource name to the new ic_corp prefix one.
...
* commit '9017d3fdd607b8978299578721303b8140a64c22':
Update the resource name to the new ic_corp prefix one.
2014-07-29 15:27:24 +00:00
Alexandra Gherghina
9017d3fdd6
Update the resource name to the new ic_corp prefix one.
...
Bug: 16369104
Change-Id: I0cd2188b0ac1806487678c568db068995a1e9142
2014-07-29 15:22:17 +00:00
Alexandra Gherghina
5667a6890a
Clears previously added cross-profile-intents
...
Clears the old cross-profile intent filters added by the Settings app.
This makes sure we do not have duplicates and also that there are no
outdated intents being forwarded (intents that do not exist any more).
Bug: 16647771
Change-Id: Ief4f7341e3f984b9435a9757bf469e53227ce2bf
2014-07-29 14:55:57 +01:00
Alexandra Gherghina
b5e8bf20a9
am 4b7e002b
: am a6145a65
: Toggle between primary and managed profile in App notif settings
...
* commit '4b7e002b7dc471b273b1a597c7ac03dc2220cd88':
Toggle between primary and managed profile in App notif settings
2014-07-29 13:29:13 +00:00
Alexandra Gherghina
4b7e002b7d
am a6145a65
: Toggle between primary and managed profile in App notif settings
...
* commit 'a6145a656af1241fd771038715cf839a8fce76e1':
Toggle between primary and managed profile in App notif settings
2014-07-29 13:24:25 +00:00
Zoltan Szatmary-Ban
536128294f
am 46c8a9bf
: am 0598e6f6
: Merge "Fix refresh issue of badged icons in Battery Settings" into lmp-dev
...
* commit '46c8a9bf8e90f58dd9003c2af836aa578221f1a9':
Fix refresh issue of badged icons in Battery Settings
2014-07-29 13:14:57 +00:00
Zoltan Szatmary-Ban
7832c0913d
am b77ef9be
: am 74f34e49
: Merge "Update Data Usage Settings for Enterprise" into lmp-dev
...
* commit 'b77ef9bee2595d5d375cde3cf829a153d668af0d':
Update Data Usage Settings for Enterprise
2014-07-29 13:14:56 +00:00
Alexandra Gherghina
ff05c1605f
am 0d78165a
: am 11b8bda9
: Refactors listening logic in AccountSettings
...
* commit '0d78165af6ad82f48c4a7cdf9f9a5aaf1bb57655':
Refactors listening logic in AccountSettings
2014-07-29 13:14:55 +00:00
Alexandra Gherghina
707c96533c
am 76cc239f
: am fe47a8dc
: Toggle between primary and managed profile in Print Settings
...
* commit '76cc239fba1555b96c43a7b3b404477e0d5bde68':
Toggle between primary and managed profile in Print Settings
2014-07-29 13:14:53 +00:00
Alexandra Gherghina
a6145a656a
Toggle between primary and managed profile in App notif settings
...
This adds a spinner to the app notifications 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: 16369104
Change-Id: I31c2fb4c0bc318fb8fa5c152621a29fd0c4bb403
2014-07-29 14:08:24 +01:00
Zoltan Szatmary-Ban
46c8a9bf8e
am 0598e6f6
: Merge "Fix refresh issue of badged icons in Battery Settings" into lmp-dev
...
* commit '0598e6f6842ad08af1d8dbb31aa3ddd3df7e37ed':
Fix refresh issue of badged icons in Battery Settings
2014-07-29 12:49:32 +00:00
Zoltan Szatmary-Ban
b77ef9bee2
am 74f34e49
: Merge "Update Data Usage Settings for Enterprise" into lmp-dev
...
* commit '74f34e496fc460842aa558512de03187f5ad9b2c':
Update Data Usage Settings for Enterprise
2014-07-29 12:49:27 +00:00
Alexandra Gherghina
0d78165af6
am 11b8bda9
: Refactors listening logic in AccountSettings
...
* commit '11b8bda93cf3acf3b699eeb479a99e09682a369d':
Refactors listening logic in AccountSettings
2014-07-29 12:49:26 +00:00
Alexandra Gherghina
76cc239fba
am fe47a8dc
: Toggle between primary and managed profile in Print Settings
...
* commit 'fe47a8dc89fe0393dae16b1c2152c901feab4dcb':
Toggle between primary and managed profile in Print Settings
2014-07-29 12:49:25 +00:00
Alexandra Gherghina
11b8bda93c
Refactors listening logic in AccountSettings
...
This is required to make sure that we do not leak broadcast receivers.
No user-visible changes are present.
Bug: 15466880
Change-Id: I90fcf9f8281a786948d862f48a3d7e7ac2bbe6ba
2014-07-29 11:19:15 +01:00
Alexandra Gherghina
fe47a8dc89
Toggle between primary and managed profile in Print Settings
...
This adds a spinner to the print 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: 16369104
Change-Id: I2556a331d09379c2a501bc6b192ab1631b5215f5
2014-07-29 10:22:15 +01:00
John Spurlock
c1e43caafc
am a758ad97
: am b8ec3434
: Settings: Carve out app-level notifcation settings dialog.
...
* commit 'a758ad97466c6c252060d38ae62d4c32a34bb3fb':
Settings: Carve out app-level notifcation settings dialog.
2014-07-29 02:19:52 +00:00
John Spurlock
a758ad9746
am b8ec3434
: Settings: Carve out app-level notifcation settings dialog.
...
* commit 'b8ec34346495245043933ac0f1b78781ae5054db':
Settings: Carve out app-level notifcation settings dialog.
2014-07-29 02:15:24 +00:00
John Spurlock
b8ec343464
Settings: Carve out app-level notifcation settings dialog.
...
Bug:16208321
Change-Id: I46574618518e8fe4cbef70e80204cc7bb7cb76e9
2014-07-28 22:10:46 -04:00
Fabrice Di Meglio
be2735dd66
am 17aff4af
: am 3a166613
: Merge "Fix bug #16384201 Security > "Device administrators" layout is wrong on N10 (tablet UI)" into lmp-dev
...
* commit '17aff4af2c51346dde614fc14d85fa7fb6465eca':
Fix bug #16384201 Security > "Device administrators" layout is wrong on N10 (tablet UI)
2014-07-29 02:08:37 +00:00
Fabrice Di Meglio
17aff4af2c
am 3a166613
: Merge "Fix bug #16384201 Security > "Device administrators" layout is wrong on N10 (tablet UI)" into lmp-dev
...
* commit '3a166613becfb8de08939616d2dd6d28c180a130':
Fix bug #16384201 Security > "Device administrators" layout is wrong on N10 (tablet UI)
2014-07-29 02:04:05 +00:00
Fabrice Di Meglio
9dcd1c9c3d
am 06db26bd
: am 54bac5f2
: Merge "Fix App Info padding" into lmp-dev
...
* commit '06db26bde9073975caa1b369b744968cbcfa32af':
Fix App Info padding
2014-07-29 01:39:12 +00:00
Fabrice Di Meglio
06db26bde9
am 54bac5f2
: Merge "Fix App Info padding" into lmp-dev
...
* commit '54bac5f2c6e58fca8d1aa5cb4f5ed053a3559c02':
Fix App Info padding
2014-07-29 01:35:46 +00:00
Fabrice Di Meglio
d173e0fc32
am bbd076c1
: am 173e3161
: Merge "Some code formatting" into lmp-dev
...
* commit 'bbd076c1f3d473e2aa37f9b15bb4807be1682ea6':
Some code formatting
2014-07-29 01:09:40 +00:00
Fabrice Di Meglio
bbd076c1f3
am 173e3161
: Merge "Some code formatting" into lmp-dev
...
* commit '173e31619a34436e8cb100fb30f0e3477b7edf8e':
Some code formatting
2014-07-29 01:03:58 +00:00
Maurice Lam
3db5fd1c53
am 45ca3fed
: am 569aec7b
: [WifiSetup] Fix auto-finish suppression logic
...
* commit '45ca3fedea0d12a3532de7bba8aa84e57781f52e':
[WifiSetup] Fix auto-finish suppression logic
2014-07-29 00:56:17 +00:00
Alan Viverette
4ebe479243
am 6c27489f
: am 744c6b22
: Remove TimePicker and DatePicker dialog themes
...
* commit '6c27489f4080dc8ba446992e10a1ae09beca1200':
Remove TimePicker and DatePicker dialog themes
2014-07-29 00:56:16 +00:00
Maurice Lam
45ca3fedea
am 569aec7b
: [WifiSetup] Fix auto-finish suppression logic
...
* commit '569aec7b4d6cc9e5268a059d9f18f271afadb706':
[WifiSetup] Fix auto-finish suppression logic
2014-07-29 00:47:59 +00:00
Alan Viverette
6c27489f40
am 744c6b22
: Remove TimePicker and DatePicker dialog themes
...
* commit '744c6b22513f3b51f035b2038a59d35c97c4da6c':
Remove TimePicker and DatePicker dialog themes
2014-07-29 00:47:58 +00:00
Maurice Lam
569aec7b4d
[WifiSetup] Fix auto-finish suppression logic
...
The flag needs to be saved into the instance state, and the flag is
set as soon as auto-finish occurs to avoid multi-launching the next
activity.
Bug: 16561238
Change-Id: I954b7ff77b2d2fc35684ea59cca7d7cd588a6aab
2014-07-29 00:07:38 +00:00
Alan Viverette
744c6b2251
Remove TimePicker and DatePicker dialog themes
...
Also moves TimePicker widget style to appropriate XML file / namespace.
BUG: 14973897
Change-Id: I0eb68a59d8f2800d37cc949c948689d47c34486f
2014-07-29 00:06:20 +00:00
Baligh Uddin
369c105b41
am ed62a1ab
: (-s ours) am c4108655
: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev
...
* commit 'ed62a1ab26f304f89b124990fe8c49b7979cf60d':
Import translations. DO NOT MERGE
2014-07-28 23:21:53 +00:00
Fabrice Di Meglio
e4b580732a
am 90bfe0cf
: am d197608e
: Merge "Fix bug #14323097 Launching Security from Settings search results ...show header as Settings instead of Security" into lmp-dev
...
* commit '90bfe0cf7e3ba44e5662a39d3a2f3b247abf8395':
Fix bug #14323097 Launching Security from Settings search results ...show header as Settings instead of Security
2014-07-28 23:21:52 +00:00
Baligh Uddin
ed62a1ab26
am c4108655
: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev
...
* commit 'c4108655e114631cf71b4f505357936e53469fe4':
Import translations. DO NOT MERGE
2014-07-28 23:15:48 +00:00
Fabrice Di Meglio
90bfe0cf7e
am d197608e
: Merge "Fix bug #14323097 Launching Security from Settings search results ...show header as Settings instead of Security" into lmp-dev
...
* commit 'd197608e8340765e736c234dabffae8d3dc695e1':
Fix bug #14323097 Launching Security from Settings search results ...show header as Settings instead of Security
2014-07-28 23:15:47 +00:00
Fabrice Di Meglio
3a166613be
Merge "Fix bug #16384201 Security > "Device administrators" layout is wrong on N10 (tablet UI)" into lmp-dev
2014-07-28 22:45:16 +00:00
Fabrice Di Meglio
402c4515db
Fix bug #16384201 Security > "Device administrators" layout is wrong on N10 (tablet UI)
...
- add correct padding
Change-Id: I08a34839f94e899469b429dd83e301c5418155f5
2014-07-28 18:55:29 -07:00
Fabrice Di Meglio
0f4a779214
Fix App Info padding
...
- need to add to the previous defined on instead of replacing it
- verified also that Notification Station padding is ok too
See bug: #13140648 Settings needs to support the new Quantum Paper theme
Change-Id: I06394bec2a5baa548f34f3fe7ec19d60172a98e8
2014-07-28 18:25:14 -07:00
Fabrice Di Meglio
9e041f02ec
Some code formatting
...
- add some extra lines into those XML layout files
Change-Id: I13c004f23a5c59d46702a93b1cfa7e9b9587b8c2
2014-07-28 17:54:30 -07:00
Fabrice Di Meglio
1d5b910f1c
Fix bug #14323097 Launching Security from Settings search results
...
...show header as Settings instead of Security
- add missing title to a few fragments
Change-Id: I74fb95ca58269ff1c77afa20ed40e7042873130c
2014-07-28 15:47:21 -07:00
Fabrice Di Meglio
173e31619a
Merge "Some code formatting" into lmp-dev
2014-07-28 22:45:16 +00:00
Fabrice Di Meglio
d197608e83
Merge "Fix bug #14323097 Launching Security from Settings search results ...show header as Settings instead of Security" into lmp-dev
2014-07-28 22:45:16 +00:00
Jeff Davidson
2eb61429f8
am 92126c1c
: am 6207391a
: Fix strings for Wi-Fi Assistant dialog.
...
* commit '92126c1c9cee744b6874cfd8390f0905c624a6d7':
Fix strings for Wi-Fi Assistant dialog.
2014-07-28 20:45:54 +00:00
Jeff Davidson
92126c1c9c
am 6207391a
: Fix strings for Wi-Fi Assistant dialog.
...
* commit '6207391ac240d130194f1a0cad7b5f10535d45ac':
Fix strings for Wi-Fi Assistant dialog.
2014-07-28 20:41:15 +00:00
Jeff Davidson
6207391ac2
Fix strings for Wi-Fi Assistant dialog.
...
Remove some redundant strings that are no longer needed.
Change-Id: I039839989358efa322bac13129d91f7c764fd387
2014-07-28 13:35:41 -07:00
PauloftheWest
77bfc2bcec
am 77ae82b0
: am 34652902
: Merge "Removed Wi-Fi icon from Saved Networks." into lmp-dev
...
* commit '77ae82b05192bbc02e7303f3b4b353739004b6b8':
Removed Wi-Fi icon from Saved Networks.
2014-07-28 20:07:24 +00:00
PauloftheWest
77ae82b051
am 34652902
: Merge "Removed Wi-Fi icon from Saved Networks." into lmp-dev
...
* commit '346529021de468cbf98fc419c6bab04dc3f3fc52':
Removed Wi-Fi icon from Saved Networks.
2014-07-28 20:03:10 +00:00