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

129618 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jean-Michel Trivi
18bfd887f6 Merge "Fix MediaFocusControl index management for PlayerRecord" 2014-04-30 23:58:02 +00:00
Ricardo Cervera
f74b8a7738 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
 2014-04-30 23:44:50 +00:00
Elliott Hughes
8c2fff2385 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.
 2014-04-30 23:35:39 +00:00
Deepanshu Gupta
5e2901ba1c 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]
 2014-04-30 23:35:07 +00:00
Mindy Pereira
99c4f0713e 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
 2014-04-30 23:34:56 +00:00
Michael Wright
a2dc6fab5e am 474b0749: am 809c3698: am 54c3529b: Merge "WallpaperManager: add NULL pointer check for getCropAndSetWallpaperIntent" 
* commit '474b07497bf1a33ccc889d21287269cd40dc0cf4':
  WallpaperManager: add NULL pointer check for getCropAndSetWallpaperIntent
 2014-04-30 23:28:28 +00:00
Elliott Hughes
fae7bedcf0 am f84493ec: am 91ff3c18: am 7d3f9e97: Merge "Fix for native leaks in YuvToJpegEncoder.cpp" 
* commit 'f84493ec95bfce41106673645a3e56b185e54df5':
  Fix for native leaks in YuvToJpegEncoder.cpp
 2014-04-30 23:19:03 +00:00
Ricardo Cervera
6824e4e351 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
 2014-04-30 22:40:00 +00:00
Jean-Michel Trivi
0d90876893 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
 2014-04-30 15:38:32 -07:00
Ricardo Cervera
8bef5ea701 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
 2014-04-30 22:03:40 +00:00
Ricardo Cervera
27515952f5 am ba333f2f: docs: Added release notes for Android Studio 0.5.2 
* commit 'ba333f2f4c2ca5325b4df1b131c6c26a18beb877':
  docs: Added release notes for Android Studio 0.5.2
 2014-04-30 21:59:19 +00:00
John Reck
4ac525a9f1 Merge "Use resize, not reserve" 2014-04-30 21:48:09 +00:00
Ricardo Cervera
ba333f2f4c docs: Added release notes for Android Studio 0.5.2 
Change-Id: Ia364620d0ab14648b4db523890c529a0dc5b940d
 2014-04-30 14:41:44 -07:00
Kristian Monsen
b56ddaaf0e Merge "Try to not start up chromium when not needed" 2014-04-30 21:40:31 +00:00
Elliott Hughes
fd955f14d6 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.
 2014-04-30 21:35:45 +00:00
Elliott Hughes
6a6979ad17 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.
 2014-04-30 21:33:06 +00:00
Elliott Hughes
86315c452b Merge "Fixes issue causing pseudolocalization of strings in non-translatable resource files." 2014-04-30 21:29:52 +00:00
John Reck
52622668f9 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
 2014-04-30 14:19:56 -07:00
Deepanshu Gupta
cd50f72946 am c046c767: am c0c96012: am 4b5fa4d3: Fix class name for OverflowMenuButton [DO NOT MERGE] 
* commit 'c046c76739b210d912dae38bf945d60b8d69ab11':
  Fix class name for OverflowMenuButton [DO NOT MERGE]
 2014-04-30 20:38:49 +00:00
Deepanshu Gupta
c046c76739 am c0c96012: am 4b5fa4d3: Fix class name for OverflowMenuButton [DO NOT MERGE] 
* commit 'c0c96012c667d1d91d8f6b763df45e566cae0eaf':
  Fix class name for OverflowMenuButton [DO NOT MERGE]
 2014-04-30 20:35:04 +00:00
Deepanshu Gupta
c0c96012c6 am 4b5fa4d3: Fix class name for OverflowMenuButton [DO NOT MERGE] 
* commit '4b5fa4d318e7efaffdc678e0cb8953ffc78c2b1e':
  Fix class name for OverflowMenuButton [DO NOT MERGE]
 2014-04-30 20:31:35 +00:00
Mindy Pereira
006c211056 am 11b715da: Merge "Make touch slop region smaller for watch" into klp-modular-dev 
* commit '11b715da9be818eb4a1c7a3d77b5d0c4ff03e5a2':
  Make touch slop region smaller for watch
 2014-04-30 19:46:07 +00:00
Mindy Pereira
11b715da9b Merge "Make touch slop region smaller for watch" into klp-modular-dev 2014-04-30 19:43:59 +00:00
Michael Wright
474b07497b am 809c3698: am 54c3529b: Merge "WallpaperManager: add NULL pointer check for getCropAndSetWallpaperIntent" 
* commit '809c369892ddbae908dc47e6a1032a768e9004cb':
  WallpaperManager: add NULL pointer check for getCropAndSetWallpaperIntent
 2014-04-30 19:11:05 +00:00
Elliott Hughes
f84493ec95 am 91ff3c18: am 7d3f9e97: Merge "Fix for native leaks in YuvToJpegEncoder.cpp" 
* commit '91ff3c18dbb61ed0087f741dd2bdf911ecf42fef':
  Fix for native leaks in YuvToJpegEncoder.cpp
 2014-04-30 19:07:01 +00:00
Michael Wright
809c369892 am 54c3529b: Merge "WallpaperManager: add NULL pointer check for getCropAndSetWallpaperIntent" 
* commit '54c3529b4d3f86488799caa0e62a1f3929a79a39':
  WallpaperManager: add NULL pointer check for getCropAndSetWallpaperIntent
 2014-04-30 19:06:40 +00:00
Michael Wright
54c3529b4d Merge "WallpaperManager: add NULL pointer check for getCropAndSetWallpaperIntent" 2014-04-30 19:02:56 +00:00
Elliott Hughes
91ff3c18db am 7d3f9e97: Merge "Fix for native leaks in YuvToJpegEncoder.cpp" 
* commit '7d3f9e9730b100de4c0e643e13bf59bf54ef7819':
  Fix for native leaks in YuvToJpegEncoder.cpp
 2014-04-30 19:02:53 +00:00
Elliott Hughes
7d3f9e9730 Merge "Fix for native leaks in YuvToJpegEncoder.cpp" 2014-04-30 18:59:54 +00:00
Igor Viarheichyk
84410b054c Fixes issue causing pseudolocalization of strings 
in non-translatable resource files.

Change-Id: Ic8e5effc86226d5be00561ac71bab7695ef90376
 2014-04-30 11:56:42 -07:00
Mindy Pereira
2920646cbe Make touch slop region smaller for watch 
Change-Id: I3ebe8855b13648dea5f9a374ec4daae6271f22db
 2014-04-30 11:36:59 -07:00
destradaa
cfbdcd2594 Make sure the FlpHardwareProvider is only advertised to GmsCore if the platform supports it. 
b/14117917

Change-Id: Id6c2444893bcf192049e3233d1296eac16fcf826
 2014-04-30 11:31:21 -07:00
Adrian Roos
08d4a0ab48 Merge "Fix broken trust agent reloading v2" 2014-04-30 17:41:25 +00:00
Kenny Guy
7e5264ced7 Merge "Extend LauncherApps service to expose enabled state." 2014-04-30 17:38:10 +00:00
Narayan Kamath
fad6fa7a04 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
 2014-04-30 17:36:14 +00:00
Narayan Kamath
52adfdaafd am 516130cc: am dbbf431b: am d0f7f418: Merge "Freeing frame map" 
* commit '516130ccb1841afb6ef154c28269d91594925429':
  Freeing frame map
 2014-04-30 17:36:10 +00:00
Bill Yi
10882ec8d7 am d21082ca: am 9a76e9ba: Fix build error 
* commit 'd21082ca0c116ba737e6e93c2917d0b557cc48fc':
  Fix build error
 2014-04-30 17:34:28 +00:00
Michael Wright
a810f11986 am 1e67bcec: am 263c36a1: am ade631ee: Merge "NULL previous background bitmap upon changing wallpaper" 
* commit '1e67bcec505b1bfb67a83cb3d64e20c2bacf8581':
  NULL previous background bitmap upon changing wallpaper
 2014-04-30 17:34:19 +00:00
Michael Wright
02b4777a54 am bba434af: am 10884694: am 357c75e7: Merge "Add missing character combinations for international layouts" 
* commit 'bba434af67600b1fb4a32f2c130526ad9e938f86':
  Add missing character combinations for international layouts
 2014-04-30 17:33:23 +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
406c51b360 Merge "Switch IProcessObserver to report process state" 2014-04-30 16:39:15 +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
Adrian Roos
a5956424b8 Fix broken trust agent reloading v2 
Bug: 13723878
Change-Id: I61f313bfc7ff0dc502551b54d580a7ce8694f04d
 2014-04-30 18:23:38 +02:00
Narayan Kamath
f53418931b Merge "Fix x86 build in app_process." 2014-04-30 15:59: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
Narayan Kamath
21ccb07fbe am 414d9405: am 56cd8dbf: Merge "Cast CallVoidMethod\'s size_t parameters to jint" 
* commit '414d94059f3559b67b4da25a34de6d5312abe06f':
  Cast CallVoidMethod's size_t parameters to jint
 2014-04-30 15:37:58 +00:00
Narayan Kamath
516130ccb1 am dbbf431b: am d0f7f418: Merge "Freeing frame map" 
* commit 'dbbf431b289bb7a01b43db3412ecab00abe18362':
  Freeing frame map
 2014-04-30 15:37:44 +00:00