Merge "Make TTS setting transition animation consistent." into lmp-dev
Merge "Fix App Notification layout for tabletUI support" into lmp-dev
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 e0d519f3cf1323f7c83971b6d75f11788d4c961b)
Merge "Fix Notification Access layout for tabletUI support" into lmp-dev
Remove unused and unnecessary code from subtype enabler

Change-Id: I9935b5bda8ae7cd1ce2d20ee6c4622eeb9a02b6a
Follow API change from *Blocked to *Hidden

Bug: 16191518
Change-Id: I4cbe210e62d551e4d5246eb3a7523d03c41175be
Merge "Remove unused and unnecessary code from subtype enabler" into lmp-dev
Merge "Add the capability to set a pinned header to SettingsPreferenceFragment" into lmp-dev
Remove inversion quick settings toggle

Also removes remnants of contrast preference screen.

BUG: 16303790
Change-Id: I9833b53e187e5f41c0442bcbaf9b728d55577d88
Merge "Remove inversion quick settings toggle" into lmp-dev
Treat caption preview viewport as clipped 16:9 aspect

Also adds standard start/end padding to preview frame.

BUG: 16462107
Change-Id: I89001d1656cee0c2d8abd95eae09975307b1ff06
Merge "Treat caption preview viewport as clipped 16:9 aspect" into lmp-dev
Merge "Add the capability to set a pinned header to a ListFragment" into lmp-dev
Merge "Remove fake 8dp padding on N7 devices" into lmp-dev
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
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
Revert "Move global sync settings to AccountSettings."

This reverts commit 64fde6f4e9404a363f577a9fda424affcb5138e4.

Change-Id: I61940b6e2936c7c7f048af222602226e5588c268
Fix and simplify advanced security settings layout

Provides correct padding for tablets and sets background
drawable.

Bug: 16382821
Change-Id: I0aa0c9f8c6fccb6c201e78075c37a7c7e2315d07
Settings: No really, keep the trailing space.

Bug:16487510
Change-Id: Ic10ace9803c7d488240d819427ffec412a10d81a
Merge "Settings: No really, keep the trailing space." into lmp-dev