git.osdn.net Git - android-x86/packages-apps-Settings.git/log

Alexandra Gherghina [Tue, 22 Jul 2014 21:47:30 +0000 (21:47 +0000)]

am 534b84e9: am 6d839875: Revert "Revert "Move global sync settings to AccountSettings.""

* commit '534b84e9f834b366a6fdccfe9f968c1b045f1377':
Revert "Revert "Move global sync settings to AccountSettings.""

commit | commitdiff | tree

Alexandra Gherghina [Tue, 22 Jul 2014 21:39:17 +0000 (21:39 +0000)]

am 6d839875: Revert "Revert "Move global sync settings to AccountSettings.""

* commit '6d839875b74f1570e8807005c586298beb677413':
Revert "Revert "Move global sync settings to AccountSettings.""

commit | commitdiff | tree

Alexandra Gherghina [Tue, 22 Jul 2014 12:04:58 +0000 (12:04 +0000)]

Revert "Revert "Move global sync settings to AccountSettings.""

This reverts commit 4869faf46559c54a34b969b5ae5391a208e723af.

Change-Id: I58df9b8161d711a9c0187af1f1a1dc279fb9d9ab

am badae7d8: am 59ea80b7: Merge "Settings: No really, keep the trailing space." into lmp-dev

* commit 'badae7d89585d55e7ba9e74d5cbb480f8c446704':
Settings: No really, keep the trailing space.

am 59ea80b7: Merge "Settings: No really, keep the trailing space." into lmp-dev

* commit '59ea80b781d8c541076f185cfa81084668521ba5':
Settings: No really, keep the trailing space.

commit | commitdiff | tree

Tadashi G. Takaoka [Tue, 22 Jul 2014 17:43:33 +0000 (17:43 +0000)]

am 1909e7db: am 1f539374: Use SwitchPreference for input method subtype enabler

* commit '1909e7db89b80798d13973a60a264687a2420486':
Use SwitchPreference for input method subtype enabler

commit | commitdiff | tree

Tadashi G. Takaoka [Tue, 22 Jul 2014 17:37:01 +0000 (17:37 +0000)]

am 1f539374: Use SwitchPreference for input method subtype enabler

* commit '1f53937469095f268d4c7a21d93f821a341a151d':
Use SwitchPreference for input method subtype enabler

commit | commitdiff | tree

Tadashi G. Takaoka [Tue, 22 Jul 2014 17:34:54 +0000 (17:34 +0000)]

am 5aa55632: am 686c2503: Merge "Use OnPreferenceChangeLister for subtype enabler" into lmp-dev

* commit '5aa556322c672ff112e68019ae9e3396aae20b81':
Use OnPreferenceChangeLister for subtype enabler

commit | commitdiff | tree

Tadashi G. Takaoka [Tue, 22 Jul 2014 17:27:20 +0000 (17:27 +0000)]

am 686c2503: Merge "Use OnPreferenceChangeLister for subtype enabler" into lmp-dev

* commit '686c250323553231f5b314525b221f7000e88572':
Use OnPreferenceChangeLister for subtype enabler

commit | commitdiff | tree

Tadashi G. Takaoka [Sun, 20 Jul 2014 01:16:43 +0000 (18:16 -0700)]

Use SwitchPreference for input method subtype enabler

Bug: 15781377
Change-Id: I80fe987e499722af7768147a184934650bbf8385

am 601ce0b9: (-s ours) am 64a83092: (-s ours) Import translations. DO NOT MERGE

* commit '601ce0b98a18084dce5a0d74a66b20e57297aa55':
Import translations. DO NOT MERGE

am 64a83092: (-s ours) Import translations. DO NOT MERGE

* commit '64a830925096f8ca843ae0685dea9d171bd256ee':
Import translations. DO NOT MERGE

Import translations. DO NOT MERGE

Change-Id: I9f9207a53b8bc1f312ae7e8c6f4bb3b259dba370
Auto-generated-cl: translation import

am 4c177cbd: am 2c22d6d2: Fix and simplify advanced security settings layout

* commit '4c177cbd18136b3c60a1fe531f2d3d2cc5e5de26':
Fix and simplify advanced security settings layout

commit | commitdiff | tree

Alexandra Gherghina [Tue, 22 Jul 2014 13:56:36 +0000 (13:56 +0000)]

am c58595f2: am 4869faf4: Revert "Move global sync settings to AccountSettings."

* commit 'c58595f22562c25af75ee1c2088abaaed0ac18a4':
Revert "Move global sync settings to AccountSettings."

commit | commitdiff | tree

Alexandra Gherghina [Tue, 22 Jul 2014 13:56:35 +0000 (13:56 +0000)]

am 761dad79: am 64fde6f4: Move global sync settings to AccountSettings.

* commit '761dad7901f49e47d8ce5655f77125c7ed428484':
Move global sync settings to AccountSettings.

commit | commitdiff | tree

Dianne Hackborn [Tue, 22 Jul 2014 13:38:43 +0000 (13:38 +0000)]

am fb420af3: am ff795ffb: Unify voice interactor and recognizer settings.

* commit 'fb420af379a42fa6d8ca5e766fbfa663a321e825':
Unify voice interactor and recognizer settings.

am 2c22d6d2: Fix and simplify advanced security settings layout

* commit '2c22d6d2040cc846dbaf5152191cc15c5c5995ab':
Fix and simplify advanced security settings layout

commit | commitdiff | tree

Alexandra Gherghina [Tue, 22 Jul 2014 13:36:39 +0000 (13:36 +0000)]

am 4869faf4: Revert "Move global sync settings to AccountSettings."

* commit '4869faf46559c54a34b969b5ae5391a208e723af':
Revert "Move global sync settings to AccountSettings."

commit | commitdiff | tree

Alexandra Gherghina [Tue, 22 Jul 2014 13:36:38 +0000 (13:36 +0000)]

am 64fde6f4: Move global sync settings to AccountSettings.

* commit '64fde6f4e9404a363f577a9fda424affcb5138e4':
Move global sync settings to AccountSettings.

commit | commitdiff | tree

Dianne Hackborn [Tue, 22 Jul 2014 12:18:00 +0000 (12:18 +0000)]

am ff795ffb: Unify voice interactor and recognizer settings.

* commit 'ff795ffba80e8a6455f27fab7ad0e8e14e2ec9a4':
Unify voice interactor and recognizer settings.

Fix and simplify advanced security settings layout

Provides correct padding for tablets and sets background
drawable.

Bug: 16382821
Change-Id: I0aa0c9f8c6fccb6c201e78075c37a7c7e2315d07

commit | commitdiff | tree

Alexandra Gherghina [Tue, 22 Jul 2014 12:01:54 +0000 (12:01 +0000)]

Revert "Move global sync settings to AccountSettings."

This reverts commit 64fde6f4e9404a363f577a9fda424affcb5138e4.

Change-Id: I61940b6e2936c7c7f048af222602226e5588c268

commit | commitdiff | tree

Alexandra Gherghina [Wed, 9 Jul 2014 08:30:18 +0000 (09:30 +0100)]

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

commit | commitdiff | tree

Dianne Hackborn [Sat, 19 Jul 2014 02:20:11 +0000 (19:20 -0700)]

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

commit | commitdiff | tree

Fabrice Di Meglio [Tue, 22 Jul 2014 02:30:51 +0000 (02:30 +0000)]

am 794fb56f: am f6f1e2ba: Merge "Remove fake 8dp padding on N7 devices" into lmp-dev

* commit '794fb56fa4cb708758e07c66777f5949d86ec087':
Remove fake 8dp padding on N7 devices

commit | commitdiff | tree

Fabrice Di Meglio [Tue, 22 Jul 2014 02:21:52 +0000 (02:21 +0000)]

am f6f1e2ba: Merge "Remove fake 8dp padding on N7 devices" into lmp-dev

* commit 'f6f1e2ba1382617cc4df76a004a0da4313a59129':
Remove fake 8dp padding on N7 devices

commit | commitdiff | tree

Fabrice Di Meglio [Tue, 22 Jul 2014 00:38:22 +0000 (00:38 +0000)]

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

commit | commitdiff | tree

Fabrice Di Meglio [Tue, 22 Jul 2014 00:32:53 +0000 (00:32 +0000)]

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

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

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

am 32cc3b89: am c94e7e61: Merge "Remove inversion quick settings toggle" into lmp-dev

* commit '32cc3b89b448863b5057183fb0e0c24b6771e9e8':
Remove inversion quick settings toggle

am c94e7e61: Merge "Remove inversion quick settings toggle" into lmp-dev

* commit 'c94e7e611cd4cacdcc4ae7297a476024a4ba3b5c':
Remove inversion quick settings toggle

commit | commitdiff | tree

Fabrice Di Meglio [Mon, 21 Jul 2014 23:33:18 +0000 (23:33 +0000)]

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

commit | commitdiff | tree

Fabrice Di Meglio [Mon, 21 Jul 2014 23:26:47 +0000 (23:26 +0000)]

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

commit | commitdiff | tree

Tadashi G. Takaoka [Mon, 21 Jul 2014 22:36:42 +0000 (22:36 +0000)]

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

am 05a10c60: am fca31ca4: Follow API change from *Blocked to *Hidden

* commit '05a10c6088ae1c87cb1f32263aec8d6c5f2a0006':
Follow API change from *Blocked to *Hidden

commit | commitdiff | tree

Tadashi G. Takaoka [Mon, 21 Jul 2014 22:29:50 +0000 (22:29 +0000)]

am 40aeac90: Merge "Remove unused and unnecessary code from subtype enabler" into lmp-dev

* commit '40aeac90f10c7ab6bd52e7200513b2eda7129904':
Remove unused and unnecessary code from subtype enabler

am fca31ca4: Follow API change from *Blocked to *Hidden

* commit 'fca31ca418ec9c8d09efd18d7616b816a3e9f94a':
Follow API change from *Blocked to *Hidden

Follow API change from *Blocked to *Hidden

Bug: 16191518
Change-Id: I4cbe210e62d551e4d5246eb3a7523d03c41175be

commit | commitdiff | tree

Fabrice Di Meglio [Mon, 21 Jul 2014 20:56:32 +0000 (20:56 +0000)]

am c8c4b092: am fecda618: Merge "Fix Notification Access layout for tabletUI support" into lmp-dev

* commit 'c8c4b092e99fb0349e5da4d58cd68ce55eb0c40d':
Fix Notification Access layout for tabletUI support

commit | commitdiff | tree

Fabrice Di Meglio [Mon, 21 Jul 2014 20:52:35 +0000 (20:52 +0000)]

am fecda618: Merge "Fix Notification Access layout for tabletUI support" into lmp-dev

* commit 'fecda6181dcb4197268fd9846cf01207f5ae3249':
Fix Notification Access layout for tabletUI support

commit | commitdiff | tree

Fabrice Di Meglio [Mon, 21 Jul 2014 20:32:00 +0000 (20:32 +0000)]

am a5977686: am 193cd11c: Merge "Fix App Notification layout for tabletUI support" into lmp-dev

* commit 'a59776860d621d8294bdad0f30f5dd1dab5834f2':
Fix App Notification layout for tabletUI support

commit | commitdiff | tree

Fabrice Di Meglio [Mon, 21 Jul 2014 20:28:07 +0000 (20:28 +0000)]

am 193cd11c: Merge "Fix App Notification layout for tabletUI support" into lmp-dev

* commit '193cd11c4b52e313422b74fec46c792aec9a9c06':
Fix App Notification layout for tabletUI support

commit | commitdiff | tree

Fabrice Di Meglio [Mon, 21 Jul 2014 18:37:01 +0000 (18:37 +0000)]

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

commit | commitdiff | tree

Fabrice Di Meglio [Mon, 21 Jul 2014 18:31:39 +0000 (18:31 +0000)]

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

commit | commitdiff | tree

Fabrice Di Meglio [Mon, 21 Jul 2014 18:06:00 +0000 (18:06 +0000)]

am a02a7be9: am 6d26c173: Merge "Fix AppDetails padding on tablet UI" into lmp-dev

* commit 'a02a7be9dd8d56c959b76a1bd3296616f47dd474':
Fix AppDetails padding on tablet UI

commit | commitdiff | tree

Fabrice Di Meglio [Mon, 21 Jul 2014 18:01:44 +0000 (18:01 +0000)]

am 6d26c173: Merge "Fix AppDetails padding on tablet UI" into lmp-dev

* commit '6d26c1738004cd8df1efe2b4d9d98daac3a5555a':
Fix AppDetails padding on tablet UI

am 77fe5373: am 724ec85e: Merge "Add Screen pinning back to settings" into lmp-dev

* commit '77fe5373826508345824927692fea942cf6a828a':
Add Screen pinning back to settings

am 724ec85e: Merge "Add Screen pinning back to settings" into lmp-dev

* commit '724ec85e12405f86948aa235f59426075081b361':
Add Screen pinning back to settings

commit | commitdiff | tree

Przemyslaw Szczepaniak [Mon, 21 Jul 2014 15:47:51 +0000 (15:47 +0000)]

am 892c3d31: am c0bffe71: Fix showing list of languages for picoTTS

* commit '892c3d31de11cad2639877322922fe745cd56f1e':
Fix showing list of languages for picoTTS

commit | commitdiff | tree

Przemyslaw Szczepaniak [Mon, 21 Jul 2014 15:43:56 +0000 (15:43 +0000)]

am c0bffe71: Fix showing list of languages for picoTTS

* commit 'c0bffe7148173fef2d7c7098c8f791cac710b62f':
Fix showing list of languages for picoTTS

commit | commitdiff | tree

Fabrice Di Meglio [Tue, 22 Jul 2014 02:16:16 +0000 (02:16 +0000)]

Merge "Remove fake 8dp padding on N7 devices" into lmp-dev

commit | commitdiff | tree

Fabrice Di Meglio [Tue, 22 Jul 2014 02:11:06 +0000 (19:11 -0700)]

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

commit | commitdiff | tree

Fabrice Di Meglio [Tue, 22 Jul 2014 00:14:31 +0000 (17:14 -0700)]

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

commit | commitdiff | tree

Fabrice Di Meglio [Mon, 21 Jul 2014 23:02:27 +0000 (16:02 -0700)]

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

commit | commitdiff | tree

Fabrice Di Meglio [Mon, 21 Jul 2014 20:41:32 +0000 (13:41 -0700)]

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

commit | commitdiff | tree

Fabrice Di Meglio [Mon, 21 Jul 2014 20:19:06 +0000 (13:19 -0700)]

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

commit | commitdiff | tree

Fabrice Di Meglio [Mon, 21 Jul 2014 18:22:20 +0000 (11:22 -0700)]

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

Merge "Remove inversion quick settings toggle" into lmp-dev

Remove inversion quick settings toggle

Also removes remnants of contrast preference screen.

BUG: 16303790
Change-Id: I9833b53e187e5f41c0442bcbaf9b728d55577d88

commit | commitdiff | tree

Fabrice Di Meglio [Mon, 21 Jul 2014 23:19:28 +0000 (23:19 +0000)]

Merge "Add the capability to set a pinned header to SettingsPreferenceFragment" into lmp-dev

Merge "Treat caption preview viewport as clipped 16:9 aspect" 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

commit | commitdiff | tree

Tadashi G. Takaoka [Mon, 21 Jul 2014 22:24:31 +0000 (22:24 +0000)]

Merge "Remove unused and unnecessary code from subtype enabler" into lmp-dev

commit | commitdiff | tree

Tadashi G. Takaoka [Mon, 21 Jul 2014 21:17:47 +0000 (14:17 -0700)]

Remove unused and unnecessary code from subtype enabler

Change-Id: I9935b5bda8ae7cd1ce2d20ee6c4622eeb9a02b6a

commit | commitdiff | tree

Fabrice Di Meglio [Mon, 21 Jul 2014 20:46:35 +0000 (20:46 +0000)]

Merge "Fix Notification Access layout for tabletUI support" into lmp-dev

commit | commitdiff | tree

Przemyslaw Szczepaniak [Mon, 21 Jul 2014 15:27:00 +0000 (16:27 +0100)]

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)

commit | commitdiff | tree

Przemyslaw Szczepaniak [Mon, 21 Jul 2014 12:40:25 +0000 (12:40 +0000)]

am d49dd702: am d7bdf17a: Merge "Make TTS setting transition animation consistent." into lmp-dev

* commit 'd49dd702b1177062acefb8eae9720f2aaba1c028':
Make TTS setting transition animation consistent.

am a6ed6797: (-s ours) am 790b21d4: (-s ours) Import translations. DO NOT MERGE

* commit 'a6ed679762e91598be293f12b10e6a109a03dd42':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Przemyslaw Szczepaniak [Mon, 21 Jul 2014 12:32:34 +0000 (12:32 +0000)]

am d7bdf17a: Merge "Make TTS setting transition animation consistent." into lmp-dev

* commit 'd7bdf17aba66b0bd4530773401d54252cf6b180c':
Make TTS setting transition animation consistent.

am 790b21d4: (-s ours) Import translations. DO NOT MERGE

* commit '790b21d44d6a84b16c904fbc478cda0bd2d6450f':
Import translations. DO NOT MERGE

Import translations. DO NOT MERGE

Change-Id: Iab323e1a057a52bb3408a7173fae984a2d9ff240
Auto-generated-cl: translation import

am 633b30ad: am 0f364cdf: Merge "Remove deprecated locales - DO NOT MERGE" into lmp-dev

* commit '633b30ad3fc0e737eeed80511f8015d7c1d6f365':
Remove deprecated locales - DO NOT MERGE

commit | commitdiff | tree

Tadashi G. Takaoka [Sun, 20 Jul 2014 18:07:56 +0000 (18:07 +0000)]

am 05f5734c: am a2291259: Merge "Fix Settings behavior when disabling current IME" into lmp-dev

* commit '05f5734cc52b9eed8880d95d395ae82e2856e0c3':
Fix Settings behavior when disabling current IME

am ff6c12df: (-s ours) am fdac5db8: (-s ours) Import translations. DO NOT MERGE

* commit 'ff6c12df927a42b33730f770e1e4fd26225f7245':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Tadashi G. Takaoka [Sun, 20 Jul 2014 18:04:19 +0000 (18:04 +0000)]

am ecf1b79f: am 721e63fc: Merge "Remove unnecessary saved persistent preference" into lmp-dev

* commit 'ecf1b79f1622c526fb4dd86ed4f10fd8237a724e':
Remove unnecessary saved persistent preference

commit | commitdiff | tree

Fabrice Di Meglio [Sun, 20 Jul 2014 18:03:03 +0000 (18:03 +0000)]

am 7ca153f1: am 6f404853: Merge "Fix Utils.prepareCustomPreferencesList()" into lmp-dev

* commit '7ca153f11704f8c16195a4e03de81140c1ca0088':
Fix Utils.prepareCustomPreferencesList()

commit | commitdiff | tree

Fabrice Di Meglio [Sun, 20 Jul 2014 18:01:52 +0000 (18:01 +0000)]

am 595b61eb: am 39a2cbb3: Merge "Fix the way we select and apply Themes" into lmp-dev

* commit '595b61eb3921fead66fc163d33d835e5ba378e7f':
Fix the way we select and apply Themes

commit | commitdiff | tree

Fabrice Di Meglio [Sun, 20 Jul 2014 17:59:33 +0000 (17:59 +0000)]

am ce0e3008: am 84dfc0b5: Merge "Fix overdraw and do some layout optimizations" into lmp-dev

* commit 'ce0e3008e8e6726e51195f01591666dc7bebf7f3':
Fix overdraw and do some layout optimizations

commit | commitdiff | tree

Fabrice Di Meglio [Mon, 21 Jul 2014 17:53:44 +0000 (17:53 +0000)]

Merge "Fix AppDetails padding on tablet UI" into lmp-dev

Merge "Add Screen pinning back to settings" into lmp-dev

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

am 0f364cdf: Merge "Remove deprecated locales - DO NOT MERGE" into lmp-dev

* commit '0f364cdf63c7405ba30d814f30f6fa1fdfd65ee7':
Remove deprecated locales - DO NOT MERGE

am 3becea17: am 8d7be7b7: Update Settings to use new UsageStats API

* commit '3becea17e7f9bc15005e013787392d0a11ea8b73':
Update Settings to use new UsageStats API

commit | commitdiff | tree

Tadashi G. Takaoka [Sun, 20 Jul 2014 01:04:33 +0000 (01:04 +0000)]

am a2291259: Merge "Fix Settings behavior when disabling current IME" into lmp-dev

* commit 'a229125980f12c9debb1c5a827bb96c5620b5705':
Fix Settings behavior when disabling current IME

commit | commitdiff | tree

Fabrice Di Meglio [Tue, 22 Jul 2014 00:28:45 +0000 (00:28 +0000)]

Merge "Add the capability to set a pinned header to a ListFragment" into lmp-dev

commit | commitdiff | tree

Fabrice Di Meglio [Mon, 21 Jul 2014 20:24:22 +0000 (20:24 +0000)]

Merge "Fix App Notification layout for tabletUI support" into lmp-dev

commit | commitdiff | tree

Tadashi G. Takaoka [Sun, 20 Jul 2014 01:02:04 +0000 (01:02 +0000)]

Merge "Fix Settings behavior when disabling current IME" into lmp-dev

commit | commitdiff | tree

Tadashi G. Takaoka [Sun, 20 Jul 2014 00:06:20 +0000 (17:06 -0700)]

Fix Settings behavior when disabling current IME

Bug: 16195373
Change-Id: I95d086e152b07e81aece773bc115ac0ac4517392

am fdac5db8: (-s ours) Import translations. DO NOT MERGE

* commit 'fdac5db893285b421c9631dbc62b41a46985aa34':
Import translations. DO NOT MERGE

Import translations. DO NOT MERGE

Change-Id: If479170defb29f3874fa320e15acd587560cff4c
Auto-generated-cl: translation import

commit | commitdiff | tree

Tadashi G. Takaoka [Sat, 19 Jul 2014 19:13:12 +0000 (19:13 +0000)]

am 721e63fc: Merge "Remove unnecessary saved persistent preference" into lmp-dev

* commit '721e63fc6da5685a22848c297676dfb5ec959367':
Remove unnecessary saved persistent preference

commit | commitdiff | tree

Fabrice Di Meglio [Sat, 19 Jul 2014 02:58:50 +0000 (19:58 -0700)]

Fix AppDetails padding on tablet UI

- force custom padding

See bug #: 13140648 Settings needs to support the new Quantum Paper theme

Change-Id: I5c26402c10a4e717cda22b320ab0790f598591c2

commit | commitdiff | tree

Fabrice Di Meglio [Sat, 19 Jul 2014 02:23:26 +0000 (02:23 +0000)]

am 6f404853: Merge "Fix Utils.prepareCustomPreferencesList()" into lmp-dev

* commit '6f404853087796d46f7a7ef1ad986ec351cc720c':
Fix Utils.prepareCustomPreferencesList()

commit | commitdiff | tree

Fabrice Di Meglio [Sat, 19 Jul 2014 02:12:36 +0000 (19:12 -0700)]

Fix Utils.prepareCustomPreferencesList()

- and thus fix padding for all Fragments using it

See bug: #13140648 Settings needs to support the new Quantum Paper theme

Change-Id: I862c96d626ed906cbdafcfb40fa0e07bb804160f

commit | commitdiff | tree

Fabrice Di Meglio [Sat, 19 Jul 2014 00:59:02 +0000 (00:59 +0000)]

am 39a2cbb3: Merge "Fix the way we select and apply Themes" into lmp-dev

* commit '39a2cbb32cd93d7eb61a82f395a202238c10e76c':
Fix the way we select and apply Themes

commit | commitdiff | tree

Fabrice Di Meglio [Sat, 19 Jul 2014 00:44:37 +0000 (17:44 -0700)]

Fix the way we select and apply Themes

- do not override the DialogWhenLarge ones (they have their purpose)
- apply the correct Theme to SubSettings and then as a consequence
to the SwitchBar

Change-Id: I83adabf72da03051f03fbd2121e1e71217fc0c6a

commit | commitdiff | tree

Fabrice Di Meglio [Sat, 19 Jul 2014 00:06:37 +0000 (00:06 +0000)]

am 84dfc0b5: Merge "Fix overdraw and do some layout optimizations" into lmp-dev

* commit '84dfc0b5d64f9a7224e524794783080fc1b0419e':
Fix overdraw and do some layout optimizations

commit | commitdiff | tree

Fabrice Di Meglio [Fri, 18 Jul 2014 22:20:34 +0000 (15:20 -0700)]

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