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

102221 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Kenny Root
424570273b Merge changes I65f7a915,I32098dc0 
* changes:
  KeyStore: add "migrate" command
  KeyStore: add API to uid versions
 2013-03-20 22:00:10 +00:00
Fabrice Di Meglio
665f02c667 Fix bug #8437358 Clean any ICU related code from TextLayout / Paint and their dependencies 
- remove the ICU related methods and update the methods using the "reserved" argument
- update to CTS in another CL too

Change-Id: I5509736568c342d9d17bfeafc17951117ab5d3cc
 2013-03-20 14:56:05 -07:00
kmccormick
510f69b310 Doc Update: GCM cleanup 
Bug # 8144337, 8289556, 8289952, 7579225

Change-Id: Ibfc4a703a89572525b75e71ac2b5392c41bd1733
 2013-03-20 14:52:33 -07:00
Jim Miller
f7a7ecb4d3 am fd81f910: Merge "Prevent Recents from doing a relayout" into jb-mr2-dev 
* commit 'fd81f91052d54c0354834fcd4f423025f2d8c93e':
  Prevent Recents from doing a relayout
 2013-03-20 21:41:47 +00:00
Jim Miller
fd81f91052 Merge "Prevent Recents from doing a relayout" into jb-mr2-dev 2013-03-20 21:38:31 +00:00
Joe Fernandez
603dbd7853 docs: NDK r8e Release Notes 
Change-Id: Id06bf788d631cccc69964cdef400a7e472060c4a
 2013-03-20 14:35:29 -07:00
Mathias Agopian
3cbd626c6e am b936b774: Merge "make sure to start the binder thread pool" into jb-mr2-dev 
* commit 'b936b7748de030872e5f4fdc470e6bca66b557bc':
  make sure to start the binder thread pool
 2013-03-20 21:07:49 +00:00
Mathias Agopian
b936b7748d Merge "make sure to start the binder thread pool" into jb-mr2-dev 2013-03-20 21:02:47 +00:00
ztenghui
39fecf197a am 1e7298b2: Merge "Add the orientation hint to the MediaMuxer" into jb-mr2-dev 
* commit '1e7298b250a3cddfcdcf54e413748e8eb71ca0c8':
  Add the orientation hint to the MediaMuxer
 2013-03-20 20:56:35 +00:00
ztenghui
1e7298b250 Merge "Add the orientation hint to the MediaMuxer" into jb-mr2-dev 2013-03-20 20:53:01 +00:00
Jeff Sharkey
26f617cf7d am cc591168: Merge "Show notification ticker for finished bugreports." into jb-mr2-dev 
* commit 'cc5911686d738d0ce0bf45acac14243ed5a16cf4':
  Show notification ticker for finished bugreports.
 2013-03-20 19:16:06 +00:00
Jeff Sharkey
cc5911686d Merge "Show notification ticker for finished bugreports." into jb-mr2-dev 2013-03-20 19:11:45 +00:00
Jeff Sharkey
e37e9ba3ca Show notification ticker for finished bugreports. 
Change-Id: I7d326b0da83c3ae334739cdb8cb4ca18f948c50f
 2013-03-20 12:10:51 -07:00
Kenny Root
bd79419ef8 KeyStore: add "migrate" command 
To support the WiFi service, we need to support migration from the
system UID to the wifi UID. This adds a command to achieve the
migration.

Bug: 8122243
Change-Id: I65f7a91504c1d2a2aac22b9c3051adffd28d66c1
 2013-03-20 11:57:46 -07:00
Fabrice Di Meglio
c59d3e572d am 90179dc6: Merge "Fix bug #8205589 Media Framework UI should be mirrored for RTL languages" into jb-mr2-dev 
* commit '90179dc6aa0a182436ff1f44dbca64f27103a3ec':
  Fix bug #8205589 Media Framework UI should be mirrored for RTL languages
 2013-03-20 17:53:12 +00:00
Fabrice Di Meglio
90179dc6aa Merge "Fix bug #8205589 Media Framework UI should be mirrored for RTL languages" into jb-mr2-dev 2013-03-20 17:46:03 +00:00
Eric Laurent
e78fced559 audio service: allow touch sounds customization 
Added audio_assets.xml resource listing the
audio asset files for each touch sound effect.
This resource can be overlayed to customize the
touch sounds for a given device.

Bug 8339000

Change-Id: I8c156f0ce7f8769a58d77442fbd9c46b57c202e9
 2013-03-20 10:38:07 -07:00
Baligh Uddin
0ea62edbb8 am 15d9de09: Merge "Import translations. DO NOT MERGE" into jb-mr2-dev 
* commit '15d9de0960517e4474e2cda2cb25f8b3c181877a':
  Import translations. DO NOT MERGE
 2013-03-20 17:17:54 +00:00
Baligh Uddin
15d9de0960 Merge "Import translations. DO NOT MERGE" into jb-mr2-dev 2013-03-20 17:15:06 +00:00
Jeff Tinker
1e724125d8 am d4a21185: Merge "Implementing MediaDrm APIs" into jb-mr2-dev 
* commit 'd4a2118585d6227ccdccb946c946275b81d99ec9':
  Implementing MediaDrm APIs
 2013-03-20 16:53:19 +00:00
Kenny Root
78ad849163 KeyStore: add API to uid versions 
In previous commits, we added the ability to specify which UID we want to
target on certain operations. This commit adds the ability to reach those
binder calls from the KeyStore class.

Also fix a problem where saw() was not reading all the values returned via
the Binder call. This changes the semantics to return a null instead of
failing silently when it's not possible to search.

Change-Id: I32098dc0eb42e09ace89f6b7455766842a72e9f4
 2013-03-20 16:50:06 +00:00
Jeff Tinker
d4a2118585 Merge "Implementing MediaDrm APIs" into jb-mr2-dev 2013-03-20 16:48:52 +00:00
The Android Open Source Project
258c04ef87 Reconcile with jb-mr2-release - do not merge 
Change-Id: I4568227f053aade46e722d1eb0995941dd8eb654
 2013-03-20 09:32:34 -07:00
Chet Haase
be19e030a1 Add auto-cancel ability to ObjectAnimator 
Add a method that enables a new auto-cancel option to
ObjectAnimator. When set, any ObjectAnimator (when started) will
cause any running ObjectAnimator instance (with that flag set)
that has the same target and properties to cancel() itself prior
to starting the new one.

Issue #7426129 Add auto-cancel to animators

Change-Id: I586659c365289cdb9afb6c416bdbaf5630477149
 2013-03-20 09:06:20 -07:00
Baligh Uddin
06d59ad05c Import translations. DO NOT MERGE 
Change-Id: I5f8e095504000dada72590b5043a7c7ad85de245
Auto-generated-cl: translation import
 2013-03-20 09:06:00 -07:00
Irfan Sheriff
169a59a8e2 am 63f1e2fb: Merge "Add API to control scan always mode" into jb-mr2-dev 
* commit '63f1e2fb6b7102490b11523589b82c2101d3c079':
  Add API to control scan always mode
 2013-03-20 15:54:54 +00:00
Irfan Sheriff
63f1e2fb6b Merge "Add API to control scan always mode" into jb-mr2-dev 2013-03-20 15:49:20 +00:00
Michael Jurka
31a6fb3b08 Prevent Recents from doing a relayout 
Don't relayout Recents when going from a
fullscreen app to Recents; set the proper flags
to do the layout underneath the status bar
 2013-03-20 16:44:13 +01:00
The Android Automerger
86a2da0124 merge in jb-mr2-release history after reset to jb-mr2-dev 2013-03-20 05:55:49 -07:00
Mathias Agopian
0678a8c250 make sure to start the binder thread pool 
Change-Id: I5c125a001936797489ebdcd0d4ccbde23adba282
 2013-03-19 20:56:00 -07:00
Romain Guy
665697118c am ec3928bf: Merge "Reduce number of glDraw calls when drawing text" into jb-mr2-dev 
* commit 'ec3928bf0993e13fb82c65ac26a4d70f5bc6c5e4':
  Reduce number of glDraw calls when drawing text
 2013-03-20 02:32:06 +00:00
Romain Guy
ec3928bf09 Merge "Reduce number of glDraw calls when drawing text" into jb-mr2-dev 2013-03-20 02:29:47 +00:00
Scott Main
74e8825f26 am 4427db27: am 8efa65b1: am be83b5a7: am 7df36bc8: am f2162147: am 6dbb6788: delete some obsolete links 
* commit '4427db27b312b46cc34a83a893e522a6468ee396':
  delete some obsolete links
 2013-03-20 01:42:29 +00:00
Scott Main
4427db27b3 am 8efa65b1: am be83b5a7: am 7df36bc8: am f2162147: am 6dbb6788: delete some obsolete links 
* commit '8efa65b18324b0efb76d316b05ccf917e000c69a':
  delete some obsolete links
 2013-03-19 18:40:29 -07:00
Scott Main
8efa65b183 am be83b5a7: am 7df36bc8: am f2162147: am 6dbb6788: delete some obsolete links 
* commit 'be83b5a72ffaf3ed91e9341340c0c0477005f538':
  delete some obsolete links
 2013-03-19 18:38:05 -07:00
Scott Main
be83b5a72f am 7df36bc8: am f2162147: am 6dbb6788: delete some obsolete links 
* commit '7df36bc872e64b330d2a801adafee52e14112ec9':
  delete some obsolete links
 2013-03-19 18:36:15 -07:00
Scott Main
7df36bc872 am f2162147: am 6dbb6788: delete some obsolete links 
* commit 'f2162147c1dd8bd027a01f660108d214174379b5':
  delete some obsolete links
 2013-03-19 18:35:01 -07:00
Scott Main
f2162147c1 am 6dbb6788: delete some obsolete links 
* commit '6dbb6788b9ea32f36f6653fe48a0e00179540555':
  delete some obsolete links
 2013-03-19 18:32:33 -07:00
Scott Main
6dbb6788b9 delete some obsolete links 
Change-Id: I1495295caa878c55536e60e84caf358d80705507
 2013-03-19 18:27:50 -07:00
Yu Shan Emily Lau
6d9b3328a5 am a850e7fa: Merge "Fix the media memeory stress test. The media memory stress test used the ps mediaserver to capture the memory usage of mediaserver. As the media.log is enabled recently, when runnign the ps mediaserver, it will show both entries. The fix is simply 
* commit 'a850e7fae47c6207b061e27141a6508bb4c98361':
  Fix the media memeory stress test. The media memory stress test used the ps mediaserver to capture the memory usage of mediaserver. As the media.log is enabled recently, when runnign the ps mediaserver, it will show both entries. The fix is simply skip the first two lines and parse the laste output.
 2013-03-20 01:03:30 +00:00
Yu Shan Emily Lau
a850e7fae4 Merge "Fix the media memeory stress test. The media memory stress test used the ps mediaserver to capture the memory usage of mediaserver. As the media.log is enabled recently, when runnign the ps mediaserver, it will show both entries. The fix is simply skip the first two lines and parse the laste output." into jb-mr2-dev 2013-03-20 00:58:31 +00:00
Fabrice Di Meglio
d410ccb1cb Fix bug #8205589 Media Framework UI should be mirrored for RTL languages 
- force LTR layout direction for MediaController UI elements

Change-Id: Ia2b8058d16e2587314b6f01cf935a5599c2983c9
 2013-03-19 17:45:43 -07:00
Yu Shan Emily Lau
780dc88ddb Fix the media memeory stress test. 
The media memory stress test used the ps mediaserver to
capture the memory usage of mediaserver. As the media.log
is enabled recently, when runnign the ps mediaserver, it will
show both entries. The fix is simply skip the first two lines
and parse the laste output.

Change-Id: Ib2a4ba7936505b4ea24463bf8a5af2c499b71138
 2013-03-19 17:42:50 -07:00
Mathias Agopian
c7edf2b033 am 0a4962ad: Merge "make Surface.java internal state thread-safe" into jb-mr2-dev 
* commit '0a4962ad11fadf7798c360efaee31b8d9d75bc9e':
  make Surface.java internal state thread-safe
 2013-03-20 00:27:46 +00:00
Mathias Agopian
10f21173f3 am 75d7309e: Merge "Fix createSurface / eglCreateWindowSurface race." into jb-mr2-dev 
* commit '75d7309eb407dbbc606c4f56397882ccac57070c':
  Fix createSurface / eglCreateWindowSurface race.
 2013-03-20 00:24:16 +00:00
Romain Guy
661a87ec28 Reduce number of glDraw calls when drawing text 
This change moves the mesh buffer from FontRenderer to CacheTexture
to help reduce the number of texture binds and glDraw calls when
drawing text that spans across multiple textures.

Change-Id: I7de574d88313ca3672879ca878c253ff5f131fc1
 2013-03-19 17:24:13 -07:00
Mathias Agopian
0a4962ad11 Merge "make Surface.java internal state thread-safe" into jb-mr2-dev 2013-03-20 00:23:32 +00:00
Mathias Agopian
75d7309eb4 Merge "Fix createSurface / eglCreateWindowSurface race." into jb-mr2-dev 2013-03-20 00:21:11 +00:00
Craig Mautner
27389c9c11 Clear mWindowAdded when window was not added. DO NOT MERGE 
If ViewRootImpl throws BadTokenException when adding a window, clear
the indication that a window has been added. That way when the
window is destroyed it doesn't try to clean it up.

Fixes bug 8409506.

Change-Id: I270740762f21ed4ec7f235344a3adaeaa033c483
 2013-03-19 17:08:28 -07:00
Irfan Sheriff
11322434c6 Fix reading sleep policy 
Bug: 8418823
Change-Id: I432b0a1a7a13dcdd834f6a1c943b06937444f406
 2013-03-19 17:08:20 -07:00