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
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
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
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
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
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
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
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
Jason Monk
77fe537382
am 724ec85e
: Merge "Add Screen pinning back to settings" into lmp-dev
...
* commit '724ec85e12405f86948aa235f59426075081b361':
Add Screen pinning back to settings
2014-07-21 17:24:29 +00:00
Fabrice Di Meglio
f6f1e2ba13
Merge "Remove fake 8dp padding on N7 devices" into lmp-dev
2014-07-21 15:43:35 +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
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
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
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
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
Fabrice Di Meglio
fecda6181d
Merge "Fix Notification Access layout for tabletUI support" into lmp-dev
2014-07-21 15:42:19 +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
Baligh Uddin
633b30ad3f
am 0f364cdf
: Merge "Remove deprecated locales - DO NOT MERGE" into lmp-dev
...
* commit '0f364cdf63c7405ba30d814f30f6fa1fdfd65ee7':
Remove deprecated locales - DO NOT MERGE
2014-07-20 02:39:53 +00:00
Fabrice Di Meglio
193cd11c4b
Merge "Fix App Notification layout for tabletUI support" into lmp-dev
2014-07-19 22:40:06 +00:00
Fabrice Di Meglio
ce0e3008e8
am 84dfc0b5
: Merge "Fix overdraw and do some layout optimizations" into lmp-dev
...
* commit '84dfc0b5d64f9a7224e524794783080fc1b0419e':
Fix overdraw and do some layout optimizations
2014-07-19 00:06:37 +00: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
Adam Lesinski
3becea17e7
am 8d7be7b7
: Update Settings to use new UsageStats API
...
* commit '8d7be7b738cce9facdd8832aa845ceb79c19ffc6':
Update Settings to use new UsageStats API
2014-07-18 22:29:04 +00:00
Adam Lesinski
8d7be7b738
Update Settings to use new UsageStats API
...
Change-Id: I89740d9b0c21f1ac6aa68feedc7730dd98b244c9
2014-07-18 14:35:54 -07:00
Paul Lawrence
bf05242300
am 312927ab
: Material fixes for tablets
...
* commit '312927abd77b0884eed9aa2ca1de4d0c04b4165f':
Material fixes for tablets
2014-07-18 19:54:06 +00:00
Paul Lawrence
312927abd7
Material fixes for tablets
...
Remove wireframe Android from pattern screen
Remove tablet specific password entry - we don't have one for PIN, and
the password one looks awful.
Bug: 15328359
Change-Id: I3d73a346166641ab72ecf520f9fbe2ee1379fe8a
2014-07-18 19:49:26 +00:00
Fabrice Di Meglio
84dfc0b5d6
Merge "Fix overdraw and do some layout optimizations" into lmp-dev
2014-07-18 18:24:25 +00:00
PauloftheWest
72e4a85b5a
am 772cf206
: Merge "Minor string fixes for translation" into lmp-dev
...
* commit '772cf2061685e5c7df4b1ebedd1249243cde6f74':
Minor string fixes for translation
2014-07-18 18:12:45 +00:00
Amith Yamasani
66926227eb
am d0a057cc
: Merge "Improvements to user settings" into lmp-dev
...
* commit 'd0a057ccc89f65f0971a2e7c42758b0fedf7c501':
Improvements to user settings
2014-07-18 15:02:03 +00:00
Fabrice Di Meglio
c63f16ce0d
am c08c67be
: Merge "Fix alignment of ActionBar title and Preferences for tablet UI" into lmp-dev
...
* commit 'c08c67be886082c579983beceeac1d935d8e1c3b':
Fix alignment of ActionBar title and Preferences for tablet UI
2014-07-18 02:43:49 +00:00
Fabrice Di Meglio
3bd0515242
Fix alignment of ActionBar title and Preferences for tablet UI
...
- use the correct start/end padding
See bug: #15439371 Visual add white BG for Settings Detail
Change-Id: I391fb3c75c51349ffbc17295b3aac6f432f91b58
2014-07-17 19:36:14 -07:00
Tadashi G. Takaoka
740de4d39c
am 3ac7802e
: Fix duplicate string resources
...
* commit '3ac7802ee6c8b6d3e1befa7b3c6a970201fc3d24':
Fix duplicate string resources
2014-07-18 02:05:45 +00:00
Tadashi G. Takaoka
3ac7802ee6
Fix duplicate string resources
...
Change-Id: I33fd2e236f7462fc8a8fd14f56226e21d74a0311
2014-07-17 18:07:26 -07:00
Michael Wright
87b69c3030
am b8a90e50
: Merge "Add OP_PROJECT_MEDIA to AppOps" into lmp-dev
...
* commit 'b8a90e5042c0b112a44d7619fd2928bb92a4a6dc':
Add OP_PROJECT_MEDIA to AppOps
2014-07-17 22:03:58 +00:00
PauloftheWest
772cf20616
Merge "Minor string fixes for translation" into lmp-dev
2014-07-17 21:58:28 +00:00
PauloftheWest
60105a966a
Minor string fixes for translation
...
Bug: 16321903
Bug: 16321706
Bug: 16321066
Bug: 16321704
Change-Id: I65d0d8c89a8d0e7bf2ff2280aab32cd63b9fe369
2014-07-18 11:04:13 -07:00
Fabrice Di Meglio
c08c67be88
Merge "Fix alignment of ActionBar title and Preferences for tablet UI" into lmp-dev
2014-07-17 21:58:28 +00:00
Paul Lawrence
2126ac9fa1
am eb0628bb
: Merge "Final touches to material theme for phones" into lmp-dev
...
* commit 'eb0628bb02e5945acc0b5fe9da7082b279f043d6':
Final touches to material theme for phones
2014-07-17 21:04:25 +00:00
Michael Wright
b8a90e5042
Merge "Add OP_PROJECT_MEDIA to AppOps" into lmp-dev
2014-07-17 21:04:20 +00:00
Baligh Uddin
790b21d44d
Import translations. DO NOT MERGE
...
Change-Id: Iab323e1a057a52bb3408a7173fae984a2d9ff240
Auto-generated-cl: translation import
2014-07-20 14:53:03 -07:00
PauloftheWest
995448c76a
am 08ee22cb
: Merge "Removed extraneous string from strings.xml" into lmp-dev
...
* commit '08ee22cb35eadfdacfbb010fc157b3e5febbdd6e':
Removed extraneous string from strings.xml
2014-07-17 19:53:19 +00:00
Dianne Hackborn
d0a947692d
am be875db5
: Merge "Battery chart fixes." into lmp-dev
...
* commit 'be875db541d673aa62dd99acebc523a26018616e':
Battery chart fixes.
2014-07-17 19:25:51 +00:00
Baligh Uddin
0f364cdf63
Merge "Remove deprecated locales - DO NOT MERGE" into lmp-dev
2014-07-17 19:20:15 +00:00