ztenghui
9d8ef24cbb
am 48454e7f: (-s ours) Merge "DO NOT MERGE: Hide the VectorDrawable" into lmp-preview-dev
...
* commit '48454e7f16b7cca7989b377f608227b6ed8c9ced':
DO NOT MERGE: Hide the VectorDrawable
2014-05-27 16:12:48 +00:00
ztenghui
427a15a0f0
Merge "DO NOT MERGE: Hide the VectorDrawable" into lmp-preview-dev
2014-05-27 16:09:05 +00:00
Adrian Roos
76ce460f70
am da1d6c3c: Merge "Initialize background visibility of ActivatableNotificationView" into lmp-preview-dev
...
* commit 'da1d6c3c8a7e80fce5d0e1f3552ccd1f22039e47':
Initialize background visibility of ActivatableNotificationView
2014-05-27 15:39:28 +00:00
Adrian Roos
a33ea18dc6
Merge "Initialize background visibility of ActivatableNotificationView" into lmp-preview-dev
2014-05-27 15:37:38 +00:00
John Spurlock
1285b95173
am 3bfd2404: (-s ours) Merge "DO NOT MERGE Hide vibrator streamHint overloads for preview." into lmp-preview-dev
...
* commit '3bfd24041ae8cb9adbe1f8f54792e0bebe33a3be':
DO NOT MERGE Hide vibrator streamHint overloads for preview.
2014-05-27 15:16:40 +00:00
John Spurlock
fc9e1e0592
Merge "DO NOT MERGE Hide vibrator streamHint overloads for preview." into lmp-preview-dev
2014-05-27 15:13:34 +00:00
Yohei Yukawa
c997ca0b68
Merge "Switch back to StaticRotationList from DynamicRotationList"
2014-05-27 14:41:25 +00:00
Adrian Roos
bcbb75ac9d
Initialize background visibility of ActivatableNotificationView
...
Initializes the background visibilities that were previously
only set when adding the view to the scroller,
resulting in HUNs having two backgrounds.
Bug: 15106201
Change-Id: I21ef3b34c6feb0e852c9dc2c3289665cff40927e
2014-05-27 16:39:53 +02:00
Craig Mautner
10bfef0bb8
am 4c5309fb: Merge changes I88865c02,I34cc1310 into lmp-preview-dev
...
* commit '4c5309fb3b0abfc86fdfad9844ce20e2df03497b':
Check for null DO NOT MERGE
Improve DocCentric documentation. DO NOT MERGE
2014-05-27 14:28:15 +00:00
Craig Mautner
5122fb6a92
am 463f9006: Merge "Only start TaskPersister once." into lmp-preview-dev
...
* commit '463f9006c56d66b5213edecc150863b450a7e573':
Only start TaskPersister once.
2014-05-27 14:28:10 +00:00
Craig Mautner
b45a730efb
Merge changes I88865c02,I34cc1310 into lmp-preview-dev
...
* changes:
Check for null DO NOT MERGE
Improve DocCentric documentation. DO NOT MERGE
2014-05-27 14:24:04 +00:00
John Spurlock
53bd26335c
am c5890bb9: Merge "VolumeZen: combine ringer/notification volume and zen." into lmp-preview-dev
...
* commit 'c5890bb9c2361adf64efa7a2680536edaa527d1f':
VolumeZen: combine ringer/notification volume and zen.
2014-05-27 14:23:40 +00:00
Craig Mautner
e88d180d6c
am e2c92ac8: Merge "Update launchFlags after changing Intent flags" into lmp-preview-dev
...
* commit 'e2c92ac847d151cbf4d578ee85d3ff10126e9ada':
Update launchFlags after changing Intent flags
2014-05-27 14:23:35 +00:00
Adrian Roos
83ea195b8a
am 756bfbce: Merge "Make carrier label single line with marquee on overflow" into lmp-preview-dev
...
* commit '756bfbcec68d9f1087e517f4fc5574f6b61d5727':
Make carrier label single line with marquee on overflow
2014-05-27 14:23:30 +00:00
Craig Mautner
8aa29921df
Merge "Only start TaskPersister once." into lmp-preview-dev
2014-05-27 14:22:04 +00:00
John Spurlock
6940b361e5
Merge "VolumeZen: combine ringer/notification volume and zen." into lmp-preview-dev
2014-05-27 14:16:52 +00:00
Craig Mautner
bf1bf9dea7
Merge "Update launchFlags after changing Intent flags" into lmp-preview-dev
2014-05-27 14:14:34 +00:00
John Spurlock
8600534df6
VolumeZen: combine ringer/notification volume and zen.
...
- Implement a new volume panel widget, combining volume and
zen mode + conditions.
- Show zen mode + conditions when modifying ringer or notification
streams.
- Host the volume panel widget in a dialog when being controlled
by the audio service / volume keys.
- Remove support for multiple sliders in the volume panel.
- Remove support for separate ringer + notification volumes
in the volume panel.
- Move volume panel resources up to SystemUI.
- Create a new combined Notifications quick settings tile.
- Host the volume panel widget in the quick settings panel under
Notifications.
- When the quick settings detail panel is visible, route the volume
keys to the embedded widget instead of showing a redundant dialog.
- Create common styles for quick settings text to be closer to spec.
- Update the framework resources for the ringer stream.
- Show the ringer icons in global actions.
- Add "until you turn this off" back as a separate zen condition.
- Disable time condition buttons when they are N/A.
- Don't allow volume changes to set ringer mode silent.
Bug:15186070
Change-Id: Id5e321dd1d5e7c4cf3917027ffbdf7e80d38b00d
2014-05-27 10:08:00 -04:00
Adrian Roos
1a7da57fa9
Merge "Make carrier label single line with marquee on overflow" into lmp-preview-dev
2014-05-27 13:07:00 +00:00
Yohei Yukawa
529001f067
Switch back to StaticRotationList from DynamicRotationList
...
Ic005b94379f9d847ea, which introduced DynamicRotationList for
smarter input method rotation, is suspected to be causing a
strange behavior that InputMethodManager#switchToNextInputMethod
is choosing unexected/disabled IME/subtype.
With this CL, we switch back to StaticRotationList until the root
cause is addressed.
BUG: 7043015
Change-Id: I95fc8b28536cea6d09ea325e0caee14007cfc0a7
2014-05-27 20:32:34 +09:00
Narayan Kamath
2416768ae4
am eae7b53d: am 34c6cb4c: am 6b5beb31: Merge "PacProccesor: Only build for 32-bit"
...
* commit 'eae7b53d3aa78da9b1b9a76e801bb680a8841091':
PacProccesor: Only build for 32-bit
2014-05-27 11:09:42 +00:00
Narayan Kamath
eae7b53d3a
am 34c6cb4c: am 6b5beb31: Merge "PacProccesor: Only build for 32-bit"
...
* commit '34c6cb4c1af7a7dd8f8658dd401c74076943ffb8':
PacProccesor: Only build for 32-bit
2014-05-27 11:06:03 +00:00
Narayan Kamath
34c6cb4c1a
am 6b5beb31: Merge "PacProccesor: Only build for 32-bit"
...
* commit '6b5beb318b439b0b3aeabf42401bfed63bfbe2e2':
PacProccesor: Only build for 32-bit
2014-05-27 11:00:48 +00:00
Narayan Kamath
6b5beb318b
Merge "PacProccesor: Only build for 32-bit"
2014-05-27 10:57:20 +00:00
Andreas Gampe
4694175624
PacProccesor: Only build for 32-bit
...
PacProcessor relies on libpac from chromium, which is not built
for 64b right now.
(cherry picked from commit f8749200c06a8714ffd46f5e2ec81be57ad4f7f4)
Change-Id: Ic128e17b7437c130df29eeab3293b9c01f01d70b
2014-05-27 11:56:22 +01:00
Kenny Guy
8b268f243a
Merge "Add ability to uninstall per user to adb shell pm."
2014-05-27 10:11:25 +00:00
Nicolas Prevot
e282c97e21
Merge "Rename code related to cross-profile intents."
2014-05-27 10:07:58 +00:00
Jinsuk Kim
0bc8b0718f
Fix a bug using wrong addresses for CEC logical address allocation
...
Change-Id: I41da586c16dca4f325d147bb3abe5d4e09f7b91c
2014-05-27 09:52:40 +00:00
Jinsuk Kim
7fe2ae0fe9
Hook up the CEC playback API to service internal logic.
...
This change enables CEC playback API (oneTouchPlay, queryDisplayStatus).
Also updated local device list type to SparseArray to make it easy
to get one based on device type.
Change-Id: I6f88b2dac2d873c493a90411549a4e5719a5e460
2014-05-27 04:45:23 +00:00
Wonsik Kim
c3a6e23e3f
am e32b2d32: Revert "Revert "Add physical TV input handling to TvInputManagerService""
...
* commit 'e32b2d32d7e4a492bb3038c7bc55988a908437a4':
Revert "Revert "Add physical TV input handling to TvInputManagerService""
2014-05-27 04:08:51 +00:00
Wonsik Kim
c22dbb6919
Revert "Revert "Add physical TV input handling to TvInputManagerService""
...
This reverts commit 1940e197a8de186df5edf0b78e0907ae539bd215.
Bug: 14118245, Bug: 15197740
Change-Id: Ia308f16d2ed8ec55112a4d21c180ccb97e8d7c6a
2014-05-27 01:33:50 +00:00
Craig Mautner
87f851d0ba
Only start TaskPersister once.
...
Because ActivityManagerService.systemReady() is reentrant we could
restore tasks and start the TaskPersister more than one time. This
fix limits operations on TaskPersister to one time only.
Fixes bug 15256579.
Change-Id: I6bf2c26b37acdfd9b15a6f277966966b743d03b6
2014-05-26 16:52:58 -07:00
Adrian Roos
3c64aba99c
Make carrier label single line with marquee on overflow
...
Bug: 15261340
Change-Id: I3b22b018ba834da71129e2ece7107fee5807b1f7
2014-05-26 23:12:45 +02:00
Adrian Roos
22bd1ff813
am d19276b1: Merge "Replace KeyButtonView\'s custom glow with Quantum Ripple" into lmp-preview-dev
...
* commit 'd19276b19b60bae42a240e42e282ab2224380fed':
Replace KeyButtonView's custom glow with Quantum Ripple
2014-05-26 20:56:52 +00:00
Adrian Roos
41b170d606
Merge "Replace KeyButtonView's custom glow with Quantum Ripple" into lmp-preview-dev
2014-05-26 20:54:13 +00:00
Jorim Jaggi
53ac542dae
am 7294a594: Merge "Improve scrim handling" into lmp-preview-dev
...
* commit '7294a594ec993352dc6e743ae313308636afb16d':
Improve scrim handling
2014-05-26 20:48:51 +00:00
Jorim Jaggi
7c1d454da1
Merge "Improve scrim handling" into lmp-preview-dev
2014-05-26 20:44:52 +00:00
Jorim Jaggi
ecc798e666
Improve scrim handling
...
Bug: 15163546
Change-Id: I0d2c05b035f832f4b4e6a2fc34113fe9d5677525
2014-05-26 22:41:16 +02:00
Adrian Roos
cde52d77eb
Replace KeyButtonView's custom glow with Quantum Ripple
...
Bug: 15212514
Change-Id: Ia66bccd627c123f637d67076f78ab418c3f9e835
2014-05-26 22:40:52 +02:00
Adrian Roos
7826baa2aa
am 3120b3d2: Merge "Tapping in brightness row in QS should not close QS panel" into lmp-preview-dev
...
* commit '3120b3d22ce1843d2d473f050fbf08b735c87e9e':
Tapping in brightness row in QS should not close QS panel
2014-05-26 17:36:13 +00:00
Adrian Roos
1dfc38058e
Merge "Tapping in brightness row in QS should not close QS panel" into lmp-preview-dev
2014-05-26 17:33:17 +00:00
Adrian Roos
236da706b9
Tapping in brightness row in QS should not close QS panel
...
Bug: 15169301
Change-Id: I10ddaa2c5bd3f8cb6abaff89b03814dd8ec63f72
2014-05-26 19:27:40 +02:00
Adrian Roos
a695d3ce1a
am 03508a46: Merge "Implement HUN visuals: shadows and translucency" into lmp-preview-dev
...
* commit '03508a4675f4be13551f6b3315439e833327ccc5':
Implement HUN visuals: shadows and translucency
2014-05-26 17:08:27 +00:00
Adrian Roos
0948925a04
Merge "Implement HUN visuals: shadows and translucency" into lmp-preview-dev
2014-05-26 17:05:18 +00:00
Adrian Roos
de61fd7822
Implement HUN visuals: shadows and translucency
...
Bug: 15106201
Change-Id: I718e3d36355d0f58abc3daadb8c6a9d554f29bec
2014-05-26 19:03:00 +02:00
Jorim Jaggi
d31c386a39
am 356671c9: Merge "Do not destroy the security method when pressing back." into lmp-preview-dev
...
* commit '356671c964de62bfb495e3c897f2da8b28388233':
Do not destroy the security method when pressing back.
2014-05-26 16:42:39 +00:00
Jorim Jaggi
54ba638e13
Merge "Do not destroy the security method when pressing back." into lmp-preview-dev
2014-05-26 16:39:50 +00:00
Jorim Jaggi
a0be6d53a8
Do not destroy the security method when pressing back.
...
Fixes jank when the user wants to unlock it next time.
Bug: 15088101
Change-Id: If7bc3d92d0f17abb5077b4c06248f368acb2879f
2014-05-26 18:37:29 +02:00
Yohei Yukawa
c659053c4c
Merge "Implement dynamic IME rotation based on user action"
2014-05-26 16:37:23 +00:00
Yohei Yukawa
a9bda77427
Implement dynamic IME rotation based on user action
...
With this CL, the IME rotation order will be updated dynamically
based on user actions on IMEs. Currently only onCommitText is
took into considered.
Imagine that we have the following rotation order.
[A, B, C, D, E]
If a user action for C is observed, the rotation order will be
updated as follows:
[C, A, B, D, E]
Then another user action for D updates the rotation order as
follows:
[D, C, A, B, E]
BUG: 7043015
Change-Id: Ic005b94379f9d847ea87046473ed77d8018d930e
2014-05-27 01:32:30 +09:00