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

102548 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Tim Murray
25440d39ed am 8ff0201a: Merge "Revert "Remove all public mention of RS graphics from docs."" into jb-mr2-dev 
* commit '8ff0201ad0354b6c43aebac6075298ee847c42ef':
  Revert "Remove all public mention of RS graphics from docs."
 2013-03-27 14:35:16 -07:00
Tim Murray
8ff0201ad0 Merge "Revert "Remove all public mention of RS graphics from docs."" into jb-mr2-dev 2013-03-27 21:32:31 +00:00
Tim Murray
275812c2bb Revert "Remove all public mention of RS graphics from docs." 
This reverts commit d72f932b8cbf461ebb79c249ce92b9b811122190

Change-Id: I056b13d0b2beb508e4215bc0d289cf3e76a3a986
 2013-03-27 21:31:28 +00:00
Tim Murray
0e39ae1073 am 8565520b: Merge "Remove all public mention of RS graphics from docs." into jb-mr2-dev 
* commit '8565520b85bd42bc57adc551c4a72bc3f5b0025a':
  Remove all public mention of RS graphics from docs.
 2013-03-27 14:06:25 -07:00
Tim Murray
8565520b85 Merge "Remove all public mention of RS graphics from docs." into jb-mr2-dev 2013-03-27 21:01:37 +00:00
Chris Craik
ed8f6aec85 am 9cd64512: Merge "Set ignore flag during deferred savelayer" into jb-mr2-dev 
* commit '9cd645121584bc167b3fab61b1ed89ddc4631365':
  Set ignore flag during deferred savelayer
 2013-03-27 12:51:03 -07:00
Chris Craik
9cd6451215 Merge "Set ignore flag during deferred savelayer" into jb-mr2-dev 2013-03-27 19:47:59 +00:00
Yorke Lee
7b1948b3b9 am 2e73f5b8: Merge "Expose data_usage_stat table in ContactsContract" into jb-mr2-dev 
* commit '2e73f5b8b7c941e68fec2d763d9455a8d6190e25':
  Expose data_usage_stat table in ContactsContract
 2013-03-27 12:16:57 -07:00
Yorke Lee
2e73f5b8b7 Merge "Expose data_usage_stat table in ContactsContract" into jb-mr2-dev 2013-03-27 19:14:09 +00:00
Yorke Lee
0dc523fa99 Expose data_usage_stat table in ContactsContract 
Bug: 8124079
Change-Id: Ie60e489f08be270b9f3a4866c488a5e0598ceb26
 2013-03-27 12:07:52 -07:00
Dianne Hackborn
084e6496b3 am 174d9078: am bfd15fa0: am 6b96e2f0: Merge "Two REMOVE_PROVIDER messages caused by race condition." 
* commit '174d90787c31027d98ad62c0c31e94910ee61b10':
  Two REMOVE_PROVIDER messages caused by race condition.
 2013-03-27 11:38:35 -07:00
Dianne Hackborn
174d90787c am bfd15fa0: am 6b96e2f0: Merge "Two REMOVE_PROVIDER messages caused by race condition." 
* commit 'bfd15fa00557ea78567a30fe260dea62c37bd5a0':
  Two REMOVE_PROVIDER messages caused by race condition.
 2013-03-27 11:37:08 -07:00
Jean-Michel Trivi
455547795c am f2b0fdb2: Merge "AudioEffect types in SDK" into jb-mr2-dev 
* commit 'f2b0fdb2f7d701355d3fdb7b9a7780387cbf0e46':
  AudioEffect types in SDK
 2013-03-27 10:38:58 -07:00
Chris Craik
408eb12631 Set ignore flag during deferred savelayer 
bug:8471552

Additionally, add ignore check for draw functor

In deferred mode, if we don't set ignore, a 0 alpha displayList won't
be quickRejected, and not only would its contents be needlessly
deferred, but upon playback any functors would be drawn, ignoring the
state of the snapshot.

Change-Id: Ib1edb3252080f674254086edee6f965f0efcce78
 2013-03-27 10:38:36 -07:00
Jean-Michel Trivi
f2b0fdb2f7 Merge "AudioEffect types in SDK" into jb-mr2-dev 2013-03-27 17:35:44 +00:00
Chiao Cheng
efb7a924f9 am 972a9255: Merge "Allow leading slash in path argument for addURI() method." into jb-mr2-dev 
* commit '972a9255a7e2c75cf13dab74121cb367c03e2809':
  Allow leading slash in path argument for addURI() method.
 2013-03-27 10:21:06 -07:00
Chiao Cheng
972a9255a7 Merge "Allow leading slash in path argument for addURI() method." into jb-mr2-dev 2013-03-27 17:18:30 +00:00
Jean-Michel Trivi
80569f7ff7 AudioEffect types in SDK 
Not all effect types are defined by OpenSL ES. Add the full UUID
 effect identifier in the superclass of all audio effects.

bug 8113082

Change-Id: I8dfc6cdcfd2a145e792fb3669e6132e6f19d1c16
 2013-03-27 09:59:24 -07:00
Yorke Lee
6b141509ea am 038fbc5d: Merge "Add new apis to CP2" into jb-mr2-dev 
* commit '038fbc5d099c6fb8903ccc00c0988d482bfb8046':
  Add new apis to CP2
 2013-03-27 09:48:26 -07:00
Yorke Lee
038fbc5d09 Merge "Add new apis to CP2" into jb-mr2-dev 2013-03-27 16:43:41 +00:00
Baligh Uddin
c5ff3ef46c am 993f10af: Merge "Import translations. DO NOT MERGE" into jb-mr2-dev 
* commit '993f10af84768bc37dac211efe3133257680f2d1':
  Import translations. DO NOT MERGE
 2013-03-27 09:41:40 -07:00
Baligh Uddin
993f10af84 Merge "Import translations. DO NOT MERGE" into jb-mr2-dev 2013-03-27 16:38:07 +00:00
Nick Kralevich
7306da9075 am 4b254881: Merge "AppSecurityPermissions: Add isGranted to isDisplayablePermission" into jb-mr2-dev 
* commit '4b2548815df45b3aa6a8144abeeaea504ee6f7b1':
  AppSecurityPermissions: Add isGranted to isDisplayablePermission
 2013-03-27 09:23:01 -07:00
Nick Kralevich
4b2548815d Merge "AppSecurityPermissions: Add isGranted to isDisplayablePermission" into jb-mr2-dev 2013-03-27 16:20:26 +00:00
Martijn Coenen
511d33bb5b am d9f0180a: Merge "Add direct NDEF push API." into jb-mr2-dev 
* commit 'd9f0180ab8bb4c69dcf1535c3dfe0d8c464a7377':
  Add direct NDEF push API.
 2013-03-27 09:07:29 -07:00
Martijn Coenen
d9f0180ab8 Merge "Add direct NDEF push API." into jb-mr2-dev 2013-03-27 16:04:47 +00:00
Baligh Uddin
dee11a5496 Import translations. DO NOT MERGE 
Change-Id: I3115e513480f3a73084de898943db307a5294a08
Auto-generated-cl: translation import
 2013-03-27 08:35:28 -07:00
Jeff Sharkey
762bad8e9b am 7cd9ed19: Merge "Benchmarks for IndentingPrintWriter." into jb-mr2-dev 
* commit '7cd9ed195ba5242b125eb58a36ea2b01a588dbdd':
  Benchmarks for IndentingPrintWriter.
 2013-03-26 20:20:05 -07:00
Jeff Sharkey
7cd9ed195b Merge "Benchmarks for IndentingPrintWriter." into jb-mr2-dev 2013-03-27 03:18:06 +00:00
Jeff Sharkey
8fa9bb5210 Benchmarks for IndentingPrintWriter. 
Current timings on a mako listed below, which show minimal overhead
compared to writing directly. The increased code readability and
automatic indenting is worth the overhead.

Also worth noting is that writing concatenated strings is
substantially faster than printing components separately.

           benchmark      us linear runtime
       ComplexDirect 10712.7 =========================
    ComplexIndenting 12623.7 ==============================
       PairIndenting    45.8 =
             PairRaw    82.1 =
        SimpleDirect   282.2 =
     SimpleIndenting   294.4 =

Change-Id: I7c38690c14b017fa46248ebb0be69f6beff03371
 2013-03-26 20:16:44 -07:00
Jeff Brown
901b77c63b am ca3d655d: Merge "Use input transport for communications between app and IME." into jb-mr2-dev 
* commit 'ca3d655d20c13c71972a4475cec3b98efa7dbdd0':
  Use input transport for communications between app and IME.
 2013-03-26 19:46:20 -07:00
Jeff Brown
ca3d655d20 Merge "Use input transport for communications between app and IME." into jb-mr2-dev 2013-03-27 02:43:54 +00:00
Dianne Hackborn
483ac9a779 am b404ecc9: Merge "Fix build." into jb-mr2-dev 
* commit 'b404ecc91a5dd3dd027554490b2ca18c1048bdba':
  Fix build.
 2013-03-26 18:04:00 -07:00
Dianne Hackborn
b404ecc91a Merge "Fix build." into jb-mr2-dev 2013-03-27 01:01:36 +00:00
Dianne Hackborn
f3d46ce88f Fix build. 
Change-Id: I51b87ee5f0b7f396aad7e239893d9f0764f04bb6
 2013-03-26 18:00:42 -07:00
Fabrice Di Meglio
fc7a102071 am a803b094: Merge "Fix bug #8480245 ViewGroup layout margins can be wrong in RTL mode" into jb-mr2-dev 
* commit 'a803b094c6c60539426396ad57f0733cbe212664':
  Fix bug #8480245 ViewGroup layout margins can be wrong in RTL mode
 2013-03-26 17:48:21 -07:00
Dianne Hackborn
bfd15fa005 am 6b96e2f0: Merge "Two REMOVE_PROVIDER messages caused by race condition." 
* commit '6b96e2f0006b5c33973b3500d3bb72a8c7a3bd38':
  Two REMOVE_PROVIDER messages caused by race condition.
 2013-03-26 17:46:21 -07:00
Fabrice Di Meglio
a803b094c6 Merge "Fix bug #8480245 ViewGroup layout margins can be wrong in RTL mode" into jb-mr2-dev 2013-03-27 00:44:48 +00:00
Romain Guy
79bb82de96 am 3cb5ed8b: Merge "Path precaching creates duplicate cache entries Bug #8478275" into jb-mr2-dev 
* commit '3cb5ed8bb369df6f5f519169ccd1ec0854e3d4b5':
  Path precaching creates duplicate cache entries Bug #8478275
 2013-03-26 17:44:43 -07:00
Romain Guy
3cb5ed8bb3 Merge "Path precaching creates duplicate cache entries Bug #8478275" into jb-mr2-dev 2013-03-27 00:41:46 +00:00
Romain Guy
4500a8d5d7 Path precaching creates duplicate cache entries 
Bug #8478275

Change-Id: Ib541ea051e42e01cc0d277790e9c09de38ef72ee
 2013-03-26 17:29:51 -07:00
Fabrice Di Meglio
0072f64939 Fix bug #8480245 ViewGroup layout margins can be wrong in RTL mode 
- fix resolution of MarginLayoutParams
- update related RelativeLayout code

Change-Id: I261f127a8897f60d316fed2a73e6e76020e542cc
 2013-03-26 17:27:33 -07:00
Dianne Hackborn
177543db55 am 3bcc2fba: Merge "Fix issue #8470131: Process thrash kills battery" into jb-mr2-dev 
* commit '3bcc2fbaad4064360cee26708d702b7ee575f448':
  Fix issue #8470131: Process thrash kills battery
 2013-03-26 17:26:52 -07:00
Dianne Hackborn
a482078913 am 5871b258: Merge "Change wm commands to return size and density info." into jb-mr2-dev 
* commit '5871b258afd0bf3a2d58dea437b340a4f5b382cf':
  Change wm commands to return size and density info.
 2013-03-26 17:26:50 -07:00
Dianne Hackborn
3bcc2fbaad Merge "Fix issue #8470131: Process thrash kills battery" into jb-mr2-dev 2013-03-27 00:24:04 +00:00
Romain Guy
5e83199dc9 am 2509437e: Merge "Avoid multiple font cache texture uploads Bug #8378964" into jb-mr2-dev 
* commit '2509437e309827dbfe8bf3797d59c0d01af13972':
  Avoid multiple font cache texture uploads Bug #8378964
 2013-03-26 17:23:13 -07:00
Dianne Hackborn
5871b258af Merge "Change wm commands to return size and density info." into jb-mr2-dev 2013-03-27 00:22:28 +00:00
Romain Guy
2509437e30 Merge "Avoid multiple font cache texture uploads Bug #8378964" into jb-mr2-dev 2013-03-27 00:21:05 +00:00
Nick Kralevich
7a8c135177 AppSecurityPermissions: Add isGranted to isDisplayablePermission 
Modify isDisplayablePermission to display a permission if the
app update will grant a new optional permission to the app.

Change-Id: Ic647826b0c48f9f7ec8e4f69b90197211f83278d
 2013-03-26 17:18:32 -07:00
Dianne Hackborn
6b96e2f000 Merge "Two REMOVE_PROVIDER messages caused by race condition." 2013-03-27 00:17:41 +00:00