OSDN Git Service
John Reck [Thu, 1 May 2014 00:10:35 +0000 (00:10 +0000)]
am
32493276: Merge "Add missing ifdefs"
* commit '
32493276b96c0126d66d211576f5e505a957803a':
Add missing ifdefs
John Reck [Thu, 1 May 2014 00:07:44 +0000 (00:07 +0000)]
Merge "Add missing ifdefs"
Jean-Michel Trivi [Thu, 1 May 2014 00:01:51 +0000 (00:01 +0000)]
am
6417de6e: Merge "Fix MediaFocusControl index management for PlayerRecord"
* commit '
6417de6e4770c5bac9967cb40cd1bd423654cee1':
Fix MediaFocusControl index management for PlayerRecord
John Reck [Wed, 30 Apr 2014 23:59:40 +0000 (16:59 -0700)]
Add missing ifdefs
Change-Id: I1c7c66cf81a31b56e6ae65d34b7936f9e8beec29
Jean-Michel Trivi [Wed, 30 Apr 2014 23:58:02 +0000 (23:58 +0000)]
Merge "Fix MediaFocusControl index management for PlayerRecord"
Ricardo Cervera [Wed, 30 Apr 2014 23:49:42 +0000 (23:49 +0000)]
am
29b67abb: am
6824e4e3: am
8bef5ea7: am
27515952: am
ba333f2f: docs: Added release notes for Android Studio 0.5.2
* commit '
29b67abb61972124c74bf5473c7b4712d31eba99':
docs: Added release notes for Android Studio 0.5.2
Ricardo Cervera [Wed, 30 Apr 2014 23:44:50 +0000 (23:44 +0000)]
am
6824e4e3: am
8bef5ea7: am
27515952: am
ba333f2f: docs: Added release notes for Android Studio 0.5.2
* commit '
6824e4e35164470c96cc4654afc88ccd179ac586':
docs: Added release notes for Android Studio 0.5.2
Elliott Hughes [Wed, 30 Apr 2014 23:40:49 +0000 (23:40 +0000)]
am
e3f963cb: am
fd955f14: am
6a6979ad: am
86315c45: Merge "Fixes issue causing pseudolocalization of strings in non-translatable resource files."
* commit '
e3f963cb47e06577af33fa2b1e904fa4d5a947ae':
Fixes issue causing pseudolocalization of strings in non-translatable resource files.
Deepanshu Gupta [Wed, 30 Apr 2014 23:40:46 +0000 (23:40 +0000)]
am
c6389dc4: am
cd50f729: (-s ours) am
c046c767: am
c0c96012: am
4b5fa4d3: Fix class name for OverflowMenuButton [DO NOT MERGE]
* commit '
c6389dc46b0e00a6b1b066cd11e5b31c01f2514d':
Fix class name for OverflowMenuButton [DO NOT MERGE]
Mindy Pereira [Wed, 30 Apr 2014 23:40:42 +0000 (23:40 +0000)]
am
cf0244ce: am
006c2110: am
11b715da: Merge "Make touch slop region smaller for watch" into klp-modular-dev
* commit '
cf0244ce9912ca1b77e26018e978d562b550f286':
Make touch slop region smaller for watch
Elliott Hughes [Wed, 30 Apr 2014 23:35:39 +0000 (23:35 +0000)]
am
fd955f14: am
6a6979ad: am
86315c45: Merge "Fixes issue causing pseudolocalization of strings in non-translatable resource files."
* commit '
fd955f14d6c87dffd1a20c36ad8001705495f831':
Fixes issue causing pseudolocalization of strings in non-translatable resource files.
Deepanshu Gupta [Wed, 30 Apr 2014 23:35:07 +0000 (23:35 +0000)]
am
cd50f729: (-s ours) am
c046c767: am
c0c96012: am
4b5fa4d3: Fix class name for OverflowMenuButton [DO NOT MERGE]
* commit '
cd50f7294654bf04195d9d1078a984ff9462093c':
Fix class name for OverflowMenuButton [DO NOT MERGE]
Mindy Pereira [Wed, 30 Apr 2014 23:34:56 +0000 (23:34 +0000)]
am
006c2110: am
11b715da: Merge "Make touch slop region smaller for watch" into klp-modular-dev
* commit '
006c211056d3a7561d2d97abae369603cc48e63a':
Make touch slop region smaller for watch
Michael Wright [Wed, 30 Apr 2014 23:32:55 +0000 (23:32 +0000)]
am
d404631d: am
474b0749: am
809c3698: am
54c3529b: Merge "WallpaperManager: add NULL pointer check for getCropAndSetWallpaperIntent"
* commit '
d404631d178edef95170b89f9613318a989cbbfa':
WallpaperManager: add NULL pointer check for getCropAndSetWallpaperIntent
Michael Wright [Wed, 30 Apr 2014 23:28:28 +0000 (23:28 +0000)]
am
474b0749: am
809c3698: am
54c3529b: Merge "WallpaperManager: add NULL pointer check for getCropAndSetWallpaperIntent"
* commit '
474b07497bf1a33ccc889d21287269cd40dc0cf4':
WallpaperManager: add NULL pointer check for getCropAndSetWallpaperIntent
Elliott Hughes [Wed, 30 Apr 2014 23:25:38 +0000 (23:25 +0000)]
am
1c7a408f: am
f84493ec: am
91ff3c18: am
7d3f9e97: Merge "Fix for native leaks in YuvToJpegEncoder.cpp"
* commit '
1c7a408f286df710aeac8197282d93d699399643':
Fix for native leaks in YuvToJpegEncoder.cpp
Elliott Hughes [Wed, 30 Apr 2014 23:19:03 +0000 (23:19 +0000)]
am
f84493ec: am
91ff3c18: am
7d3f9e97: Merge "Fix for native leaks in YuvToJpegEncoder.cpp"
* commit '
f84493ec95bfce41106673645a3e56b185e54df5':
Fix for native leaks in YuvToJpegEncoder.cpp
Ricardo Cervera [Wed, 30 Apr 2014 22:40:00 +0000 (22:40 +0000)]
am
8bef5ea7: am
27515952: am
ba333f2f: docs: Added release notes for Android Studio 0.5.2
* commit '
8bef5ea70161586287ec06e9bd74b30604cd3f2c':
docs: Added release notes for Android Studio 0.5.2
Jean-Michel Trivi [Tue, 29 Apr 2014 23:11:36 +0000 (16:11 -0700)]
Fix MediaFocusControl index management for PlayerRecord
When updating the PlayerRecord stack on playstate changes and
media button event receiver registrations, evaluate the index
of the stack entry to remove against the index of the last playing
entry as this index was valid before the entry was removed.
This affects the insertion index.
Change-Id: Iec58d2df6bcbd8f55925e9e0f9d48f698f7cf4e5
Ricardo Cervera [Wed, 30 Apr 2014 22:03:40 +0000 (22:03 +0000)]
am
27515952: am
ba333f2f: docs: Added release notes for Android Studio 0.5.2
* commit '
27515952f54a8c98eaec694ce74c3b9d9b152746':
docs: Added release notes for Android Studio 0.5.2
Ricardo Cervera [Wed, 30 Apr 2014 21:59:19 +0000 (21:59 +0000)]
am
ba333f2f: docs: Added release notes for Android Studio 0.5.2
* commit '
ba333f2f4c2ca5325b4df1b131c6c26a18beb877':
docs: Added release notes for Android Studio 0.5.2
John Reck [Wed, 30 Apr 2014 21:51:10 +0000 (21:51 +0000)]
am
d77de686: Merge "Use resize, not reserve"
* commit '
d77de686ed7f2ed262c535a786047af7ca10c8fe':
Use resize, not reserve
John Reck [Wed, 30 Apr 2014 21:48:09 +0000 (21:48 +0000)]
Merge "Use resize, not reserve"
Kristian Monsen [Wed, 30 Apr 2014 21:45:35 +0000 (21:45 +0000)]
am
1efcbb7b: Merge "Try to not start up chromium when not needed"
* commit '
1efcbb7bbdeac3540aa418de7c39f74da32d1a19':
Try to not start up chromium when not needed
Ricardo Cervera [Tue, 29 Apr 2014 00:52:55 +0000 (17:52 -0700)]
docs: Added release notes for Android Studio 0.5.2
Change-Id: Ia364620d0ab14648b4db523890c529a0dc5b940d
Kristian Monsen [Wed, 30 Apr 2014 21:40:30 +0000 (21:40 +0000)]
Merge "Try to not start up chromium when not needed"
Elliott Hughes [Wed, 30 Apr 2014 21:35:45 +0000 (21:35 +0000)]
am
6a6979ad: am
86315c45: Merge "Fixes issue causing pseudolocalization of strings in non-translatable resource files."
* commit '
6a6979ad17dfb492fb85a979e8f8688e4ed973b2':
Fixes issue causing pseudolocalization of strings in non-translatable resource files.
Elliott Hughes [Wed, 30 Apr 2014 21:33:06 +0000 (21:33 +0000)]
am
86315c45: Merge "Fixes issue causing pseudolocalization of strings in non-translatable resource files."
* commit '
86315c452b955bf0b874f45c1a2e15aedda91a52':
Fixes issue causing pseudolocalization of strings in non-translatable resource files.
Elliott Hughes [Wed, 30 Apr 2014 21:29:52 +0000 (21:29 +0000)]
Merge "Fixes issue causing pseudolocalization of strings in non-translatable resource files."
John Reck [Wed, 30 Apr 2014 21:19:56 +0000 (14:19 -0700)]
Use resize, not reserve
Reserve ensures the underlying buffer is the correct size, but
iterating across it is not necessarily valid. Use resize() instead
to ensure that the iterator access is valid
Change-Id: I35ff5f4416bb94cf4ce2c6acf72ffd17ab3e523a
Deepanshu Gupta [Wed, 30 Apr 2014 20:38:49 +0000 (20:38 +0000)]
am
c046c767: am
c0c96012: am
4b5fa4d3: Fix class name for OverflowMenuButton [DO NOT MERGE]
* commit '
c046c76739b210d912dae38bf945d60b8d69ab11':
Fix class name for OverflowMenuButton [DO NOT MERGE]
Deepanshu Gupta [Wed, 30 Apr 2014 20:35:04 +0000 (20:35 +0000)]
am
c0c96012: am
4b5fa4d3: Fix class name for OverflowMenuButton [DO NOT MERGE]
* commit '
c0c96012c667d1d91d8f6b763df45e566cae0eaf':
Fix class name for OverflowMenuButton [DO NOT MERGE]
Deepanshu Gupta [Wed, 30 Apr 2014 20:31:35 +0000 (20:31 +0000)]
am
4b5fa4d3: Fix class name for OverflowMenuButton [DO NOT MERGE]
* commit '
4b5fa4d318e7efaffdc678e0cb8953ffc78c2b1e':
Fix class name for OverflowMenuButton [DO NOT MERGE]
Mindy Pereira [Wed, 30 Apr 2014 19:46:07 +0000 (19:46 +0000)]
am
11b715da: Merge "Make touch slop region smaller for watch" into klp-modular-dev
* commit '
11b715da9be818eb4a1c7a3d77b5d0c4ff03e5a2':
Make touch slop region smaller for watch
Mindy Pereira [Wed, 30 Apr 2014 19:43:58 +0000 (19:43 +0000)]
Merge "Make touch slop region smaller for watch" into klp-modular-dev
destradaa [Wed, 30 Apr 2014 19:31:46 +0000 (19:31 +0000)]
am
894106ce: Make sure the FlpHardwareProvider is only advertised to GmsCore if the platform supports it. b/
14117917
* commit '
894106ceb8a96033ec5caa17fa5b41cda2b5294b':
Make sure the FlpHardwareProvider is only advertised to GmsCore if the platform supports it. b/
14117917
Michael Wright [Wed, 30 Apr 2014 19:11:05 +0000 (19:11 +0000)]
am
809c3698: am
54c3529b: Merge "WallpaperManager: add NULL pointer check for getCropAndSetWallpaperIntent"
* commit '
809c369892ddbae908dc47e6a1032a768e9004cb':
WallpaperManager: add NULL pointer check for getCropAndSetWallpaperIntent
Elliott Hughes [Wed, 30 Apr 2014 19:07:01 +0000 (19:07 +0000)]
am
91ff3c18: am
7d3f9e97: Merge "Fix for native leaks in YuvToJpegEncoder.cpp"
* commit '
91ff3c18dbb61ed0087f741dd2bdf911ecf42fef':
Fix for native leaks in YuvToJpegEncoder.cpp
Michael Wright [Wed, 30 Apr 2014 19:06:40 +0000 (19:06 +0000)]
am
54c3529b: Merge "WallpaperManager: add NULL pointer check for getCropAndSetWallpaperIntent"
* commit '
54c3529b4d3f86488799caa0e62a1f3929a79a39':
WallpaperManager: add NULL pointer check for getCropAndSetWallpaperIntent
Michael Wright [Wed, 30 Apr 2014 19:02:56 +0000 (19:02 +0000)]
Merge "WallpaperManager: add NULL pointer check for getCropAndSetWallpaperIntent"
Elliott Hughes [Wed, 30 Apr 2014 19:02:53 +0000 (19:02 +0000)]
am
7d3f9e97: Merge "Fix for native leaks in YuvToJpegEncoder.cpp"
* commit '
7d3f9e9730b100de4c0e643e13bf59bf54ef7819':
Fix for native leaks in YuvToJpegEncoder.cpp
Elliott Hughes [Wed, 30 Apr 2014 18:59:54 +0000 (18:59 +0000)]
Merge "Fix for native leaks in YuvToJpegEncoder.cpp"
Igor Viarheichyk [Wed, 30 Apr 2014 18:56:42 +0000 (11:56 -0700)]
Fixes issue causing pseudolocalization of strings
in non-translatable resource files.
Change-Id: Ic8e5effc86226d5be00561ac71bab7695ef90376
Mindy Pereira [Wed, 30 Apr 2014 18:36:59 +0000 (11:36 -0700)]
Make touch slop region smaller for watch
Change-Id: I3ebe8855b13648dea5f9a374ec4daae6271f22db
destradaa [Wed, 30 Apr 2014 18:29:11 +0000 (11:29 -0700)]
Make sure the FlpHardwareProvider is only advertised to GmsCore if the platform supports it.
b/
14117917
Change-Id: Id6c2444893bcf192049e3233d1296eac16fcf826
Adrian Roos [Wed, 30 Apr 2014 17:49:44 +0000 (17:49 +0000)]
am
6a766495: Merge "Fix broken trust agent reloading v2"
* commit '
6a766495a7a5e83e1359ee68e8e9560af451a630':
Fix broken trust agent reloading v2
Adrian Roos [Wed, 30 Apr 2014 17:41:24 +0000 (17:41 +0000)]
Merge "Fix broken trust agent reloading v2"
Kenny Guy [Wed, 30 Apr 2014 17:39:33 +0000 (17:39 +0000)]
am
56afa6d5: Merge "Extend LauncherApps service to expose enabled state."
* commit '
56afa6d53216541aa397b051ab74c130f488cd96':
Extend LauncherApps service to expose enabled state.
Narayan Kamath [Wed, 30 Apr 2014 17:39:29 +0000 (17:39 +0000)]
am
4bec7879: am
21ccb07f: am
414d9405: am
56cd8dbf: Merge "Cast CallVoidMethod\'s size_t parameters to jint"
* commit '
4bec78790305673ae65438bed9a96b807a4d0e73':
Cast CallVoidMethod's size_t parameters to jint
Narayan Kamath [Wed, 30 Apr 2014 17:39:26 +0000 (17:39 +0000)]
am
e05d3b14: am
516130cc: am
dbbf431b: am
d0f7f418: Merge "Freeing frame map"
* commit '
e05d3b14f6f5f101c16392318c2d571a37208078':
Freeing frame map
Bill Yi [Wed, 30 Apr 2014 17:39:22 +0000 (17:39 +0000)]
Michael Wright [Wed, 30 Apr 2014 17:39:18 +0000 (17:39 +0000)]
am
9aab6ea4: am
1e67bcec: am
263c36a1: am
ade631ee: Merge "NULL previous background bitmap upon changing wallpaper"
* commit '
9aab6ea4ee3f0152b6f9e23377616927923120d3':
NULL previous background bitmap upon changing wallpaper
Michael Wright [Wed, 30 Apr 2014 17:39:15 +0000 (17:39 +0000)]
am
571bd935: am
bba434af: am
10884694: am
357c75e7: Merge "Add missing character combinations for international layouts"
* commit '
571bd935a448397fcf21d0e9b97d3174b1317e49':
Add missing character combinations for international layouts
Kenny Guy [Wed, 30 Apr 2014 17:38:10 +0000 (17:38 +0000)]
Merge "Extend LauncherApps service to expose enabled state."
Narayan Kamath [Wed, 30 Apr 2014 17:36:14 +0000 (17:36 +0000)]
am
21ccb07f: am
414d9405: am
56cd8dbf: Merge "Cast CallVoidMethod\'s size_t parameters to jint"
* commit '
21ccb07fbe97097b6540097d89dd456447779178':
Cast CallVoidMethod's size_t parameters to jint
Narayan Kamath [Wed, 30 Apr 2014 17:36:10 +0000 (17:36 +0000)]
am
516130cc: am
dbbf431b: am
d0f7f418: Merge "Freeing frame map"
* commit '
516130ccb1841afb6ef154c28269d91594925429':
Freeing frame map
Bill Yi [Wed, 30 Apr 2014 17:34:28 +0000 (17:34 +0000)]
Michael Wright [Wed, 30 Apr 2014 17:34:19 +0000 (17:34 +0000)]
am
1e67bcec: am
263c36a1: am
ade631ee: Merge "NULL previous background bitmap upon changing wallpaper"
* commit '
1e67bcec505b1bfb67a83cb3d64e20c2bacf8581':
NULL previous background bitmap upon changing wallpaper
Michael Wright [Wed, 30 Apr 2014 17:33:23 +0000 (17:33 +0000)]
am
bba434af: am
10884694: am
357c75e7: Merge "Add missing character combinations for international layouts"
* commit '
bba434af67600b1fb4a32f2c130526ad9e938f86':
Add missing character combinations for international layouts
Selim Cinek [Wed, 30 Apr 2014 17:27:15 +0000 (17:27 +0000)]
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
Selim Cinek [Wed, 30 Apr 2014 17:23:21 +0000 (17:23 +0000)]
Merge "Fixed a crash of the notification animation on initial startup"
Selim Cinek [Wed, 30 Apr 2014 16:57:47 +0000 (18:57 +0200)]
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
Dianne Hackborn [Wed, 30 Apr 2014 16:43:13 +0000 (16:43 +0000)]
am
c6890f9f: Merge "Switch IProcessObserver to report process state"
* commit '
c6890f9f517f7b09594ebb6aaf5b338fb905b32f':
Switch IProcessObserver to report process state
Dianne Hackborn [Wed, 30 Apr 2014 16:39:15 +0000 (16:39 +0000)]
Merge "Switch IProcessObserver to report process state"
Kenny Root [Wed, 30 Apr 2014 16:38:00 +0000 (16:38 +0000)]
am
c738d55c: resolved conflicts for merge of
3e320a0c to master
* commit '
c738d55cd082fe35c1d6d3e2c67b4187c4c4c94e':
Add TYPE_MAGNIFICATION_OVERLAY to InputWindowInfo::isTrustedOverlay()
Kenny Root [Wed, 30 Apr 2014 16:31:44 +0000 (09:31 -0700)]
resolved conflicts for merge of
3e320a0c to master
Change already in frameworks/native as commit
51eb29fa9a2ffe9c5adb9ea25bfbd51992ff16a4
Change-Id: I23ae58c86dac91efb5210fdc4f080a1d6fb741c3
Adrian Roos [Wed, 30 Apr 2014 16:23:38 +0000 (18:23 +0200)]
Fix broken trust agent reloading v2
Bug:
13723878
Change-Id: I61f313bfc7ff0dc502551b54d580a7ce8694f04d
Narayan Kamath [Wed, 30 Apr 2014 16:02:30 +0000 (16:02 +0000)]
am
9fe07a3a: Merge "Fix x86 build in app_process."
* commit '
9fe07a3ad4b80f405545d99b52b29b0eb3cfa456':
Fix x86 build in app_process.
Narayan Kamath [Wed, 30 Apr 2014 15:59:07 +0000 (15:59 +0000)]
Merge "Fix x86 build in app_process."
Adrian Roos [Wed, 30 Apr 2014 15:55:08 +0000 (15:55 +0000)]
am
9c920229: Merge "Fix broken trust agent reloading"
* commit '
9c9202296fe8460a7b048350165fd1b576cf7a9b':
Fix broken trust agent reloading
Adrian Roos [Wed, 30 Apr 2014 15:51:47 +0000 (15:51 +0000)]
Merge "Fix broken trust agent reloading"
Adrian Roos [Wed, 30 Apr 2014 15:48:18 +0000 (17:48 +0200)]
Fix broken trust agent reloading
Bug:
13723878
Change-Id: I2f7f3fad5685e5e57dcddf2f2c3494bb95e38b15
Narayan Kamath [Wed, 30 Apr 2014 15:45:07 +0000 (16:45 +0100)]
Fix x86 build in app_process.
Look for __i386__ and not __x86__.
Change-Id: Iffa3709f9d0c96cce17f3183a6f036a78eccc787
Narayan Kamath [Wed, 30 Apr 2014 15:37:58 +0000 (15:37 +0000)]
am
414d9405: am
56cd8dbf: Merge "Cast CallVoidMethod\'s size_t parameters to jint"
* commit '
414d94059f3559b67b4da25a34de6d5312abe06f':
Cast CallVoidMethod's size_t parameters to jint
Narayan Kamath [Wed, 30 Apr 2014 15:37:44 +0000 (15:37 +0000)]
am
dbbf431b: am
d0f7f418: Merge "Freeing frame map"
* commit '
dbbf431b289bb7a01b43db3412ecab00abe18362':
Freeing frame map
Narayan Kamath [Wed, 30 Apr 2014 15:13:02 +0000 (15:13 +0000)]
am
56cd8dbf: Merge "Cast CallVoidMethod\'s size_t parameters to jint"
* commit '
56cd8dbfbdeebc36ccbd5b2beedaaaa3f13c8b07':
Cast CallVoidMethod's size_t parameters to jint
Narayan Kamath [Wed, 30 Apr 2014 15:12:58 +0000 (15:12 +0000)]
am
d0f7f418: Merge "Freeing frame map"
* commit '
d0f7f41828493b0679e908f7bb3ed3b8e838c463':
Freeing frame map
George Mount [Wed, 30 Apr 2014 14:30:29 +0000 (14:30 +0000)]
am
50642dc0: Merge "Fix NPE when going "back" from Activity Transition."
* commit '
50642dc0c1d2942113e8a2880f0c709af43463a3':
Fix NPE when going "back" from Activity Transition.
George Mount [Wed, 30 Apr 2014 14:27:31 +0000 (14:27 +0000)]
Merge "Fix NPE when going "back" from Activity Transition."
Jorim Jaggi [Wed, 30 Apr 2014 13:56:57 +0000 (13:56 +0000)]
am
68fb7b84: Merge "NotificationRowLayout shall rest in its grave."
* commit '
68fb7b84318d46fb222986c0d5c26958f932591f':
NotificationRowLayout shall rest in its grave.
Jorim Jaggi [Wed, 30 Apr 2014 13:53:02 +0000 (13:53 +0000)]
Merge "NotificationRowLayout shall rest in its grave."
Jorim Jaggi [Wed, 30 Apr 2014 13:38:16 +0000 (15:38 +0200)]
NotificationRowLayout shall rest in its grave.
Long live the stack scroller. Also removed some other unused classes.
Change-Id: Iff126a0e74e13caadb6426d5e0e76ba800489d3f
Narayan Kamath [Wed, 30 Apr 2014 13:34:04 +0000 (13:34 +0000)]
Merge "Cast CallVoidMethod's size_t parameters to jint"
Jorim Jaggi [Wed, 30 Apr 2014 13:31:27 +0000 (13:31 +0000)]
am
ed8b4ca0: Merge "Layout notifications on top and introduce artifical margin"
* commit '
ed8b4ca093d8aba40d29ef7ad701b28f8c313d97':
Layout notifications on top and introduce artifical margin
Jorim Jaggi [Wed, 30 Apr 2014 13:28:17 +0000 (13:28 +0000)]
Merge "Layout notifications on top and introduce artifical margin"
Jorim Jaggi [Tue, 29 Apr 2014 17:04:02 +0000 (19:04 +0200)]
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
Bill Yi [Wed, 30 Apr 2014 12:59:52 +0000 (12:59 +0000)]
am
a6ffeb36: am
ad85d542: am
293513a5: (-s ours) Merge commit \'
0b62467b142b61ee1e449ba958ba37dfd961ef56\' into HEAD
* commit '
a6ffeb36ac36dd30c829c0316bbc7ddc3d4484e0':
Update framework to use M33 Skia. DO NOT MERGE
Bill Yi [Wed, 30 Apr 2014 12:51:01 +0000 (12:51 +0000)]
am
ad85d542: am
293513a5: (-s ours) Merge commit \'
0b62467b142b61ee1e449ba958ba37dfd961ef56\' into HEAD
* commit '
ad85d5422b46a44e9a2166436c34c11e59d30e0c':
Update framework to use M33 Skia. DO NOT MERGE
Narayan Kamath [Wed, 30 Apr 2014 12:42:33 +0000 (12:42 +0000)]
am
6609990e: Don\'t adjust ABI if PackageSetting#pkg is null.
* commit '
6609990e35b11c38f55f6e632160d4f2ff201ea3':
Don't adjust ABI if PackageSetting#pkg is null.
Narayan Kamath [Wed, 30 Apr 2014 12:33:38 +0000 (13:33 +0100)]
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
Youngsang Cho [Wed, 30 Apr 2014 11:10:10 +0000 (11:10 +0000)]
am
a6edd3ed: Merge "Explictly release the surface in TV input framework"
* commit '
a6edd3ed2caf732359ce1156f5881b5ab35f13cc':
Explictly release the surface in TV input framework
Youngsang Cho [Wed, 30 Apr 2014 11:07:29 +0000 (11:07 +0000)]
Merge "Explictly release the surface in TV input framework"
Youngsang Cho [Wed, 30 Apr 2014 08:24:20 +0000 (17:24 +0900)]
Explictly release the surface in TV input framework
Change-Id: Id178e8959f9c25d1d5f1ab85d5e8455577570d11
Narayan Kamath [Wed, 30 Apr 2014 10:58:30 +0000 (10:58 +0000)]
Merge "Freeing frame map"
Mykola Kondratenko [Tue, 15 Apr 2014 07:35:44 +0000 (09:35 +0200)]
Freeing frame map
FileMap memory is never released until application exit
Release it now as the texture is already loaded and the memory
used for the packed resource can be released.
Change-Id: Id08a1e466337b3a0179684eb6a444e18147ee343
Narayan Kamath [Wed, 30 Apr 2014 10:10:46 +0000 (10:10 +0000)]
am
51a6f925: Fix dex file pruning logic.
* commit '
51a6f9253399588eedf77d75c578d9aa23d11529':
Fix dex file pruning logic.
Narayan Kamath [Wed, 30 Apr 2014 10:10:43 +0000 (10:10 +0000)]
am
85703d58: Adjust instruction sets for shared UID apps.
* commit '
85703d58af1dac692d7d83c03220e45ab2a5aded':
Adjust instruction sets for shared UID apps.
Narayan Kamath [Wed, 30 Apr 2014 10:10:40 +0000 (10:10 +0000)]
am
b4d35dc8: Package manager changes for dual zygote stack.
* commit '
b4d35dc8e9702f9d0d82d35a105f0eea35672b52':
Package manager changes for dual zygote stack.
Narayan Kamath [Tue, 29 Apr 2014 15:49:27 +0000 (16:49 +0100)]
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
Allen Shen [Tue, 29 Apr 2014 08:16:29 +0000 (16:16 +0800)]
WallpaperManager: add NULL pointer check for getCropAndSetWallpaperIntent
Originally the api 'getCropAndSetWallpaperIntent' does not check
whether the parsed parameter is a NULL pointer, as leads to the
whole app crash if it call this api with a null parameter accidentally.
A null pointer check logic is added into its original parameter check
logic, so that this API will throw an IllegalArgumentException if it
is parsed with a null pointer
Change-Id: Ib7de40e571419d09e1a744edc969eb7162766b75
OSDN Git Service
