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
1909e7db89
am 1f539374: Use SwitchPreference for input method subtype enabler
...
* commit '1f53937469095f268d4c7a21d93f821a341a151d':
Use SwitchPreference for input method subtype enabler
2014-07-22 17:37:01 +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
Baligh Uddin
53514a8df0
am 615843b7: (-s ours) am 601ce0b9: (-s ours) am 64a83092: (-s ours) Import translations. DO NOT MERGE
...
* commit '615843b7316ad0c902daa840381059c97fb4af27':
Import translations. DO NOT MERGE
2014-07-22 17:32:48 +00:00
Tadashi G. Takaoka
5aa556322c
am 686c2503: Merge "Use OnPreferenceChangeLister for subtype enabler" into lmp-dev
...
* commit '686c250323553231f5b314525b221f7000e88572':
Use OnPreferenceChangeLister for subtype enabler
2014-07-22 17:27:20 +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
Baligh Uddin
615843b731
am 601ce0b9: (-s ours) am 64a83092: (-s ours) Import translations. DO NOT MERGE
...
* commit '601ce0b98a18084dce5a0d74a66b20e57297aa55':
Import translations. DO NOT MERGE
2014-07-22 17:22:01 +00:00
Baligh Uddin
601ce0b98a
am 64a83092: (-s ours) Import translations. DO NOT MERGE
...
* commit '64a830925096f8ca843ae0685dea9d171bd256ee':
Import translations. DO NOT MERGE
2014-07-22 17:14:41 +00:00
Baligh Uddin
04c5b35d6e
Import translations. DO NOT MERGE
...
Change-Id: Ie683e8b74d9ca12391a9c48713a7d736efc4a338
Auto-generated-cl: translation import
2014-07-22 17:08:22 +00:00
Baligh Uddin
64a8309250
Import translations. DO NOT MERGE
...
Change-Id: I9f9207a53b8bc1f312ae7e8c6f4bb3b259dba370
Auto-generated-cl: translation import
2014-07-22 17:04:41 +00:00
Alan Viverette
7e974f4c84
Merge "Reset color space when development options are disabled" into lmp-dev
2014-07-22 16:29:55 +00:00
Alan Viverette
65e00e5ac8
Reset color space when development options are disabled
...
BUG: 16306222
Change-Id: I4939a4fba8b0358333f6ff25ff8c405c5679579d
2014-07-22 11:10:58 -07:00
Fabrice Di Meglio
3f3426e0d9
Merge "Add Home / Launcher apps indexing" into lmp-dev
2014-07-22 16:21:19 +00:00
PauloftheWest
564282a3f4
Merge "Character limit updates" into lmp-dev
2014-07-22 16:13:36 +00:00
PauloftheWest
fb3060378f
Character limit updates
...
Bug: 16322106
Bug: 16321901
Change-Id: I776a86658e03a6bed5554a1020cf2c272cbeb49b
2014-07-23 10:11:43 -07:00
Adrian Roos
fd43c8d9c0
am b28e34f4: am 4c177cbd: am 2c22d6d2: Fix and simplify advanced security settings layout
...
* commit 'b28e34f4c54eb5c3110420551ff2e8a1bf78a9c3':
Fix and simplify advanced security settings layout
2014-07-22 14:14:32 +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
Adrian Roos
b28e34f4c5
am 4c177cbd: am 2c22d6d2: Fix and simplify advanced security settings layout
...
* commit '4c177cbd18136b3c60a1fe531f2d3d2cc5e5de26':
Fix and simplify advanced security settings layout
2014-07-22 13:56:36 +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
Adrian Roos
4c177cbd18
am 2c22d6d2: Fix and simplify advanced security settings layout
...
* commit '2c22d6d2040cc846dbaf5152191cc15c5c5995ab':
Fix and simplify advanced security settings layout
2014-07-22 13:36:39 +00:00
Alexandra Gherghina
c58595f225
am 4869faf4: Revert "Move global sync settings to AccountSettings."
...
* commit '4869faf46559c54a34b969b5ae5391a208e723af':
Revert "Move global sync settings to AccountSettings."
2014-07-22 13:36:39 +00:00
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