Commit Graph

6442 Commits

Author SHA1 Message Date
Tadashi G. Takaoka
e10bb11144 am d00a99d7: am 1909e7db: am 1f539374: Use SwitchPreference for input method subtype enabler
* commit 'd00a99d710457993ca3fbd8142df789280d33107':
  Use SwitchPreference for input method subtype enabler
2014-07-22 17:46:42 +00:00
Tadashi G. Takaoka
d00a99d710 am 1909e7db: am 1f539374: Use SwitchPreference for input method subtype enabler
* commit '1909e7db89b80798d13973a60a264687a2420486':
  Use SwitchPreference for input method subtype enabler
2014-07-22 17:43:33 +00:00
Tadashi G. Takaoka
14bfedca72 am 9ddc7821: am 5aa55632: am 686c2503: Merge "Use OnPreferenceChangeLister for subtype enabler" into lmp-dev
* commit '9ddc782101b2df3f418b0b5e1b36c561772b6ecd':
  Use OnPreferenceChangeLister for subtype enabler
2014-07-22 17:42:25 +00:00
Tadashi G. Takaoka
9ddc782101 am 5aa55632: am 686c2503: Merge "Use OnPreferenceChangeLister for subtype enabler" into lmp-dev
* commit '5aa556322c672ff112e68019ae9e3396aae20b81':
  Use OnPreferenceChangeLister for subtype enabler
2014-07-22 17:34:54 +00:00
Tadashi G. Takaoka
1f53937469 Use SwitchPreference for input method subtype enabler
Bug: 15781377
Change-Id: I80fe987e499722af7768147a184934650bbf8385
2014-07-22 17:22:15 +00:00
Alexandra Gherghina
b9a8e722fa am 7258665b: am c58595f2: am 4869faf4: Revert "Move global sync settings to AccountSettings."
* commit '7258665bd0a6b5693cf0b38faaee16af9d20bae9':
  Revert "Move global sync settings to AccountSettings."
2014-07-22 14:14:32 +00:00
Alexandra Gherghina
4443270ad4 am 6c92599f: am 761dad79: am 64fde6f4: Move global sync settings to AccountSettings.
* commit '6c92599f369fb884a9affa7dcf9fcedcec111257':
  Move global sync settings to AccountSettings.
2014-07-22 14:14:31 +00:00
Dianne Hackborn
84c94b10ae am a467c341: am fb420af3: am ff795ffb: Unify voice interactor and recognizer settings.
* commit 'a467c3410a68930b04cfddd890f7ffd71e0dd6ed':
  Unify voice interactor and recognizer settings.
2014-07-22 13:58:05 +00:00
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
a2b607e187 am 77d20aab: am f2c1502f: am 65e89f6e: Merge "Add the capability to set a pinned header to a ListFragment" into lmp-dev
* commit '77d20aab65b0942ed042529c811470e7ff60c1f9':
  Add the capability to set a pinned header to a ListFragment
2014-07-22 00:43:13 +00: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
85f34c0a3b am 44670421: am 84202957: am dd9dcb43: Merge "Treat caption preview viewport as clipped 16:9 aspect" into lmp-dev
* commit '4467042128889665004cabe866984e2c1fbd2c85':
  Treat caption preview viewport as clipped 16:9 aspect
2014-07-22 00:25:34 +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
6c639e2239 am 09a6c93d: am 32cc3b89: am c94e7e61: Merge "Remove inversion quick settings toggle" into lmp-dev
* commit '09a6c93dba0265c9b0e39b347cfbfc44e3241b2e':
  Remove inversion quick settings toggle
2014-07-22 00:04:37 +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
b9cd7037ca am cc23dff5: am 10abcdcb: am aed4c728: Merge "Add the capability to set a pinned header to SettingsPreferenceFragment" into lmp-dev
* commit 'cc23dff5d79e2ebef28d219a6e8502427333558f':
  Add the capability to set a pinned header to SettingsPreferenceFragment
2014-07-21 23:38:28 +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
2c403fbaaf am c719aba7: am 235d64cf: am 40aeac90: Merge "Remove unused and unnecessary code from subtype enabler" into lmp-dev
* commit 'c719aba7eeb39905548f581faeac830b99fd1695':
  Remove unused and unnecessary code from subtype enabler
2014-07-21 22:42:05 +00:00
Amith Yamasani
d1f0e74204 am 749e7eec: am 05a10c60: am fca31ca4: Follow API change from *Blocked to *Hidden
* commit '749e7eec390c4f3dd417587318f43dfe859da52d':
  Follow API change from *Blocked to *Hidden
2014-07-21 22:37:10 +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
f4e7435416 am 02069663: am c8c4b092: am fecda618: Merge "Fix Notification Access layout for tabletUI support" into lmp-dev
* commit '02069663bca4b7bf5f06580d8d5f78871b32edfc':
  Fix Notification Access layout for tabletUI support
2014-07-21 21:00:41 +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
3f185fa71e am 6076eb03: am edfe312d: am 592a17aa: Merge "Fix bug #16451628 Settings app crashes for intent: android.settings.ACTION_APP_NOTIFICATION_SETTINGS" into lmp-dev
* commit '6076eb039982a09af3d4be3f478d71459a04783f':
  Fix bug #16451628 Settings app crashes for intent: android.settings.ACTION_APP_NOTIFICATION_SETTINGS
2014-07-21 19:24:38 +00:00
Fabrice Di Meglio
787270b5c9 am bc84cfff: am a02a7be9: am 6d26c173: Merge "Fix AppDetails padding on tablet UI" into lmp-dev
* commit 'bc84cffff06d517199832972731220e2930fedd0':
  Fix AppDetails padding on tablet UI
2014-07-21 19:24:11 +00:00
Jason Monk
956cc191df am 08ac9bc6: am 77fe5373: am 724ec85e: Merge "Add Screen pinning back to settings" into lmp-dev
* commit '08ac9bc6063af2e265964e1c8d650da536af10b7':
  Add Screen pinning back to settings
2014-07-21 19:23:46 +00:00
Przemyslaw Szczepaniak
6a389228b0 am 73e7cf4e: am d49dd702: am d7bdf17a: Merge "Make TTS setting transition animation consistent." into lmp-dev
* commit '73e7cf4e3acf1278a75b25861b2e32ac1efe0b8b':
  Make TTS setting transition animation consistent.
2014-07-21 19:21:20 +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
Tadashi G. Takaoka
41cafe0e6b am ddd69ec4: am 05f5734c: am a2291259: Merge "Fix Settings behavior when disabling current IME" into lmp-dev
* commit 'ddd69ec46625b275c9a096f5da9e1b8abccb2038':
  Fix Settings behavior when disabling current IME
2014-07-21 18:22:21 +00:00
Tadashi G. Takaoka
149c55d3e3 am a1fa8066: am ecf1b79f: am 721e63fc: Merge "Remove unnecessary saved persistent preference" into lmp-dev
* commit 'a1fa80662cb9300fe80781df9d671a92376a2620':
  Remove unnecessary saved persistent preference
2014-07-21 18:22:17 +00:00
Fabrice Di Meglio
62213cd002 am 8cd29142: am 7ca153f1: am 6f404853: Merge "Fix Utils.prepareCustomPreferencesList()" into lmp-dev
* commit '8cd29142ccd38ba30d911be1b016befdc999040a':
  Fix Utils.prepareCustomPreferencesList()
2014-07-21 18:22:16 +00:00
Fabrice Di Meglio
142bf41b70 am a4eebd87: am 595b61eb: am 39a2cbb3: Merge "Fix the way we select and apply Themes" into lmp-dev
* commit 'a4eebd87d29b5e240103eb1f2fa3740efe560633':
  Fix the way we select and apply Themes
2014-07-21 18:22:15 +00:00
Fabrice Di Meglio
1d325a06e4 am 18289813: am ce0e3008: am 84dfc0b5: Merge "Fix overdraw and do some layout optimizations" into lmp-dev
* commit '182898133b0de8666bab94022a26c4c39e7030c0':
  Fix overdraw and do some layout optimizations
2014-07-21 18:22:14 +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