OSDN Git Service
Fabrice Di Meglio [Wed, 23 Jul 2014 20:24:13 +0000 (20:24 +0000)]
am
2f2a23de: am
a79400de: Merge "Code cleaning for NotificationStation" into lmp-dev
* commit '
2f2a23dee368e04995211994defd72eb8f406a3c':
Code cleaning for NotificationStation
Fabrice Di Meglio [Wed, 23 Jul 2014 20:19:36 +0000 (20:19 +0000)]
am
a79400de: Merge "Code cleaning for NotificationStation" into lmp-dev
* commit '
a79400defc90a65437589cd5ede8de291692c75f':
Code cleaning for NotificationStation
Fabrice Di Meglio [Wed, 23 Jul 2014 20:01:25 +0000 (20:01 +0000)]
am
c95775b5: am
6cad2550: Merge "OwnerInfos code cleaning" into lmp-dev
* commit '
c95775b543366e36e652c7d5f04e5b21121053f9':
OwnerInfos code cleaning
Fabrice Di Meglio [Wed, 23 Jul 2014 19:56:46 +0000 (19:56 +0000)]
am
6cad2550: Merge "OwnerInfos code cleaning" into lmp-dev
* commit '
6cad255000e2bff5475e0816d18e4b0b68481283':
OwnerInfos code cleaning
John Spurlock [Wed, 23 Jul 2014 19:28:01 +0000 (19:28 +0000)]
am
5c399368: am
d39d7314: Merge "Settings: Wire up Display > Lift to wake." into lmp-dev
* commit '
5c3993682ab792d7a98792d30181a32e8cb96548':
Settings: Wire up Display > Lift to wake.
John Spurlock [Wed, 23 Jul 2014 19:23:46 +0000 (19:23 +0000)]
am
d39d7314: Merge "Settings: Wire up Display > Lift to wake." into lmp-dev
* commit '
d39d731473efbc84ec5640d89d0f275c759b3402':
Settings: Wire up Display > Lift to wake.
Fabrice Di Meglio [Wed, 23 Jul 2014 20:14:46 +0000 (20:14 +0000)]
Merge "Code cleaning for NotificationStation" into lmp-dev
Fabrice Di Meglio [Wed, 23 Jul 2014 20:07:52 +0000 (13:07 -0700)]
Code cleaning for NotificationStation
- remove dead code and vars
- log exceptions
Change-Id: Idff91c27620955a3458c2358b629331e140aedba
Fabrice Di Meglio [Wed, 23 Jul 2014 18:25:53 +0000 (11:25 -0700)]
OwnerInfos code cleaning
Change-Id: I5f4e5dcee4af672fa11f552544bfcf4506a21258
Fabrice Di Meglio [Wed, 23 Jul 2014 19:53:04 +0000 (19:53 +0000)]
Merge "OwnerInfos code cleaning" into lmp-dev
John Spurlock [Wed, 23 Jul 2014 19:17:22 +0000 (19:17 +0000)]
Merge "Settings: Wire up Display > Lift to wake." into lmp-dev
PauloftheWest [Wed, 23 Jul 2014 17:24:11 +0000 (17:24 +0000)]
am
b6e74d86: am
564282a3: Merge "Character limit updates" into lmp-dev
* commit '
b6e74d867cc966ea80e6f0e7fbecda635a3bc5b0':
Character limit updates
PauloftheWest [Wed, 23 Jul 2014 17:19:43 +0000 (17:19 +0000)]
am
564282a3: Merge "Character limit updates" into lmp-dev
* commit '
564282a3f4645cf50aedd3cc809debe4f77a586b':
Character limit updates
John Spurlock [Wed, 23 Jul 2014 17:01:21 +0000 (13:01 -0400)]
Settings: Wire up Display > Lift to wake.
Bug:
15521792
Change-Id: I1a771641ad4fc52599149ac7db4a4fe55a6b9286
Julia Reynolds [Wed, 23 Jul 2014 14:58:10 +0000 (14:58 +0000)]
am
5a9e9a2e: am
baffc889: Merge "Lockdown \'remove user\' with user restriction in Settings for phones." into lmp-dev
* commit '
5a9e9a2ebd2deee9a3b3fea11e8639ee00a1c62f':
Lockdown 'remove user' with user restriction in Settings for phones.
Julia Reynolds [Wed, 23 Jul 2014 14:54:04 +0000 (14:54 +0000)]
am
baffc889: Merge "Lockdown \'remove user\' with user restriction in Settings for phones." into lmp-dev
* commit '
baffc8892440bcdf43c90aa74e301bd3d16a795a':
Lockdown 'remove user' with user restriction in Settings for phones.
Paul Lawrence [Wed, 23 Jul 2014 14:46:41 +0000 (14:46 +0000)]
am
ff3f9cf2: am
7ae20e3c: Allow CryptKeeper dialogs to rotate on tablets
* commit '
ff3f9cf279bcfaab8597fcbaaa22dabc8c0f497d':
Allow CryptKeeper dialogs to rotate on tablets
Paul Lawrence [Wed, 23 Jul 2014 14:43:36 +0000 (14:43 +0000)]
am
7ae20e3c: Allow CryptKeeper dialogs to rotate on tablets
* commit '
7ae20e3ce98543888cfccbef6b1254d060bc30ca':
Allow CryptKeeper dialogs to rotate on tablets
Paul Lawrence [Tue, 22 Jul 2014 22:00:50 +0000 (15:00 -0700)]
Allow CryptKeeper dialogs to rotate on tablets
Tablets may be used in docking stations thus need to support landscape mode.
Phones will not be, and having them rotate is both ugly and annoying.
Also this matches lock screen behavior.
The attribute screenOrientation is not themeable, so the only way of doing
this is programmatic.
Test for truth of bool which is only set for sw600dp devices and
clear the nosensor setting from the manifest if set.
Bug:
16405551
Change-Id: I5b3f945b89402e5aa39642c2c06e98f9ca1ce298
Narayan Kamath [Wed, 23 Jul 2014 13:05:07 +0000 (13:05 +0000)]
am
5f4ba131: am
59c3da23: Get rid of duplicated code in accessibility settings.
* commit '
5f4ba1315ea6e8936cae63269ab83e6851b78489':
Get rid of duplicated code in accessibility settings.
Narayan Kamath [Wed, 23 Jul 2014 12:51:29 +0000 (12:51 +0000)]
am
59c3da23: Get rid of duplicated code in accessibility settings.
* commit '
59c3da2367bad63efd71753b4d1ad88f2298ddc6':
Get rid of duplicated code in accessibility settings.
Narayan Kamath [Mon, 14 Jul 2014 15:36:10 +0000 (16:36 +0100)]
Get rid of duplicated code in accessibility settings.
Has the side effect of picking up changes to LocalePicker
that added support for 3 letter language codes.
bug:
10090157
(cherry picked from commit
26edbccb58c6da452f20ad0695716324e3c29224)
Change-Id: I0f41f27e3e6eb88f0265c9ef6b3f34df04bfff1b
Alan Viverette [Wed, 23 Jul 2014 02:01:21 +0000 (02:01 +0000)]
am
5329be99: am
b125caa7: Merge "Remove dialog icons" into lmp-dev
* commit '
5329be99895530134796cfbbd510ba7fc4457182':
Remove dialog icons
Alan Viverette [Wed, 23 Jul 2014 01:56:41 +0000 (01:56 +0000)]
am
b125caa7: Merge "Remove dialog icons" into lmp-dev
* commit '
b125caa7ed29f1ecf5062452191d061fa890decb':
Remove dialog icons
John Spurlock [Wed, 23 Jul 2014 01:53:15 +0000 (01:53 +0000)]
am
06a7fed9: am
ff941af7: Merge "Settings: Disable Interruptions > From when N/A." into lmp-dev
* commit '
06a7fed9c474d44c21074f9884ef637f7c2cf860':
Settings: Disable Interruptions > From when N/A.
John Spurlock [Wed, 23 Jul 2014 01:45:38 +0000 (01:45 +0000)]
am
ff941af7: Merge "Settings: Disable Interruptions > From when N/A." into lmp-dev
* commit '
ff941af733a86c4b9fdf1f7f23ac6405faf73231':
Settings: Disable Interruptions > From when N/A.
Dianne Hackborn [Wed, 23 Jul 2014 01:39:46 +0000 (01:39 +0000)]
am
f23885b9: am
b763e342: Improve protection against malicious admins.
* commit '
f23885b92f8b80f55b17fe4072ca8ede9caadcd4':
Improve protection against malicious admins.
Dianne Hackborn [Wed, 23 Jul 2014 01:35:53 +0000 (01:35 +0000)]
am
b763e342: Improve protection against malicious admins.
* commit '
b763e34210e3947b46ef7c9bf396579f17ab0daf':
Improve protection against malicious admins.
Dianne Hackborn [Tue, 22 Jul 2014 23:23:36 +0000 (16:23 -0700)]
Improve protection against malicious admins.
- 2 second timeout until we give up on displaying a message,
keeping us within the 5 second activity launch block time.
- Restart the activity launch block when we show the dialog.
- Use app ops to prevent the app of the currently displayed
admin from putting windows on top while the settings screen
is running.
Change-Id: I631e8896ec7539c2de3ff36f183e67e36bcc37ca
Alan Viverette [Wed, 23 Jul 2014 00:33:20 +0000 (00:33 +0000)]
am
a9653308: am
7e974f4c: Merge "Reset color space when development options are disabled" into lmp-dev
* commit '
a9653308e4001150191e0107ceffe7bfd3abf88b':
Reset color space when development options are disabled
Alan Viverette [Wed, 23 Jul 2014 00:27:41 +0000 (00:27 +0000)]
am
7e974f4c: Merge "Reset color space when development options are disabled" into lmp-dev
* commit '
7e974f4c8428b889a45e46aa32832e68c5173f3d':
Reset color space when development options are disabled
John Spurlock [Wed, 23 Jul 2014 00:10:18 +0000 (00:10 +0000)]
am
58c891e8: am
54612391: Settings: Tweak zen alarm info string.
* commit '
58c891e8ba5bd927c7f85ebe7abe4dad81f16769':
Settings: Tweak zen alarm info string.
John Spurlock [Tue, 22 Jul 2014 23:57:05 +0000 (23:57 +0000)]
am
54612391: Settings: Tweak zen alarm info string.
* commit '
54612391878a2300fc44ea3f4befc171b3d5e737':
Settings: Tweak zen alarm info string.
John Spurlock [Tue, 22 Jul 2014 20:31:00 +0000 (16:31 -0400)]
Settings: Tweak zen alarm info string.
Use standard styling and remove the bit about timers.
Bug:
16487906
Change-Id: I28b8ac61981a2e9956d41768ee1185dc5ad950f3
Jeff Sharkey [Tue, 22 Jul 2014 23:49:25 +0000 (23:49 +0000)]
am
13948a69: am
e65bb492: Merge "Data Usage, materialized!" into lmp-dev
* commit '
13948a69f4c68b38ff46f7cc3127ddbfffbf00aa':
Data Usage, materialized!
PauloftheWest [Tue, 22 Jul 2014 23:45:14 +0000 (23:45 +0000)]
am
ca6d88aa: am
0da1f851: Removed WPA PSK from HotSpot Options
* commit '
ca6d88aac96171adab56d51cea9bc315c9966948':
Removed WPA PSK from HotSpot Options
Jeff Sharkey [Tue, 22 Jul 2014 23:44:38 +0000 (23:44 +0000)]
am
e65bb492: Merge "Data Usage, materialized!" into lmp-dev
* commit '
e65bb4927faf8e353c73b58648e51a8081615dcf':
Data Usage, materialized!
PauloftheWest [Tue, 22 Jul 2014 23:40:20 +0000 (23:40 +0000)]
am
0da1f851: Removed WPA PSK from HotSpot Options
* commit '
0da1f8515a6af368a923cc99e5435795a031692a':
Removed WPA PSK from HotSpot Options
Alan Viverette [Tue, 22 Jul 2014 23:33:44 +0000 (23:33 +0000)]
am
26eaa31c: am
47d27bd6: Merge "Stop using framework-private switch asset" into lmp-dev
* commit '
26eaa31cf100f22050bee0780264a3e6c40c1dac':
Stop using framework-private switch asset
PauloftheWest [Tue, 22 Jul 2014 22:43:59 +0000 (15:43 -0700)]
Removed WPA PSK from HotSpot Options
Bug:
16380972
Change-Id: I77735ff7a8962d538132bb55ebbf6cc75358f8a1
Alan Viverette [Tue, 22 Jul 2014 23:25:38 +0000 (23:25 +0000)]
am
47d27bd6: Merge "Stop using framework-private switch asset" into lmp-dev
* commit '
47d27bd629838ded2d217f238b6e3b21d18485da':
Stop using framework-private switch asset
Fabrice Di Meglio [Tue, 22 Jul 2014 22:24:58 +0000 (22:24 +0000)]
am
4ad8602a: am
3f3426e0: Merge "Add Home / Launcher apps indexing" into lmp-dev
* commit '
4ad8602ac358672f7f1b162930eccb7e96e223f5':
Add Home / Launcher apps indexing
Fabrice Di Meglio [Tue, 22 Jul 2014 22:20:39 +0000 (22:20 +0000)]
am
3f3426e0: Merge "Add Home / Launcher apps indexing" into lmp-dev
* commit '
3f3426e0d95aed9ab651a703a3a7e33833cd4741':
Add Home / Launcher apps indexing
Fabrice Di Meglio [Tue, 22 Jul 2014 22:06:31 +0000 (15:06 -0700)]
Add Home / Launcher apps indexing
- add a BaseSearchIndexProvider to HomeSettings
- use a BroadcastReceiver for tracking add or remove of
Home / Launcher apps
- add "launcher" synonym for "home" too
- also code cleaning for DynamicIndexableContentMonitor
See bug: #
16484927 Add "launcher" as a synonym for "home" in settings search
Change-Id: I819f4e5f7bd5e9a7882609206b2733ea1912fc69
Alan Viverette [Wed, 23 Jul 2014 01:52:59 +0000 (01:52 +0000)]
Merge "Remove dialog icons" into lmp-dev
Alan Viverette [Wed, 23 Jul 2014 01:40:48 +0000 (18:40 -0700)]
Remove dialog icons
BUG:
16493564
Change-Id: I35ec0a8fc6ce3148b5bf469bfd2b56d0ae6d95ee
John Spurlock [Wed, 23 Jul 2014 01:43:37 +0000 (01:43 +0000)]
Merge "Settings: Disable Interruptions > From when N/A." into lmp-dev
John Spurlock [Wed, 23 Jul 2014 01:40:41 +0000 (21:40 -0400)]
Settings: Disable Interruptions > From when N/A.
Bug:
16486621
Change-Id: Id720337905051a11ca95fac53f89963495998924
Julia Reynolds [Wed, 23 Jul 2014 14:51:29 +0000 (14:51 +0000)]
Merge "Lockdown 'remove user' with user restriction in Settings for phones." into lmp-dev
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.""
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.""
Jeff Sharkey [Tue, 22 Jul 2014 23:40:05 +0000 (23:40 +0000)]
Merge "Data Usage, materialized!" into lmp-dev
Jeff Sharkey [Mon, 21 Jul 2014 22:38:06 +0000 (15:38 -0700)]
Data Usage, materialized!
Asset drop so Data Usage matches new Material spec. Removes time
dimension sweeps, so we now summarize the entire visible axis. Fix
time axis labels to not draw outside clip bounds. Remove pie chart.
No more checkboxes in menus. Telephony items like roaming are moved
back to cellular settings. Start wiring up multi-SIM support.
Bug:
15760500,
16019700,
16289924,
16303795
Change-Id: Ie8f4821962319bb82ff4bc2f13f1f66ba1bdfe65
Alan Viverette [Tue, 22 Jul 2014 23:23:21 +0000 (23:23 +0000)]
Merge "Stop using framework-private switch asset" into lmp-dev
Alan Viverette [Tue, 22 Jul 2014 23:11:01 +0000 (16:11 -0700)]
Stop using framework-private switch asset
BUG:
16467249
Change-Id: I0829c3dea522cf59e0f92046ea7c6092d416ad4c
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
John Spurlock [Tue, 22 Jul 2014 19:31:13 +0000 (19:31 +0000)]
am
badae7d8: am
59ea80b7: Merge "Settings: No really, keep the trailing space." into lmp-dev
* commit '
badae7d89585d55e7ba9e74d5cbb480f8c446704':
Settings: No really, keep the trailing space.
John Spurlock [Tue, 22 Jul 2014 19:26:32 +0000 (19:26 +0000)]
am
59ea80b7: Merge "Settings: No really, keep the trailing space." into lmp-dev
* commit '
59ea80b781d8c541076f185cfa81084668521ba5':
Settings: No really, keep the trailing space.
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
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
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
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
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
Baligh Uddin [Tue, 22 Jul 2014 17:22:01 +0000 (17:22 +0000)]
am
601ce0b9: (-s ours) am
64a83092: (-s ours) Import translations. DO NOT MERGE
* commit '
601ce0b98a18084dce5a0d74a66b20e57297aa55':
Import translations. DO NOT MERGE
Baligh Uddin [Tue, 22 Jul 2014 17:14:41 +0000 (17:14 +0000)]
am
64a83092: (-s ours) Import translations. DO NOT MERGE
* commit '
64a830925096f8ca843ae0685dea9d171bd256ee':
Import translations. DO NOT MERGE
Baligh Uddin [Tue, 22 Jul 2014 03:03:25 +0000 (20:03 -0700)]
Import translations. DO NOT MERGE
Change-Id: I9f9207a53b8bc1f312ae7e8c6f4bb3b259dba370
Auto-generated-cl: translation import
Alan Viverette [Wed, 23 Jul 2014 00:24:02 +0000 (00:24 +0000)]
Merge "Reset color space when development options are disabled" into lmp-dev
Alan Viverette [Tue, 22 Jul 2014 00:45:26 +0000 (17:45 -0700)]
Reset color space when development options are disabled
BUG:
16306222
Change-Id: I4939a4fba8b0358333f6ff25ff8c405c5679579d
Fabrice Di Meglio [Tue, 22 Jul 2014 22:17:42 +0000 (22:17 +0000)]
Merge "Add Home / Launcher apps indexing" into lmp-dev
PauloftheWest [Wed, 23 Jul 2014 17:14:50 +0000 (17:14 +0000)]
Merge "Character limit updates" into lmp-dev
PauloftheWest [Wed, 23 Jul 2014 17:11:43 +0000 (10:11 -0700)]
Character limit updates
Bug:
16322106
Bug:
16321901
Change-Id: I776a86658e03a6bed5554a1020cf2c272cbeb49b
Adrian Roos [Tue, 22 Jul 2014 13:56:36 +0000 (13:56 +0000)]
am
4c177cbd: am
2c22d6d2: Fix and simplify advanced security settings layout
* commit '
4c177cbd18136b3c60a1fe531f2d3d2cc5e5de26':
Fix and simplify advanced security settings layout
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."
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.
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.
Adrian Roos [Tue, 22 Jul 2014 13:36:39 +0000 (13:36 +0000)]
am
2c22d6d2: Fix and simplify advanced security settings layout
* commit '
2c22d6d2040cc846dbaf5152191cc15c5c5995ab':
Fix and simplify advanced security settings layout
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."
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.
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.
Adrian Roos [Fri, 18 Jul 2014 11:42:01 +0000 (13:42 +0200)]
Fix and simplify advanced security settings layout
Provides correct padding for tablets and sets background
drawable.
Bug:
16382821
Change-Id: I0aa0c9f8c6fccb6c201e78075c37a7c7e2315d07
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
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
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
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
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
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
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
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
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
Alan Viverette [Tue, 22 Jul 2014 00:20:59 +0000 (00:20 +0000)]
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
Alan Viverette [Tue, 22 Jul 2014 00:12:40 +0000 (00:12 +0000)]
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
Alan Viverette [Tue, 22 Jul 2014 00:00:12 +0000 (00:00 +0000)]
am
32cc3b89: am
c94e7e61: Merge "Remove inversion quick settings toggle" into lmp-dev
* commit '
32cc3b89b448863b5057183fb0e0c24b6771e9e8':
Remove inversion quick settings toggle
Alan Viverette [Mon, 21 Jul 2014 23:55:51 +0000 (23:55 +0000)]
am
c94e7e61: Merge "Remove inversion quick settings toggle" into lmp-dev
* commit '
c94e7e611cd4cacdcc4ae7297a476024a4ba3b5c':
Remove inversion quick settings toggle
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
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
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
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
Amith Yamasani [Mon, 21 Jul 2014 22:32:26 +0000 (22:32 +0000)]
am
05a10c60: am
fca31ca4: Follow API change from *Blocked to *Hidden
* commit '
05a10c6088ae1c87cb1f32263aec8d6c5f2a0006':
Follow API change from *Blocked to *Hidden
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
Amith Yamasani [Mon, 21 Jul 2014 22:25:17 +0000 (22:25 +0000)]
am
fca31ca4: Follow API change from *Blocked to *Hidden
* commit '
fca31ca418ec9c8d09efd18d7616b816a3e9f94a':
Follow API change from *Blocked to *Hidden
OSDN Git Service
