Alexandra Gherghina
7258665bd0
am c58595f2: am 4869faf4: Revert "Move global sync settings to AccountSettings."
...
* commit 'c58595f22562c25af75ee1c2088abaaed0ac18a4':
Revert "Move global sync settings to AccountSettings."
2014-07-22 13:56:36 +00:00
Alexandra Gherghina
6c92599f36
am 761dad79: am 64fde6f4: Move global sync settings to AccountSettings.
...
* commit '761dad7901f49e47d8ce5655f77125c7ed428484':
Move global sync settings to AccountSettings.
2014-07-22 13:56:35 +00:00
Dianne Hackborn
a467c3410a
am fb420af3: am ff795ffb: Unify voice interactor and recognizer settings.
...
* commit 'fb420af379a42fa6d8ca5e766fbfa663a321e825':
Unify voice interactor and recognizer settings.
2014-07-22 13:38:43 +00:00
Alexandra Gherghina
4869faf465
Revert "Move global sync settings to AccountSettings."
...
This reverts commit 64fde6f4e9 .
Change-Id: I61940b6e2936c7c7f048af222602226e5588c268
2014-07-22 12:01:54 +00:00
Alexandra Gherghina
64fde6f4e9
Move global sync settings to AccountSettings.
...
It also makes AccountSettings respond to the SYNC_SETTINGS intent, which
it is currently triggered by Calendar and could be triggered by Gmail.
Bug: 16076571
Change-Id: I2c55262a87e46ba88f36a90a2f8f27d08f88e851
2014-07-22 12:00:10 +00:00
Dianne Hackborn
ff795ffba8
Unify voice interactor and recognizer settings.
...
There is now one settings UI to select both the new
voice interactor and old voice recognizer.
There are still a few wonky things about this that won't
be resolved until we start requiring that all interactors
specify an associated recognizer service.
Change-Id: Ib702ff717fb28bcb244cb30e49577066ddc9f197
2014-07-21 20:14:43 -07:00
Fabrice Di Meglio
77d20aab65
am f2c1502f: am 65e89f6e: Merge "Add the capability to set a pinned header to a ListFragment" into lmp-dev
...
* commit 'f2c1502f522da31667781d5f95f22e1532a68cce':
Add the capability to set a pinned header to a ListFragment
2014-07-22 00:38:22 +00:00
Alan Viverette
4467042128
am 84202957: am dd9dcb43: Merge "Treat caption preview viewport as clipped 16:9 aspect" into lmp-dev
...
* commit '84202957f7570933d89d3956d075bf93777388c2':
Treat caption preview viewport as clipped 16:9 aspect
2014-07-22 00:20:59 +00:00
Alan Viverette
09a6c93dba
am 32cc3b89: am c94e7e61: Merge "Remove inversion quick settings toggle" into lmp-dev
...
* commit '32cc3b89b448863b5057183fb0e0c24b6771e9e8':
Remove inversion quick settings toggle
2014-07-22 00:00:12 +00:00
Fabrice Di Meglio
cc23dff5d7
am 10abcdcb: am aed4c728: Merge "Add the capability to set a pinned header to SettingsPreferenceFragment" into lmp-dev
...
* commit '10abcdcba155cb3c2a79fd57e4c80be61b018e3a':
Add the capability to set a pinned header to SettingsPreferenceFragment
2014-07-21 23:33:18 +00:00
Tadashi G. Takaoka
c719aba7ee
am 235d64cf: am 40aeac90: Merge "Remove unused and unnecessary code from subtype enabler" into lmp-dev
...
* commit '235d64cf5eb30c5d0a57d5225691d6f5322e63e7':
Remove unused and unnecessary code from subtype enabler
2014-07-21 22:36:42 +00:00
Amith Yamasani
749e7eec39
am 05a10c60: am fca31ca4: Follow API change from *Blocked to *Hidden
...
* commit '05a10c6088ae1c87cb1f32263aec8d6c5f2a0006':
Follow API change from *Blocked to *Hidden
2014-07-21 22:32:26 +00:00
Amith Yamasani
fca31ca418
Follow API change from *Blocked to *Hidden
...
Bug: 16191518
Change-Id: I4cbe210e62d551e4d5246eb3a7523d03c41175be
2014-07-21 22:19:09 +00:00
Fabrice Di Meglio
02069663bc
am c8c4b092: am fecda618: Merge "Fix Notification Access layout for tabletUI support" into lmp-dev
...
* commit 'c8c4b092e99fb0349e5da4d58cd68ce55eb0c40d':
Fix Notification Access layout for tabletUI support
2014-07-21 20:56:32 +00:00
Fabrice Di Meglio
6076eb0399
am edfe312d: am 592a17aa: Merge "Fix bug #16451628 Settings app crashes for intent: android.settings.ACTION_APP_NOTIFICATION_SETTINGS" into lmp-dev
...
* commit 'edfe312d6de9f8adeca58c92b7447cd78a61a444':
Fix bug #16451628 Settings app crashes for intent: android.settings.ACTION_APP_NOTIFICATION_SETTINGS
2014-07-21 18:37:01 +00:00
Fabrice Di Meglio
bc84cffff0
am a02a7be9: am 6d26c173: Merge "Fix AppDetails padding on tablet UI" into lmp-dev
...
* commit 'a02a7be9dd8d56c959b76a1bd3296616f47dd474':
Fix AppDetails padding on tablet UI
2014-07-21 18:06:00 +00:00
Jason Monk
08ac9bc606
am 77fe5373: am 724ec85e: Merge "Add Screen pinning back to settings" into lmp-dev
...
* commit '77fe5373826508345824927692fea942cf6a828a':
Add Screen pinning back to settings
2014-07-21 17:28:47 +00:00
Przemyslaw Szczepaniak
b39af31668
am 892c3d31: am c0bffe71: Fix showing list of languages for picoTTS
...
* commit '892c3d31de11cad2639877322922fe745cd56f1e':
Fix showing list of languages for picoTTS
2014-07-21 15:47:51 +00:00
Alan Viverette
c94e7e611c
Merge "Remove inversion quick settings toggle" into lmp-dev
2014-07-21 15:43:35 +00:00
Alan Viverette
04e1acc12b
Remove inversion quick settings toggle
...
Also removes remnants of contrast preference screen.
BUG: 16303790
Change-Id: I9833b53e187e5f41c0442bcbaf9b728d55577d88
2014-07-21 22:46:20 +00:00
Fabrice Di Meglio
aed4c7284e
Merge "Add the capability to set a pinned header to SettingsPreferenceFragment" into lmp-dev
2014-07-21 15:43:35 +00:00
Fabrice Di Meglio
86159283c9
Add the capability to set a pinned header to SettingsPreferenceFragment
...
- add a FrameLayout into the preference list fragment
- add public void setPinnedHeaderView(View pinnedHeader) and
clearPinnedHeaderView() APIs for adding and clearing the pinned header
Change-Id: I50ba5dd150167e0d49cc54bee1203f46db6d7a66
2014-07-21 16:16:23 -07:00
Fabrice Di Meglio
20b32f25f0
Fix Notification Access layout for tabletUI support
...
- setup correct padding for the App list and its item
also remove showing FastScroller all the time on App Notification list
See bug: #13140648 Settings needs to support the new Quantum Paper theme
Change-Id: I11a70906f1372027622d50a81bc7744d48190f8a
2014-07-21 13:41:32 -07:00
Fabrice Di Meglio
dcf59dd82c
Fix bug #16451628 Settings app crashes for intent: android.settings.ACTION_APP_NOTIFICATION_SETTINGS
...
... and also crash with intent: android.settings.ACTION_OTHER_SOUND_SETTINGS
- add corresponding fragments to the ENTRY_FRAGMENTS array
Change-Id: Ic0c10841dfd7bc87d8573530129290ed172ff608
2014-07-21 11:22:20 -07:00
Alan Viverette
dd9dcb4377
Merge "Treat caption preview viewport as clipped 16:9 aspect" into lmp-dev
2014-07-21 15:42:19 +00:00
Alan Viverette
389287e5f8
Treat caption preview viewport as clipped 16:9 aspect
...
Also adds standard start/end padding to preview frame.
BUG: 16462107
Change-Id: I89001d1656cee0c2d8abd95eae09975307b1ff06
2014-07-21 23:50:15 +00:00
Tadashi G. Takaoka
40aeac90f1
Merge "Remove unused and unnecessary code from subtype enabler" into lmp-dev
2014-07-21 15:42:19 +00:00
Tadashi G. Takaoka
229ed1a784
Remove unused and unnecessary code from subtype enabler
...
Change-Id: I9935b5bda8ae7cd1ce2d20ee6c4622eeb9a02b6a
2014-07-21 14:56:22 -07:00
Fabrice Di Meglio
fecda6181d
Merge "Fix Notification Access layout for tabletUI support" into lmp-dev
2014-07-21 15:42:19 +00:00
Przemyslaw Szczepaniak
c0bffe7148
Fix showing list of languages for picoTTS
...
PicoTTS have a tendency to return a
CHECK_VOICE_DATA_MISSING_DATA for its CHECK_TTS_DATA
activity. This blanks the language selection preference.
The fix is to show languages selection for all
results of CHECK_TTS_DATA that are not a total failure
(TextToSpeech.Engine.CHECK_VOICE_DATA_FAIL).
Change-Id: I984d7cc9b0dc830ad2b8195a820f9b6fc4ddf1e0
(cherry picked from commit e0d519f3cf )
2014-07-21 15:38:16 +00:00
Przemyslaw Szczepaniak
73e7cf4e3a
am d49dd702: am d7bdf17a: Merge "Make TTS setting transition animation consistent." into lmp-dev
...
* commit 'd49dd702b1177062acefb8eae9720f2aaba1c028':
Make TTS setting transition animation consistent.
2014-07-21 12:40:25 +00:00
Tadashi G. Takaoka
ddd69ec466
am 05f5734c: am a2291259: Merge "Fix Settings behavior when disabling current IME" into lmp-dev
...
* commit '05f5734cc52b9eed8880d95d395ae82e2856e0c3':
Fix Settings behavior when disabling current IME
2014-07-20 18:07:56 +00:00
Tadashi G. Takaoka
a1fa80662c
am ecf1b79f: am 721e63fc: Merge "Remove unnecessary saved persistent preference" into lmp-dev
...
* commit 'ecf1b79f1622c526fb4dd86ed4f10fd8237a724e':
Remove unnecessary saved persistent preference
2014-07-20 18:04:19 +00:00
Fabrice Di Meglio
8cd29142cc
am 7ca153f1: am 6f404853: Merge "Fix Utils.prepareCustomPreferencesList()" into lmp-dev
...
* commit '7ca153f11704f8c16195a4e03de81140c1ca0088':
Fix Utils.prepareCustomPreferencesList()
2014-07-20 18:03:03 +00:00
Fabrice Di Meglio
a4eebd87d2
am 595b61eb: am 39a2cbb3: Merge "Fix the way we select and apply Themes" into lmp-dev
...
* commit '595b61eb3921fead66fc163d33d835e5ba378e7f':
Fix the way we select and apply Themes
2014-07-20 18:01:52 +00:00
Fabrice Di Meglio
182898133b
am ce0e3008: am 84dfc0b5: Merge "Fix overdraw and do some layout optimizations" into lmp-dev
...
* commit 'ce0e3008e8e6726e51195f01591666dc7bebf7f3':
Fix overdraw and do some layout optimizations
2014-07-20 17:59:33 +00:00
Fabrice Di Meglio
6d26c17380
Merge "Fix AppDetails padding on tablet UI" into lmp-dev
2014-07-20 04:41:30 +00:00
Jason Monk
724ec85e12
Merge "Add Screen pinning back to settings" into lmp-dev
2014-07-20 04:41:30 +00:00
Jason Monk
27d7ea56f3
Add Screen pinning back to settings
...
Adds a basic screen for screen pinning (previously lock-to-app) to
settings that describes the feature and allows it to be turned on
and off.
Bug: 16378448
Depends on Ide333463f86310eacb7a1d8b6dc7b1aea8722713 for Settings
constant
Change-Id: Id3ef8471794aa01de20efeb947bed95c50d6b954
2014-07-21 09:01:43 -04:00
Adam Lesinski
3a2a4720c1
am 3becea17: am 8d7be7b7: Update Settings to use new UsageStats API
...
* commit '3becea17e7f9bc15005e013787392d0a11ea8b73':
Update Settings to use new UsageStats API
2014-07-20 02:17:44 +00:00
Fabrice Di Meglio
65e89f6ecf
Merge "Add the capability to set a pinned header to a ListFragment" into lmp-dev
2014-07-19 22:40:06 +00:00
Fabrice Di Meglio
e72bb08679
Add the capability to set a pinned header to a ListFragment
...
- add public void setPinnedHeaderView(View pinnedHeader) and
clearPinnedHeaderView() APIs for adding and clearing the pinned header
Change-Id: I1096b418351c0f02a13fd49d4a19e52970125106
2014-07-21 17:25:42 -07:00
Tadashi G. Takaoka
a82c3824f3
Fix Settings behavior when disabling current IME
...
Bug: 16195373
Change-Id: I95d086e152b07e81aece773bc115ac0ac4517392
2014-07-19 17:29:28 -07:00
Fabrice Di Meglio
38ba9a2d43
Fix AppDetails padding on tablet UI
...
- force custom padding
See bug #: 13140648 Settings needs to support the new Quantum Paper theme
Change-Id: I5c26402c10a4e717cda22b320ab0790f598591c2
2014-07-18 19:58:50 -07:00
Fabrice Di Meglio
97a18c8111
Fix Utils.prepareCustomPreferencesList()
...
- and thus fix padding for all Fragments using it
See bug: #13140648 Settings needs to support the new Quantum Paper theme
Change-Id: I862c96d626ed906cbdafcfb40fa0e07bb804160f
2014-07-18 19:12:36 -07:00
Fabrice Di Meglio
712df6cb70
Fix the way we select and apply Themes
...
- do not override the DialogWhenLarge ones (they have their purpose)
- apply the correct Theme to SubSettings and then as a consequence
to the SwitchBar
Change-Id: I83adabf72da03051f03fbd2121e1e71217fc0c6a
2014-07-18 17:44:37 -07:00
Fabrice Di Meglio
d40dd45c18
Fix overdraw and do some layout optimizations
...
- use a specific layout for the Dashboard and for the Preferences
- use a specific background for the Dashboard and for the Preferences
The main idea here is that you cannot have the same layout / background
because the Dashboard is using the "Z elevation" for having its card
"poping up"
Change-Id: I42b7c91efea14315b8a60cf3876938a7f1d1e0b3
2014-07-18 16:33:32 -07:00
Jeff Davidson
d1c3840ede
am 2622bd75: am 878ca0ed: Merge "Link WifiAssistant card with actual settings." into lmp-dev
...
* commit '2622bd759967810b06608682a664fa4478bd8fd2':
Link WifiAssistant card with actual settings.
2014-07-18 22:09:14 +00:00
Adam Lesinski
8d7be7b738
Update Settings to use new UsageStats API
...
Change-Id: I89740d9b0c21f1ac6aa68feedc7730dd98b244c9
2014-07-18 14:35:54 -07:00
Maurice Lam
836e70f406
am a4980833: am b3f69cd1: Merge "[WifiSetup] Mechanism for suspending auto finish" into lmp-dev
...
* commit 'a498083303e08353574b551e4a236eb5251297b6':
[WifiSetup] Mechanism for suspending auto finish
2014-07-18 19:18:48 +00:00