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

126646 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Baligh Uddin
b5853c7453 am 7e905127: (-s ours) am de11c260: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev 
* commit '7e90512771943c2b87d96bba8a90e80eb26c65a7':
  Import translations. DO NOT MERGE
 2014-03-27 22:26:38 +00:00
Alan Viverette
433ee01236 Merge "Allow a null tint in TouchFeedbackDrawable" 2014-03-27 22:25:11 +00:00
Alan Viverette
e3eb8ec0b7 Allow a null tint in TouchFeedbackDrawable 
This ensures we won't crash if a Quantum drawable is inflated in a
Holo theme, but it won't look correct, so don't do that.

BUG: 13677025
Change-Id: I30cbff36bf3746543240d4c96cc57776874566d8
 2014-03-27 15:21:11 -07:00
Baligh Uddin
7e90512771 am de11c260: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev 
* commit 'de11c26060d0ed58ea40cefa2e45b7a14fb65d36':
  Import translations. DO NOT MERGE
 2014-03-27 22:14:24 +00:00
John Reck
9eaf763aa8 Merge "Force-enable hardware acceleration for apps" 2014-03-27 22:09:49 +00:00
Adam Lesinski
891a1f343d am 587e420e: am 004ceaaa: am 55a65509: Merge "Reduce warning verbosity in aapt" 
* commit '587e420ea9fb5578985e32d31b8791e773a5861e':
  Reduce warning verbosity in aapt
 2014-03-27 22:07:51 +00:00
Leon Scroggins
3dbeca1799 Merge "Remove SkOmxPixelRef to fix build." 2014-03-27 21:51:37 +00:00
John Reck
2a09011074 Force-enable hardware acceleration for apps 
Change-Id: Ie45581fac2b6b71aeb7b652485915e2518372efc
 2014-03-27 14:51:01 -07:00
Baligh Uddin
de11c26060 Merge "Import translations. DO NOT MERGE" into klp-modular-dev 2014-03-27 21:43:39 +00:00
Baligh Uddin
f8bc9e3b6a Merge "Import translations. DO NOT MERGE" 2014-03-27 21:43:34 +00:00
Baligh Uddin
70039b67a5 Merge "Import translations. DO NOT MERGE" 2014-03-27 21:43:30 +00:00
Leon Scroggins
7a3878cd8f Remove SkOmxPixelRef to fix build. 
Recent changes to SkPixelRef (from which SkOmxPixelRef inherited)
added abstract functions which SkOmxPixelRef does not implement.

Solution: remove SkOmxPixelRef, which is completely unused. The only
code that created one was commented out at the same time as it was
added in 2009, so there's likely no benefit to reviving it.

Change-Id: Icbf2537fcc03fd464fd791ff91659a1812019623
 2014-03-27 17:36:18 -04:00
Adam Lesinski
587e420ea9 am 004ceaaa: am 55a65509: Merge "Reduce warning verbosity in aapt" 
* commit '004ceaaa4d3ddfc66ba3f3635e987c2ddc7f2d09':
  Reduce warning verbosity in aapt
 2014-03-27 21:05:06 +00:00
Adam Lesinski
004ceaaa4d am 55a65509: Merge "Reduce warning verbosity in aapt" 
* commit '55a655091a30667ba7c091dc22d350c0bb8d8641':
  Reduce warning verbosity in aapt
 2014-03-27 21:00:08 +00:00
Adam Lesinski
55a655091a Merge "Reduce warning verbosity in aapt" 2014-03-27 20:55:14 +00:00
Marco Nelissen
f0d019c4e4 Merge "Make setServer() safe to call multiple times" 2014-03-27 20:35:14 +00:00
Craig Mautner
a79501cd38 am af89d7e2: am bffd4d43: Merge "Check return values for null." into klp-modular-dev 
* commit 'af89d7e21f5d7cbe74ff4ce014d8ab2db1a6fc27':
  Check return values for null.
 2014-03-27 20:32:00 +00:00
Scott Main
f5f47eab39 am 653aa40e: am 7b190e0f: am 22b483ee: am bbaf11f4: update viewport variable with new underscore format 
* commit '653aa40ef5d21286382217a36d956213a1018b37':
  update viewport variable with new underscore format
 2014-03-27 20:25:52 +00:00
Craig Mautner
af89d7e21f am bffd4d43: Merge "Check return values for null." into klp-modular-dev 
* commit 'bffd4d437d133164877c6a194d6a533299072fae':
  Check return values for null.
 2014-03-27 20:25:45 +00:00
Marco Nelissen
1632fae376 Make setServer() safe to call multiple times 
This makes it safe to call setServer() multiple times with the same
server, different servers, or null.

b/13622801

Change-Id: Id04440df720f830e67106eb543653ace42430d97
 2014-03-27 13:25:14 -07:00
Christopher Tate
450e63af4e Merge "Unlinked providers STILL shouldn't cause crashes" 2014-03-27 20:23:36 +00:00
Christopher Tate
132933dc2e Unlinked providers STILL shouldn't cause crashes 
Bug 13651057

Change-Id: Id7e5ba521ac3f201b1a44f122358ca5af2929e06
 2014-03-27 13:22:26 -07:00
Craig Mautner
bffd4d437d Merge "Check return values for null." into klp-modular-dev 2014-03-27 20:22:20 +00:00
Craig Mautner
9410f5983b am 723f7bbc: am 7f7ce0f7: am a2824410: Merge "Do not show Home behind full screen activity" 
* commit '723f7bbcf34168b216421eee4b7d86199f90de1f':
  Do not show Home behind full screen activity
 2014-03-27 20:20:49 +00:00
Craig Mautner
d3849f5415 Check return values for null. 
When a Display has been removed there is a delay until all of its
windows have been removed. Therefore there is a possibility that
WindowState.getDisplayContent() returns null. Guard against that
possibility.

Fixes bug 13616765.

Change-Id: Ia2074d293b0e1bd4ca2cd14aeb4a2cc09ed9f41e
 2014-03-27 13:19:29 -07:00
Scott Main
653aa40ef5 am 7b190e0f: am 22b483ee: am bbaf11f4: update viewport variable with new underscore format 
* commit '7b190e0f1df16346696465c0114179b423afc26d':
  update viewport variable with new underscore format
 2014-03-27 20:19:20 +00:00
Craig Mautner
723f7bbcf3 am 7f7ce0f7: am a2824410: Merge "Do not show Home behind full screen activity" 
* commit '7f7ce0f71b5f1b5274b0cda190401823508cda1f':
  Do not show Home behind full screen activity
 2014-03-27 20:14:13 +00:00
Scott Main
7b190e0f1d am 22b483ee: am bbaf11f4: update viewport variable with new underscore format 
* commit '22b483ee6e029dc9db4ae390b91c449b7977273d':
  update viewport variable with new underscore format
 2014-03-27 20:13:59 +00:00
Scott Main
22b483ee6e am bbaf11f4: update viewport variable with new underscore format 
* commit 'bbaf11f42152d03c26ec0dc02061dc93a1feb830':
  update viewport variable with new underscore format
 2014-03-27 20:08:17 +00:00
Craig Mautner
7f7ce0f71b am a2824410: Merge "Do not show Home behind full screen activity" 
* commit 'a282441038b8a82be1b9b6afc41145e5570ce377':
  Do not show Home behind full screen activity
 2014-03-27 20:07:57 +00:00
Scott Main
bbaf11f421 update viewport variable with new underscore format 
Change-Id: I68d9e4a57273d86adb9fa2721dc2ce1dbe3ce937
 2014-03-27 13:01:56 -07:00
Craig Mautner
a282441038 Merge "Do not show Home behind full screen activity" 2014-03-27 20:01:11 +00:00
Christopher Tate
5454ac6b37 Merge "Expand install observer semantics" 2014-03-27 19:38:56 +00:00
Christopher Tate
f1977b4500 Expand install observer semantics 
...and now fail conservatively when two apps both attempt to define
the same permission.  Apps signed with the same certificate are
permitted to redefine permissions.

We also finally have a (hidden) interface class for observing package
installation so that we can now rev the interface without breaking
existing callers.

Bug 13551375

Change-Id: Ifa4e59154dcccbb286ee46a35a6f25e4ad0f0f01
 2014-03-27 12:37:47 -07:00
Leon Scroggins
4a857b1d47 Merge "Update framework to use M34 version of Skia." 2014-03-27 19:36:43 +00:00
Scott Main
9ad8a5331c am 9a5c6e68: am 4243710b: am 89f4a546: am 0c933df6: fix bug in code snippet 
* commit '9a5c6e6812d3e69fb0f9247a9010918de94a10fe':
  fix bug in code snippet
 2014-03-27 19:21:46 +00:00
Scott Main
9a5c6e6812 am 4243710b: am 89f4a546: am 0c933df6: fix bug in code snippet 
* commit '4243710bf8b4bf3a0bec9c4cf3b00e4b69651883':
  fix bug in code snippet
 2014-03-27 19:17:05 +00:00
Scott Main
4243710bf8 am 89f4a546: am 0c933df6: fix bug in code snippet 
* commit '89f4a5463b11f98b62aa9639a99d3f9ca81b92c4':
  fix bug in code snippet
 2014-03-27 19:08:23 +00:00
Scott Main
89f4a5463b am 0c933df6: fix bug in code snippet 
* commit '0c933df6d09dfb3923e0891028c67249bc8887d5':
  fix bug in code snippet
 2014-03-27 19:02:33 +00:00
Scott Main
0c933df6d0 fix bug in code snippet 
Change-Id: I98f582d23e5522ef29b9b366bf4a7175eac0bbd5
 2014-03-27 11:53:38 -07:00
Adam Lesinski
f7fd00880e Merge "Uses VMRuntime.newUnpaddedArray for ideal array sizes" 2014-03-27 18:53:06 +00:00
Adam Lesinski
776abc24cd Uses VMRuntime.newUnpaddedArray for ideal array sizes 
Bug:13028925

Change-Id: I0a9301248b10a339afbdc5e4ffe3310ac4fa1fb7
 2014-03-27 11:42:10 -07:00
Colin Cross
1c14c327e8 am c1a7d075: am 232d4224: am f0ffa8a3: Merge "app_process: use LOCAL_MULTILIB := both" 
* commit 'c1a7d0758de065da80129baa85f1471e67c7fe21':
  app_process: use LOCAL_MULTILIB := both
 2014-03-27 18:29:19 +00:00
Adam Lesinski
350159c65a resolved conflicts for merge of 6984e4f9 to master 
Conflicts:
	services/core/java/com/android/server/notification/NotificationManagerService.java

Change-Id: Ief1bf339cf7d75094c9a169264c015b1f286ed63
 2014-03-27 18:26:11 +00:00
Colin Cross
c1a7d0758d am 232d4224: am f0ffa8a3: Merge "app_process: use LOCAL_MULTILIB := both" 
* commit '232d422405d686eb493b48370a2b2f7c35fe96fb':
  app_process: use LOCAL_MULTILIB := both
 2014-03-27 17:36:27 +00:00
Colin Cross
232d422405 am f0ffa8a3: Merge "app_process: use LOCAL_MULTILIB := both" 
* commit 'f0ffa8a38e90f64912686833dba9823b251fae57':
  app_process: use LOCAL_MULTILIB := both
 2014-03-27 17:30:01 +00:00
Colin Cross
f0ffa8a38e Merge "app_process: use LOCAL_MULTILIB := both" 2014-03-27 17:26:08 +00:00
Selim Cinek
d00e8b5f7c Merge "Improved integration of NotificationStackScroller" 2014-03-27 17:20:42 +00:00
Colin Cross
f130f0aaea app_process: use LOCAL_MULTILIB := both 
Use LOCAL_MULTILIB := both to build app_process64 instead of
duplicating the build rule.

Also causes PRODUCT_PACKAGES := app_process to install both
versions on 64-bit platforms, as the module names for both
app_process and app_process64 are now app_process.

Change-Id: Ia3c3265d15475771b0cae8bace53b8fbf351c186
 2014-03-27 10:20:29 -07:00
Selim Cinek
80a14e5d1b Improved integration of NotificationStackScroller 
Quicksettings and clear all buttons now work correctly with
NotificationStackScroller but visuals are still tbd

Change-Id: Ia8a0895f66e0b682f39ac62d92c6b6cfccce2ee2
 2014-03-27 18:18:49 +01:00