Alexandra Gherghina
761dad7901
am 64fde6f4: Move global sync settings to AccountSettings.
...
* commit '64fde6f4e9404a363f577a9fda424affcb5138e4':
Move global sync settings to AccountSettings.
2014-07-22 13:36:38 +00:00
Dianne Hackborn
fb420af379
am ff795ffb: Unify voice interactor and recognizer settings.
...
* commit 'ff795ffba80e8a6455f27fab7ad0e8e14e2ec9a4':
Unify voice interactor and recognizer settings.
2014-07-22 12:18:00 +00:00
Adrian Roos
2c22d6d204
Fix and simplify advanced security settings layout
...
Provides correct padding for tablets and sets background
drawable.
Bug: 16382821
Change-Id: I0aa0c9f8c6fccb6c201e78075c37a7c7e2315d07
2014-07-22 12:08:44 +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
be99cfa1db
am 8ed3a2f6: am 794fb56f: am f6f1e2ba: Merge "Remove fake 8dp padding on N7 devices" into lmp-dev
...
* commit '8ed3a2f6d3913cd2b2442aa190078e49b78d53ec':
Remove fake 8dp padding on N7 devices
2014-07-22 02:40:18 +00:00
Fabrice Di Meglio
8ed3a2f6d3
am 794fb56f: am f6f1e2ba: Merge "Remove fake 8dp padding on N7 devices" into lmp-dev
...
* commit '794fb56fa4cb708758e07c66777f5949d86ec087':
Remove fake 8dp padding on N7 devices
2014-07-22 02:30:51 +00:00
Fabrice Di Meglio
794fb56fa4
am f6f1e2ba: Merge "Remove fake 8dp padding on N7 devices" into lmp-dev
...
* commit 'f6f1e2ba1382617cc4df76a004a0da4313a59129':
Remove fake 8dp padding on N7 devices
2014-07-22 02:21:52 +00:00
Fabrice Di Meglio
f0b952d045
Remove fake 8dp padding on N7 devices
...
- was a remaining artifact from a test
See bug: #13140648 Settings needs to support the new Quantum Paper theme
Change-Id: Ib39166213bb76ceb2319b21cb3651e7c43c4de68
2014-07-21 19:11:06 -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
Fabrice Di Meglio
f2c1502f52
am 65e89f6e: Merge "Add the capability to set a pinned header to a ListFragment" into lmp-dev
...
* commit '65e89f6ecfcf54cc0b8ac17e698bb422dd12e654':
Add the capability to set a pinned header to a ListFragment
2014-07-22 00:32:53 +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
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
84202957f7
am dd9dcb43: Merge "Treat caption preview viewport as clipped 16:9 aspect" into lmp-dev
...
* commit 'dd9dcb43778437358847e57c05c6926e42e47c62':
Treat caption preview viewport as clipped 16:9 aspect
2014-07-22 00:12:40 +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
Alan Viverette
32cc3b89b4
am c94e7e61: Merge "Remove inversion quick settings toggle" into lmp-dev
...
* commit 'c94e7e611cd4cacdcc4ae7297a476024a4ba3b5c':
Remove inversion quick settings toggle
2014-07-21 23:55:51 +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
Fabrice Di Meglio
10abcdcba1
am aed4c728: Merge "Add the capability to set a pinned header to SettingsPreferenceFragment" into lmp-dev
...
* commit 'aed4c7284ecdeb4353da0b5a90c11e2f598d733a':
Add the capability to set a pinned header to SettingsPreferenceFragment
2014-07-21 23:26:47 +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
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
Tadashi G. Takaoka
235d64cf5e
am 40aeac90: Merge "Remove unused and unnecessary code from subtype enabler" into lmp-dev
...
* commit '40aeac90f10c7ab6bd52e7200513b2eda7129904':
Remove unused and unnecessary code from subtype enabler
2014-07-21 22:29:50 +00:00
Amith Yamasani
05a10c6088
am fca31ca4: Follow API change from *Blocked to *Hidden
...
* commit 'fca31ca418ec9c8d09efd18d7616b816a3e9f94a':
Follow API change from *Blocked to *Hidden
2014-07-21 22:25:17 +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
c8c4b092e9
am fecda618: Merge "Fix Notification Access layout for tabletUI support" into lmp-dev
...
* commit 'fecda6181dcb4197268fd9846cf01207f5ae3249':
Fix Notification Access layout for tabletUI support
2014-07-21 20:52:35 +00: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
8d60714afa
am 6ae854a5: am a5977686: am 193cd11c: Merge "Fix App Notification layout for tabletUI support" into lmp-dev
...
* commit '6ae854a581858a31da0b94171d2b9059ddfe8fe3':
Fix App Notification layout for tabletUI support
2014-07-21 20:35:49 +00:00
Fabrice Di Meglio
6ae854a581
am a5977686: am 193cd11c: Merge "Fix App Notification layout for tabletUI support" into lmp-dev
...
* commit 'a59776860d621d8294bdad0f30f5dd1dab5834f2':
Fix App Notification layout for tabletUI support
2014-07-21 20:32:00 +00:00
Fabrice Di Meglio
a59776860d
am 193cd11c: Merge "Fix App Notification layout for tabletUI support" into lmp-dev
...
* commit '193cd11c4b52e313422b74fec46c792aec9a9c06':
Fix App Notification layout for tabletUI support
2014-07-21 20:28:07 +00:00
Fabrice Di Meglio
7bc9c1bce3
Fix App Notification layout for tabletUI support
...
- setup correct padding for the App list and its item
See bug: #13140648 Settings needs to support the new Quantum Paper theme
Change-Id: I6c14bb8abced59b636a3230e1daf783130f0f4d3
2014-07-21 13:19:06 -07: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
6bd02abc5e
am b39af316: am 892c3d31: am c0bffe71: Fix showing list of languages for picoTTS
...
* commit 'b39af31668c3a9ea9f3dc34fb8ad03d0f10aec8d':
Fix showing list of languages for picoTTS
2014-07-21 19:22:32 +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
Baligh Uddin
2ac7b04e67
am 13a4f88b: (-s ours) am a6ed6797: (-s ours) am 790b21d4: (-s ours) Import translations. DO NOT MERGE
...
* commit '13a4f88bbd5596c18180c78e252691c1f627d405':
Import translations. DO NOT MERGE
2014-07-21 19:21:19 +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
edfe312d6d
am 592a17aa: Merge "Fix bug #16451628 Settings app crashes for intent: android.settings.ACTION_APP_NOTIFICATION_SETTINGS" into lmp-dev
...
* commit '592a17aa3c1c88b576a1b342135fcf3f566bd9e4':
Fix bug #16451628 Settings app crashes for intent: android.settings.ACTION_APP_NOTIFICATION_SETTINGS
2014-07-21 18:31:39 +00:00
Baligh Uddin
5a5f13d8ab
am ffaa5a31: (-s ours) am 633b30ad: am 0f364cdf: Merge "Remove deprecated locales - DO NOT MERGE" into lmp-dev
...
* commit 'ffaa5a31a1d3b63f00133a9f5c60101a7ba3232c':
Remove deprecated locales - DO NOT MERGE
2014-07-21 18:22:22 +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
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