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

132796 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Selim Cinek
ac1d91c1de am eeffa380: Merge "Fixed a crash of the notification animation on initial startup" 
* commit 'eeffa3804170d1ecb3521cb3911da7d677fa1611':
  Fixed a crash of the notification animation on initial startup
 2014-04-30 17:27:15 +00:00
Selim Cinek
0653363a76 Merge "Fixed a crash of the notification animation on initial startup" 2014-04-30 17:23:21 +00:00
Selim Cinek
39610545f0 Fixed a crash of the notification animation on initial startup 
When no state was applied yet and an animation was started the system
could crash.

Bug: 14430331
Change-Id: Ic8a4532b73f4d70cb365975f055d6630f61e0318
 2014-04-30 19:19:11 +02:00
Dianne Hackborn
c96190e9fe am c6890f9f: Merge "Switch IProcessObserver to report process state" 
* commit 'c6890f9f517f7b09594ebb6aaf5b338fb905b32f':
  Switch IProcessObserver to report process state
 2014-04-30 16:43:13 +00:00
Dianne Hackborn
406c51b360 Merge "Switch IProcessObserver to report process state" 2014-04-30 16:39:15 +00:00
Kenny Root
2a14818810 am c738d55c: resolved conflicts for merge of 3e320a0c to master 
* commit 'c738d55cd082fe35c1d6d3e2c67b4187c4c4c94e':
  Add TYPE_MAGNIFICATION_OVERLAY to InputWindowInfo::isTrustedOverlay()
 2014-04-30 16:38:00 +00:00
Kenny Root
b3aa8f4804 resolved conflicts for merge of 3e320a0c to master 
Change already in frameworks/native as commit
51eb29fa9a2ffe9c5adb9ea25bfbd51992ff16a4

Change-Id: I23ae58c86dac91efb5210fdc4f080a1d6fb741c3
 2014-04-30 09:33:22 -07:00
Narayan Kamath
3338cb4481 am 9fe07a3a: Merge "Fix x86 build in app_process." 
* commit '9fe07a3ad4b80f405545d99b52b29b0eb3cfa456':
  Fix x86 build in app_process.
 2014-04-30 16:02:30 +00:00
Narayan Kamath
f53418931b Merge "Fix x86 build in app_process." 2014-04-30 15:59:08 +00:00
Adrian Roos
0628485f93 am 9c920229: Merge "Fix broken trust agent reloading" 
* commit '9c9202296fe8460a7b048350165fd1b576cf7a9b':
  Fix broken trust agent reloading
 2014-04-30 15:55:08 +00:00
Adrian Roos
e2b2514342 Merge "Fix broken trust agent reloading" 2014-04-30 15:51:48 +00:00
Adrian Roos
81e046645d Fix broken trust agent reloading 
Bug: 13723878
Change-Id: I2f7f3fad5685e5e57dcddf2f2c3494bb95e38b15
 2014-04-30 17:48:18 +02:00
Narayan Kamath
6eb1b2611c Fix x86 build in app_process. 
Look for __i386__ and not __x86__.

Change-Id: Iffa3709f9d0c96cce17f3183a6f036a78eccc787
 2014-04-30 16:45:07 +01:00
George Mount
b0b8c005d7 am 50642dc0: Merge "Fix NPE when going "back" from Activity Transition." 
* commit '50642dc0c1d2942113e8a2880f0c709af43463a3':
  Fix NPE when going "back" from Activity Transition.
 2014-04-30 14:30:29 +00:00
George Mount
7f89c9b8e6 Merge "Fix NPE when going "back" from Activity Transition." 2014-04-30 14:27:31 +00:00
Jorim Jaggi
b1ceae0550 am 68fb7b84: Merge "NotificationRowLayout shall rest in its grave." 
* commit '68fb7b84318d46fb222986c0d5c26958f932591f':
  NotificationRowLayout shall rest in its grave.
 2014-04-30 13:56:57 +00:00
Jorim Jaggi
8f72e8967b Merge "NotificationRowLayout shall rest in its grave." 2014-04-30 13:53:02 +00:00
Jorim Jaggi
59c77fee17 NotificationRowLayout shall rest in its grave. 
Long live the stack scroller. Also removed some other unused classes.

Change-Id: Iff126a0e74e13caadb6426d5e0e76ba800489d3f
 2014-04-30 15:45:25 +02:00
Jorim Jaggi
65e4a4ee30 am ed8b4ca0: Merge "Layout notifications on top and introduce artifical margin" 
* commit 'ed8b4ca093d8aba40d29ef7ad701b28f8c313d97':
  Layout notifications on top and introduce artifical margin
 2014-04-30 13:31:27 +00:00
Jorim Jaggi
984f6b7519 Merge "Layout notifications on top and introduce artifical margin" 2014-04-30 13:28:17 +00:00
Jorim Jaggi
8c1a44b62f Layout notifications on top and introduce artifical margin 
This allows for animating the notifications between the different
states. So we can nicely switch between Keyguard and full shade,
and make the stack smaller when going to quick settings.

Change-Id: I768dc7cd8f4dc0197365a5befebad24086816a8d
 2014-04-30 15:25:56 +02:00
Bill Yi
29aa2f5645 am a6ffeb36: am ad85d542: am 293513a5: (-s ours) Merge commit \'0b62467b142b61ee1e449ba958ba37dfd961ef56\' into HEAD 
* commit 'a6ffeb36ac36dd30c829c0316bbc7ddc3d4484e0':
  Update framework to use M33 Skia. DO NOT MERGE
 2014-04-30 12:59:52 +00:00
Bill Yi
8ec7d60cd2 am ad85d542: am 293513a5: (-s ours) Merge commit \'0b62467b142b61ee1e449ba958ba37dfd961ef56\' into HEAD 
* commit 'ad85d5422b46a44e9a2166436c34c11e59d30e0c':
  Update framework to use M33 Skia. DO NOT MERGE
 2014-04-30 12:51:01 +00:00
Narayan Kamath
cae15aa3b3 am 6609990e: Don\'t adjust ABI if PackageSetting#pkg is null. 
* commit '6609990e35b11c38f55f6e632160d4f2ff201ea3':
  Don't adjust ABI if PackageSetting#pkg is null.
 2014-04-30 12:42:33 +00:00
Narayan Kamath
ab45d1d6d2 Don't adjust ABI if PackageSetting#pkg is null. 
If means the package hasn't been scanned yet, and we
will adjust the ABI during the scan of the last package
in the shared user group.

NOTE: This needs some more cleaning up, which will be
done along with the remaining TODO in this function.

Change-Id: Ie332806b64e22ab4a4856e1ccd064ff6a01616bf
 2014-04-30 13:36:37 +01:00
Youngsang Cho
a17703ce4f am a6edd3ed: Merge "Explictly release the surface in TV input framework" 
* commit 'a6edd3ed2caf732359ce1156f5881b5ab35f13cc':
  Explictly release the surface in TV input framework
 2014-04-30 11:10:10 +00:00
Youngsang Cho
36c492cf1a Merge "Explictly release the surface in TV input framework" 2014-04-30 11:07:29 +00:00
Youngsang Cho
f836206818 Explictly release the surface in TV input framework 
Change-Id: Id178e8959f9c25d1d5f1ab85d5e8455577570d11
 2014-04-30 20:05:32 +09:00
Narayan Kamath
c0b682b4ae am 51a6f925: Fix dex file pruning logic. 
* commit '51a6f9253399588eedf77d75c578d9aa23d11529':
  Fix dex file pruning logic.
 2014-04-30 10:10:46 +00:00
Narayan Kamath
037ebc9c7c am 85703d58: Adjust instruction sets for shared UID apps. 
* commit '85703d58af1dac692d7d83c03220e45ab2a5aded':
  Adjust instruction sets for shared UID apps.
 2014-04-30 10:10:43 +00:00
Narayan Kamath
0e4fa6ea7b am b4d35dc8: Package manager changes for dual zygote stack. 
* commit 'b4d35dc8e9702f9d0d82d35a105f0eea35672b52':
  Package manager changes for dual zygote stack.
 2014-04-30 10:10:40 +00:00
Narayan Kamath
f6b635e4f0 Fix dex file pruning logic. 
We should now prune all normal files from /data/dalvik-cache
in addition to looking for dex files in all subdirectories of
/data/dalvik-cache.

Change-Id: I4abb2b01b359bbb1b8ece2c9025541a5d5e335f5
 2014-04-30 10:30:12 +01:00
Narayan Kamath
64a48c5131 am a669e019: Merge "Create arch specific cache dirs during zygote startup." 
* commit 'a669e019825a333a9a539f554c84c9f855654595':
  Create arch specific cache dirs during zygote startup.
 2014-04-30 08:46:41 +00:00
Narayan Kamath
df6d6dc2aa Adjust instruction sets for shared UID apps. 
Since shared UID apps are run in the same process,
we'll need to make sure they're compiled for the same
instruction set.

This change implements the recompilation of apps that
don't have any ABI constraints.

Apps that *do* have ABI constraints are harder to deal
with, since we'll need to rescan them to figure out the
full list of ABIs they support and then re-extract the
native libraries from these apps once we find an ABI we
can use throughout.

Change-Id: I365c6b0b18187df814d4736da61b199dd4494e3c
 2014-04-30 09:43:47 +01:00
Narayan Kamath
0f206a149d Package manager changes for dual zygote stack. 
- Pass down the app's instruction set to dexopt so that
  it can compile the dex file for the right architecture.

- Also pass down the app's instruction set to rmdex, movedex
  and getSize so that they can construct the cache file
  location properly.

- Temporarily compile "system" jars such as am,wm etc. for
  both architectures. A follow up change will ensure that
  they're compiled only for one architecture (the same
  arch. as the system server).

- Java "shared" libraries are now compiled for the right
  architecture when an app requires them.

- Improve the app native library ABI detection to account
  for system apps installed in /system/lib{64}/<packagename>
  and also handle sdcard and forward locked apps correctly.

Change-Id: I4f380b146137803e51d56fdf355c3bdfc92c409d
 2014-04-30 09:43:31 +01:00
Narayan Kamath
dfacf855fd Merge "Create arch specific cache dirs during zygote startup." 2014-04-30 08:34:56 +00:00
Narayan Kamath
d1e127e141 Create arch specific cache dirs during zygote startup. 
The runtime expects them to exist before it's launched.
The boot image / art files are created during the first
zygote launch.

Change-Id: I5ed0ad4854dc7785246344c8f6eaf54e560feb7d
 2014-04-30 09:26:05 +01:00
John Spurlock
cee5dc7f2a am 8a479715: Merge "Zen mode tweaks." 
* commit '8a479715185b7c5e6e2907ffbac8243429ce39a1':
  Zen mode tweaks.
 2014-04-30 01:56:19 +00:00
John Spurlock
aa2112f671 Merge "Zen mode tweaks." 2014-04-30 01:53:09 +00:00
John Spurlock
e86de4c067 Zen mode tweaks. 
- Fix regression with alarms.
 - Run all condition provider callbacks on the main thread.
 - Exit zen mode if the current condition is disabled / uninstalled.

Bug:14402762
Change-Id: I0746670c1910047a9dc9b7e29aa1a6c3899fd9fe
 2014-04-29 21:48:26 -04:00
Michael Wright
3e320a0cac am 9feab5f2: am 8a02b20f: Merge "Add TYPE_MAGNIFICATION_OVERLAY to InputWindowInfo::isTrustedOverlay()" 
* commit '9feab5f278d8c9e030e72989a7f6f3d2f376748d':
  Add TYPE_MAGNIFICATION_OVERLAY to InputWindowInfo::isTrustedOverlay()
 2014-04-30 01:19:52 +00:00
Bill Yi
ad85d5422b am 293513a5: (-s ours) Merge commit \'0b62467b142b61ee1e449ba958ba37dfd961ef56\' into HEAD 
* commit '293513a59d36cd96a3e474dde5981380d372d8c9':
  Update framework to use M33 Skia. DO NOT MERGE
 2014-04-30 01:19:37 +00:00
Dianne Hackborn
684bf34ee8 Switch IProcessObserver to report process state 
When IProcessObserver was created, the only information
we had for the state of a process was its "importance".
Now we have the process state, which is much more useful.
Switch to reporting that.

Change-Id: Icdb3eea8cf96f4eff7ed3d584f940a1bd9cc3884
 2014-04-29 17:56:57 -07:00
Deepanshu Gupta
1c78f4e2c0 am 9fb1a63b: am 4bf3c930: (-s ours) am 92bc0753: am 8c15cd0d: am c967d8dc: Add special system view cookie to OverflowButton. [DO NOT MERGE] 
* commit '9fb1a63ba488212681460f2be2b7202581581f41':
  Add special system view cookie to OverflowButton. [DO NOT MERGE]
 2014-04-30 00:48:28 +00:00
Deepanshu Gupta
b86e85600d am 4bf3c930: (-s ours) am 92bc0753: am 8c15cd0d: am c967d8dc: Add special system view cookie to OverflowButton. [DO NOT MERGE] 
* commit '4bf3c930684b1e697c87d3fdb520309c39e51b14':
  Add special system view cookie to OverflowButton. [DO NOT MERGE]
 2014-04-30 00:45:25 +00:00
Deepanshu Gupta
4bf3c93068 am 92bc0753: am 8c15cd0d: am c967d8dc: Add special system view cookie to OverflowButton. [DO NOT MERGE] 
* commit '92bc07534e511b9afa7edaffe867d2674c504d73':
  Add special system view cookie to OverflowButton. [DO NOT MERGE]
 2014-04-30 00:41:26 +00:00
Deepanshu Gupta
92bc07534e am 8c15cd0d: am c967d8dc: Add special system view cookie to OverflowButton. [DO NOT MERGE] 
* commit '8c15cd0dc1d04490b82fd7d8da7611ff3219a1f0':
  Add special system view cookie to OverflowButton. [DO NOT MERGE]
 2014-04-30 00:38:35 +00:00
Deepanshu Gupta
8c15cd0dc1 am c967d8dc: Add special system view cookie to OverflowButton. [DO NOT MERGE] 
* commit 'c967d8dc62c429ecf3e27bf3714a953636e75cbf':
  Add special system view cookie to OverflowButton. [DO NOT MERGE]
 2014-04-30 00:30:29 +00:00
Michael Wright
9feab5f278 am 8a02b20f: Merge "Add TYPE_MAGNIFICATION_OVERLAY to InputWindowInfo::isTrustedOverlay()" 
* commit '8a02b20f6f3fdd5baa5d22321769303ce76ba80a':
  Add TYPE_MAGNIFICATION_OVERLAY to InputWindowInfo::isTrustedOverlay()
 2014-04-30 00:03:29 +00:00
George Mount
d64616e8d2 Fix NPE when going "back" from Activity Transition. 
Also fixed failure to start enter transition when shared element
and exit transition complete simultaneously.

Bug 14399938

Change-Id: Id0d4171f8cf94a30e47aee41ce68b4a25960f219
 2014-04-29 16:58:42 -07:00