Jorim Jaggi
5cf17879a3
Reuse KeyguardViewMediator for new Keyguard implementation.
...
This change reuses KeyguardViewMediator for the new Keyguard
implementation in status bar. KeyguardViewManager is replaced by
StatusBarKeyguardManager which handles adding the view, setting the
state etc. StatusBarWindowManager is introduced to managed the window
of the status bar, which has the logic of both the old Keyguard window
and the old status bar window. In the current implementation, Keyguard
gets displayed like it would be in the bouncer state, but that's likely
to change in the future. Also, setHidden in IKeyguardService is also
renamed to setOccluded, as the word hidden interferes with the
terminology when dismissing the Keyguard.
Bug: 13635952
Change-Id: I1c5d5a49d810d8532089f464cb2efe35e577f517
2014-03-31 20:58:31 +02:00
Christoph Studer
085226c40f
am 546bec8e: Notification usage stats
...
* commit '546bec8ebf2cf865e88d02cc8cb29563ad224967':
Notification usage stats
2014-03-31 12:45:33 +00:00
Jorim Jaggi
8ae65aecc8
Address comments for I059d80d8b9b9818a778ab685f4672ea2694def63
...
Bug: 13635952
Change-Id: I5d2bd44b3588621f26d94baab161e4e2444197a8
2014-03-31 12:15:18 +00:00
Jorim Jaggi
bd490ad59f
Merge "Make Keyguard a library and make StatusBar the new Keyguard." into master-lockscreen-dev
2014-03-31 12:05:54 +00:00
Christoph Studer
546bec8ebf
Notification usage stats
...
First cut of gathering implicit notification signals and computing
running stats.
Tracks:
1. Post, update, remove by apps
2. Click, dismissal by users
Stats are aggregated on user, user+pkg, and getKey() levels.
Current stats are printed as part of 'dumpsys notification'.
Change-Id: I06ecbf76e517509895f2f9eea5b9d19bf9a34975
2014-03-31 12:50:13 +02:00
Narayan Kamath
df0b393f62
am 37109819: am 303d666f: am 0e3f3c70: am 91bbb75c: Merge "Cast CallMethod\'s size_t parameters to jint"
...
* commit '37109819d05495184bfcfaea91453d325828ab0b':
Cast CallMethod's size_t parameters to jint
2014-03-31 09:59:33 +00:00
Narayan Kamath
37109819d0
am 303d666f: am 0e3f3c70: am 91bbb75c: Merge "Cast CallMethod\'s size_t parameters to jint"
...
* commit '303d666f2e2b37120e0e9de206ce127e2a532026':
Cast CallMethod's size_t parameters to jint
2014-03-31 09:53:35 +00:00
Narayan Kamath
303d666f2e
am 0e3f3c70: am 91bbb75c: Merge "Cast CallMethod\'s size_t parameters to jint"
...
* commit '0e3f3c70226640759d5d705233fbe59f525355bb':
Cast CallMethod's size_t parameters to jint
2014-03-31 09:48:27 +00:00
Narayan Kamath
0e3f3c7022
am 91bbb75c: Merge "Cast CallMethod\'s size_t parameters to jint"
...
* commit '91bbb75c75568dee854fb10633f8ce3683265ffd':
Cast CallMethod's size_t parameters to jint
2014-03-31 09:41:39 +00:00
Narayan Kamath
91bbb75c75
Merge "Cast CallMethod's size_t parameters to jint"
2014-03-31 09:37:32 +00:00
Jinsuk Kim
732a6baa2c
am 00bc2834: am 2e59bd78: am 41eaa32c: Merge "Replace individual methods with a consolidated CEC nativeSendmessage" into klp-modular-dev
...
* commit '00bc2834537dec9e407da5cf4573048189f45289':
Replace individual methods with a consolidated CEC nativeSendmessage
2014-03-31 01:56:24 +00:00
Jinsuk Kim
00bc283453
am 2e59bd78: am 41eaa32c: Merge "Replace individual methods with a consolidated CEC nativeSendmessage" into klp-modular-dev
...
* commit '2e59bd788546e29e48b85bda72da6af61704113d':
Replace individual methods with a consolidated CEC nativeSendmessage
2014-03-31 01:50:56 +00:00
Jinsuk Kim
2e59bd7885
am 41eaa32c: Merge "Replace individual methods with a consolidated CEC nativeSendmessage" into klp-modular-dev
...
* commit '41eaa32c100d8a903daa7b7d09d34887a3e45ffd':
Replace individual methods with a consolidated CEC nativeSendmessage
2014-03-31 01:44:51 +00:00
Jinsuk Kim
41eaa32c10
Merge "Replace individual methods with a consolidated CEC nativeSendmessage" into klp-modular-dev
2014-03-31 01:40:30 +00:00
Wink Saville
257959a9aa
am 562ea3fc: am 80b4e098: am 44b43a51: am 1e4cad81: Merge "GlobalActions: Fix Airplane Mode on/off issue"
...
* commit '562ea3fc7b5b97644bc8aa03e416a8334fac7a2d':
GlobalActions: Fix Airplane Mode on/off issue
2014-03-30 15:29:05 +00:00
Wink Saville
562ea3fc7b
am 80b4e098: am 44b43a51: am 1e4cad81: Merge "GlobalActions: Fix Airplane Mode on/off issue"
...
* commit '80b4e09849048a78e08911eff9907cae618eba35':
GlobalActions: Fix Airplane Mode on/off issue
2014-03-30 15:23:30 +00:00
Wink Saville
80b4e09849
am 44b43a51: am 1e4cad81: Merge "GlobalActions: Fix Airplane Mode on/off issue"
...
* commit '44b43a51c7d7e5c2cbe1d9912ee4a21686fa1a58':
GlobalActions: Fix Airplane Mode on/off issue
2014-03-30 15:17:38 +00:00
Wink Saville
44b43a51c7
am 1e4cad81: Merge "GlobalActions: Fix Airplane Mode on/off issue"
...
* commit '1e4cad8198056a5e27a7aeb104ceb8ada331eafe':
GlobalActions: Fix Airplane Mode on/off issue
2014-03-30 15:11:27 +00:00
Wink Saville
1e4cad8198
Merge "GlobalActions: Fix Airplane Mode on/off issue"
2014-03-30 00:15:22 +00:00
Wei Wang
58aee2acbe
am ab4fc115: am 1b09c97d: am 4447405d: Merge "Callback on correct method when status is unsuccessful." into klp-modular-dev
...
* commit 'ab4fc115e953831d22d76163685b2a8f479efda5':
Callback on correct method when status is unsuccessful.
2014-03-29 02:08:32 +00:00
Wei Wang
ab4fc115e9
am 1b09c97d: am 4447405d: Merge "Callback on correct method when status is unsuccessful." into klp-modular-dev
...
* commit '1b09c97d8a7156a9f35ebab3c98db7b103852a58':
Callback on correct method when status is unsuccessful.
2014-03-29 02:03:03 +00:00
Wei Wang
1b09c97d8a
am 4447405d: Merge "Callback on correct method when status is unsuccessful." into klp-modular-dev
...
* commit '4447405d76b5a9152aacadbfdefd1f8fd60a03ad':
Callback on correct method when status is unsuccessful.
2014-03-29 01:57:31 +00:00
Wei Wang
4447405d76
Merge "Callback on correct method when status is unsuccessful." into klp-modular-dev
2014-03-29 01:53:33 +00:00
John Reck
1be2c0fcdd
am c75db826: Merge "Remove kStatusInvoke & kStatusDraw"
...
* commit 'c75db8266b352ef3a7a6b76654f770d7a24d547a':
Remove kStatusInvoke & kStatusDraw
2014-03-29 01:45:04 +00:00
John Reck
00bd466ac4
am 903d6407: Merge "Remove DisplayList.java"
...
* commit '903d6407b0f5fcf12373daadcce90aaad44a5491':
Remove DisplayList.java
2014-03-29 01:45:01 +00:00
Chris Craik
d17f243598
am 42dda81e: Merge "Update several stale RenderNode variable names"
...
* commit '42dda81e15490193fe5a9d10464dd9049c3362cc':
Update several stale RenderNode variable names
2014-03-29 01:44:58 +00:00
Wei Wang
c07a5dd709
Callback on correct method when status is unsuccessful.
...
Change-Id: I63c07bbae559765af1aecb492379ab18268336d8
2014-03-29 01:42:41 +00:00
John Reck
c75db8266b
Merge "Remove kStatusInvoke & kStatusDraw"
2014-03-29 01:41:50 +00:00
John Reck
903d6407b0
Merge "Remove DisplayList.java"
2014-03-29 01:41:44 +00:00
Chris Craik
42dda81e15
Merge "Update several stale RenderNode variable names"
2014-03-29 01:39:57 +00:00
Michael Wright
151bea7521
am 84ad5d88: am 5d7db503: am e9eb58c9: Merge "Add InputDevice#supportsSource(int)." into klp-modular-dev
...
* commit '84ad5d8891d3a6921b9cfd1329022840682d55e2':
Add InputDevice#supportsSource(int).
2014-03-29 01:14:33 +00:00
Michael Wright
6d4a27a297
am 16ff04ca: am 4669cfff: (-s ours) am d020fd33: Merge changes Ib18c99b9,I9f42eeb9 into klp-modular-dev
...
* commit '16ff04ca38739350cf398c4081cfbf13cac33a9d':
Generate and respect ACTION_CANCEL for joystick fallbacks. DO NOT MERGE
Adds API for determining confirm and cancel keys.
2014-03-29 01:14:30 +00:00
Chris Craik
64a12e177d
Update several stale RenderNode variable names
...
Change-Id: I61c8c66f5a79e3a89ae0d3cffbfd351c05bd6a2b
2014-03-28 18:12:12 -07:00
Michael Wright
84ad5d8891
am 5d7db503: am e9eb58c9: Merge "Add InputDevice#supportsSource(int)." into klp-modular-dev
...
* commit '5d7db503bd779fb712391174a2b12327a0f9ec51':
Add InputDevice#supportsSource(int).
2014-03-29 01:09:30 +00:00
Michael Wright
16ff04ca38
am 4669cfff: (-s ours) am d020fd33: Merge changes Ib18c99b9,I9f42eeb9 into klp-modular-dev
...
* commit '4669cfff1ed590087eade846aee8b4ef58f31739':
Generate and respect ACTION_CANCEL for joystick fallbacks. DO NOT MERGE
Adds API for determining confirm and cancel keys.
2014-03-29 01:09:27 +00:00
Michael Wright
5d7db503bd
am e9eb58c9: Merge "Add InputDevice#supportsSource(int)." into klp-modular-dev
...
* commit 'e9eb58c9a0f48f1ea3afa60f01cfab1f539e5d8e':
Add InputDevice#supportsSource(int).
2014-03-29 00:59:49 +00:00
Michael Wright
4669cfff1e
am d020fd33: Merge changes Ib18c99b9,I9f42eeb9 into klp-modular-dev
...
* commit 'd020fd33d147c88a9cda4976d2fa559e55b4ab03':
Generate and respect ACTION_CANCEL for joystick fallbacks. DO NOT MERGE
Adds API for determining confirm and cancel keys.
2014-03-29 00:59:46 +00:00
Michael Wright
e9eb58c9a0
Merge "Add InputDevice#supportsSource(int)." into klp-modular-dev
2014-03-29 00:56:17 +00:00
Michael Wright
d020fd33d1
Merge changes Ib18c99b9,I9f42eeb9 into klp-modular-dev
...
* changes:
Generate and respect ACTION_CANCEL for joystick fallbacks. DO NOT MERGE
Adds API for determining confirm and cancel keys.
2014-03-29 00:56:00 +00:00
Chris Craik
a4a17246e3
am 69a30b5e: Merge "Simplify RenderNode refresh/build/update process"
...
* commit '69a30b5e549e9da545e3545391e6027d9822e022':
Simplify RenderNode refresh/build/update process
2014-03-29 00:12:37 +00:00
Chris Craik
69a30b5e54
Merge "Simplify RenderNode refresh/build/update process"
2014-03-29 00:07:07 +00:00
Alan Viverette
fa3b429967
am efaf51ad: Merge "Fix drag-to-open forwarding behavior"
...
* commit 'efaf51ad0cb7a371aefe9ac7e08bff637ba59021':
Fix drag-to-open forwarding behavior
2014-03-29 00:03:25 +00:00
Chris Craik
df0c431e6c
Simplify RenderNode refresh/build/update process
...
A View's RenderNode is created lazily, but the instance never changes
afterward.
Change-Id: I0b05769cd49aa55061d3fb8c2ea55a04e8391e48
2014-03-28 17:03:12 -07:00
Alan Viverette
efaf51ad0c
Merge "Fix drag-to-open forwarding behavior"
2014-03-28 23:59:39 +00:00
nagarw
c3b7e6fd44
GlobalActions: Fix Airplane Mode on/off issue
...
Issue: Unable to turn off Airplane mode from power button
after phone reboot
Fix: Initialize mHasTelephony before the PhoneStateListener is
registered to the TelephonyManager so that correct value
of mHasTelephony is reflected when onServiceStateChanged
callback is called.
Bug: 13697360
Change-Id: Ide8afd9c16ea90b98b5912dbff440c5fd67b178d
2014-03-28 16:54:58 -07:00
Alan Viverette
78efdbac8a
Fix drag-to-open forwarding behavior
...
BUG: 13695088
Change-Id: I4c6e824267b145e6dcedb1aa46c8378fd5b6ff83
2014-03-28 16:53:56 -07:00
Jeff Hao
d719a5bece
am 7d89b85f: am f1354dd2: am d648e5f7: am e9b4fd07: Merge "Mark constructor as accessible in LayoutInflater."
...
* commit '7d89b85f499331523e6c976edbd2919603ab9f69':
Mark constructor as accessible in LayoutInflater.
2014-03-28 23:46:14 +00:00
Craig Mautner
77626b190a
am 71888f54: am 1872ce3e: am 155e3133: am d511bc17: Merge "[ActivityManager] Fix a bug: unable to start activity after starting activities during screen off."
...
* commit '71888f54cb256f0d5527e2dd66f95e83992d795f':
[ActivityManager] Fix a bug: unable to start activity after starting activities during screen off.
2014-03-28 23:46:11 +00:00
Michael Wright
0e4ee514b0
am 7ef7ef0e: am c9b937bb: am 6a14146b: am e328056d: Merge "Add support for additional international keyboard mappings"
...
* commit '7ef7ef0e05736698d44876f3e51b841a2dac9be1':
Add support for additional international keyboard mappings
2014-03-28 23:46:08 +00:00
Craig Mautner
0839a55bbd
am 4377086f: am 9c99c55d: (-s ours) am 9395dab7: (-s ours) am ff3362f0: (-s ours) Merge "DO NOT MERGE - [ActivityManager] Ensure consistency behavior when a background activity brings another existed activity to front."
...
* commit '4377086f9412ab61f67907e9f1d487a45def5ac5':
DO NOT MERGE - [ActivityManager] Ensure consistency behavior when a background activity brings another existed activity to front.
2014-03-28 23:46:06 +00:00