drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
127,021 Commits 1 Branch 0 Tags
Commit Graph

127021 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jorim Jaggi
d529e294ae Merge "Reuse KeyguardViewMediator for new Keyguard implementation." into master-lockscreen-dev 2014-03-31 19:11:32 +00:00
Glenn Kasten
3d6d9e45b1 am 1dd51aba: Merge "Use set() return value instead of separate call to initCheck()" 
* commit '1dd51abaae27af8e12ee06b9651fd6e4334963a5':
  Use set() return value instead of separate call to initCheck()
 2014-03-31 19:08:23 +00:00
Glenn Kasten
1dd51abaae Merge "Use set() return value instead of separate call to initCheck()" 2014-03-31 19:03:32 +00:00
Chris Wren
bf430edf3e am e1791add: Merge "add a null check around scrollAdapter access" 
* commit 'e1791add1a19f1860084889188168ca32fdf3924':
  add a null check around scrollAdapter access
 2014-03-31 18:59:03 +00:00
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
Chris Wren
e1791add1a Merge "add a null check around scrollAdapter access" 2014-03-31 18:53:34 +00:00
Chris Wren
de3b1a2b2d add a null check around scrollAdapter access 
Bug: 13727213
Change-Id: Ia92c06b66fc4712a758bf813c30f543b08546a80
 2014-03-31 14:47:59 -04:00
Glenn Kasten
416d3cacdd am 47bbaea4: Merge "Include more information in AudioTrack JNI error logs" 
* commit '47bbaea4c3f5dee97f2e1c56c6cc9957efa17eaf':
  Include more information in AudioTrack JNI error logs
 2014-03-31 18:12:58 +00:00
John Reck
26311cb5d5 am 8e150fef: Merge "Add invokeFunctor" 
* commit '8e150fef2bb0d3e672b7ecba2caa35ee37a8c27d':
  Add invokeFunctor
 2014-03-31 18:09:05 +00:00
Glenn Kasten
47bbaea4c3 Merge "Include more information in AudioTrack JNI error logs" 2014-03-31 18:07:43 +00:00
John Reck
8e150fef2b Merge "Add invokeFunctor" 2014-03-31 18:04:06 +00:00
Glenn Kasten
b0923bb1b9 am 877ffde5: Merge "Synchronize channel masks in AudioFormat with system/audio.h" 
* commit '877ffde5f6b5d605a0c3727f8538c8f48427fdab':
  Synchronize channel masks in AudioFormat with system/audio.h
 2014-03-31 18:01:55 +00:00
Glenn Kasten
877ffde5f6 Merge "Synchronize channel masks in AudioFormat with system/audio.h" 2014-03-31 17:58:36 +00:00
Glenn Kasten
8f81d0832b Include more information in AudioTrack JNI error logs 
Change-Id: I0e57060dd46cce4ec8217bb7d122bd010c974717
 2014-03-31 10:38:47 -07:00
Glenn Kasten
a30df72198 am 8bfe0555: Merge "Fix warnings" 
* commit '8bfe0555cce1213255254d2686745077e9bd4062':
  Fix warnings
 2014-03-31 17:23:18 +00:00
Glenn Kasten
8bfe0555cc Merge "Fix warnings" 2014-03-31 17:19:49 +00:00
Glenn Kasten
f24c5e4c39 am 0df5cf5a: Merge "Fix typo" 
* commit '0df5cf5ad70dfd2085a1bec13188350697b932a2':
  Fix typo
 2014-03-31 16:58:57 +00:00
Glenn Kasten
0df5cf5ad7 Merge "Fix typo" 2014-03-31 16:53:23 +00:00
Alexandra Gherghina
053cee7822 am bd6738b2: Merge "Mark the keyguard package as required for profile" 
* commit 'bd6738b2e11b8861cb4a420f437343b3c80a21c9':
  Mark the keyguard package as required for profile
 2014-03-31 16:22:01 +00:00
Alexandra Gherghina
bd6738b2e1 Merge "Mark the keyguard package as required for profile" 2014-03-31 16:15:48 +00:00
Alexandra Gherghina
d4749eb4a8 Mark the keyguard package as required for profile 
Change-Id: I8edae23c57e1f1af2c086c0f67d9d240d3726d84
 2014-03-31 16:15:40 +01:00
Narayan Kamath
e402774407 am 439cf5b4: am 56a8f8b4: resolved conflicts for merge of 439145f0 to klp-modular-dev-plus-aosp 
* commit '439cf5b433123970a94388cf9309d9ea4d31b3cb':
  Don't make isSafeMode a field on the Zygote class.
 2014-03-31 13:21:38 +00:00
Narayan Kamath
439cf5b433 am 56a8f8b4: resolved conflicts for merge of 439145f0 to klp-modular-dev-plus-aosp 
* commit '56a8f8b48ff1d0855209307b9076d6e9b348b59b':
  Don't make isSafeMode a field on the Zygote class.
 2014-03-31 13:16:16 +00:00
Narayan Kamath
56a8f8b48f resolved conflicts for merge of 439145f0 to klp-modular-dev-plus-aosp 
This isn't a straightforward conflict resolution. This code
has changed significantly. mSafeMode is now a flag on the activity
manager service, and is set when SystemServer calls enterSafeMode.

Change-Id: I1e8ff524566c5e44bb6bf3b138cdebb70004aca3
 2014-03-31 14:10:53 +01:00
Christoph Studer
085226c40f am 546bec8e: Notification usage stats 
* commit '546bec8ebf2cf865e88d02cc8cb29563ad224967':
  Notification usage stats
 2014-03-31 12:45:33 +00:00
Narayan Kamath
439145f0e7 am ab561f5b: Merge "Don\'t make isSafeMode a field on the Zygote class." 
* commit 'ab561f5b4073055c414866ff3dbe8372263474a7':
  Don't make isSafeMode a field on the Zygote class.
 2014-03-31 12:42:14 +00:00
Narayan Kamath
ab561f5b40 Merge "Don't make isSafeMode a field on the Zygote class." 2014-03-31 12:32:50 +00:00
Narayan Kamath
d1a8d9f452 Don't make isSafeMode a field on the Zygote class. 
This field is written and read exclusively by the system server,
and should therefore belong to the SystemServer class.

Change-Id: I2708a9a45c0c9cd1a6f563e8cc5844bd8c424bf7
 2014-03-31 13:16:45 +01: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
John Reck
0d1f634f4b Add invokeFunctor 
Change-Id: I09e675d3e02e3e528642175ada00b2b17fab7652
 2014-03-28 20:57:32 -07: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