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

85880 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Romain Guy
1b0b7ca239 am 244a0bca: Merge "Make gradients beautiful again Bug #7239634" into jb-mr1-dev 
* commit '244a0bcadc167ed8519c7e34c62e116c1adc2dbe':
  Make gradients beautiful again Bug #7239634
 2012-09-26 16:51:41 -07:00
Romain Guy
244a0bcadc Merge "Make gradients beautiful again Bug #7239634" into jb-mr1-dev 2012-09-26 16:49:29 -07:00
Romain Guy
39284b763a Make gradients beautiful again 
Bug #7239634

This change passes two matrices to the vertex shader instead of one.
We used to compute the final MVP matrix on the CPU to minimize the
number of operations in the vertex shaders. Shader compilers are
however smart enough to perform this optimization for us. Since we
need the MV matrix to properly compute gradients dithering, this
change splits the MVP matrix into two. This has the advantage of
removing one matrix multiplication per drawing operation on the
CPU.
The SGX 540 shader compiler produces the same number of instructions
in both cases. There is no penalty hit with having two matrices
instead of one. We also send so few vertices per frame that it
does not matter very much.

Change-Id: I17d47ac4772615418e0e1885b97493d31435a936
 2012-09-26 16:39:40 -07:00
Brian Carlstrom
cd4a962a84 am 13987fb4: Merge "Reverting public setSoWriteTimeout" into jb-mr1-dev 
* commit '13987fb43255ccb3802d415e32b1c5caf14291bb':
  Reverting public setSoWriteTimeout
 2012-09-26 16:09:03 -07:00
Dianne Hackborn
a5731c7fad am 7b879999: Merge "Fix issue #7238170: Edit picture option is not available for the secondary user." into jb-mr1-dev 
* commit '7b879999fe2bef549ed1c04259fcd7f07e10e83b':
  Fix issue #7238170: Edit picture option is not available for the secondary user.
 2012-09-26 16:07:14 -07:00
Brian Carlstrom
13987fb432 Merge "Reverting public setSoWriteTimeout" into jb-mr1-dev 2012-09-26 16:05:00 -07:00
Dianne Hackborn
7b879999fe Merge "Fix issue #7238170: Edit picture option is not available for the secondary user." into jb-mr1-dev 2012-09-26 16:03:06 -07:00
Brian Carlstrom
992f238d13 Reverting public setSoWriteTimeout 
This reverts fd901f735c858af8ec8884b2e7ab71a46a9639e6 and 5e21bf934b2a71b595deb9856a2044eea4dbce86

Bug: 7237764
Bug: 6693087
Change-Id: I7cc9657e4df219481eb33de803081a01b13ee0f2
 2012-09-26 15:48:21 -07:00
Adam Powell
cf382a9971 am bf184875: Merge "Fix adjustViewBounds handling for ImageView" into jb-mr1-dev 
* commit 'bf184875ef4dc41024474840641c6fc9d3a9e975':
  Fix adjustViewBounds handling for ImageView
 2012-09-26 15:30:54 -07:00
Adam Powell
bf184875ef Merge "Fix adjustViewBounds handling for ImageView" into jb-mr1-dev 2012-09-26 15:28:52 -07:00
Adam Powell
b1271ac183 Fix adjustViewBounds handling for ImageView 
When computing the adjusted view bounds, don't constrain the
dimensions by the original estimate. This can result in the view never
getting properly enlarged.

Bug 7240251

Change-Id: I44fc017f8b661121f0042fcd59a4efde70be6bbe
 2012-09-26 15:21:39 -07:00
Xavier Ducrohet
9794e66428 am 51ce1607: (-s ours) am 46cc524a: (-s ours) am f7243dcc: Add --error-on-failed-insert option to aapt. do not merge. 
* commit '51ce1607b392bf463e4175596d0b91dc337f4c14':
  Add --error-on-failed-insert option to aapt. do not merge.
 2012-09-26 15:16:22 -07:00
Xavier Ducrohet
51ce1607b3 am 46cc524a: (-s ours) am f7243dcc: Add --error-on-failed-insert option to aapt. do not merge. 
* commit '46cc524a6c45d169750290f06672ee6343af51d7':
  Add --error-on-failed-insert option to aapt. do not merge.
 2012-09-26 15:14:19 -07:00
Xavier Ducrohet
46cc524a6c am f7243dcc: Add --error-on-failed-insert option to aapt. do not merge. 
* commit 'f7243dcc616bc9bd84fa519356babb15d6f17e7d':
  Add --error-on-failed-insert option to aapt. do not merge.
 2012-09-26 15:12:13 -07:00
Dianne Hackborn
4d5c2b0317 Fix issue #7238170: Edit picture option is not available for the secondary user. 
Change-Id: Icb3229f543f286afb4a31e267099eceaa0cca11d
 2012-09-26 15:10:30 -07:00
Xavier Ducrohet
f7243dcc61 Add --error-on-failed-insert option to aapt. do not merge. 
The new SDK build system give the ability to insert
versionCode/Name and min/targetSdkVersion in the manifest
but aapt won't replace those if they already exist.

The main problem is that aapt doesn't actually fail when
it doesn't replace them, making the output not what the
developer wanted.

This patch set adds an option to aapt to make it return
an error if the insert failed because the attribute
already existed.

Cherry-pick from 7714a2429b192c88e134ff67b969121bbaeb5457

Change-Id: I8938ec1238da407a8562c974e9598db39001ffd9
 2012-09-26 15:05:22 -07:00
Dianne Hackborn
082a20de9e am 834fc23d: Merge "More activity tests." into jb-mr1-dev 
* commit '834fc23d0d151863afb8cda14084fe0e4dd8abd8':
  More activity tests.
 2012-09-26 15:04:22 -07:00
Dianne Hackborn
834fc23d0d Merge "More activity tests." into jb-mr1-dev 2012-09-26 15:01:40 -07:00
Dianne Hackborn
7a0437b89a am e5215730: Merge "Maybe fix issue #7211766: bindService() to User u0 While u10 is..." into jb-mr1-dev 
* commit 'e521573097390ce5465fc9b88dee2ae62f2317c6':
  Maybe fix issue #7211766: bindService() to User u0 While u10 is...
 2012-09-26 14:57:38 -07:00
Dianne Hackborn
e521573097 Merge "Maybe fix issue #7211766: bindService() to User u0 While u10 is..." into jb-mr1-dev 2012-09-26 14:55:19 -07:00
Dianne Hackborn
b12e1354f2 Maybe fix issue #7211766: bindService() to User u0 While u10 is... 
...Forground Sometimes Doesn't Take

The main change here is a one-liner in ActiveServices to check the
uid when deciding whether to remove an item from mPendingServices.
This could cause the problem being seen -- if the same service for
two users is starting at the same time, the second one would blow
away the pending start of the first one.  Unfortunately I have had
trouble reproducing the bug, so I don't know if this is actually
fixing it.  It's a bug, anyway.

The reason so much has changed here is because I spread around
logging and printing of the user ID associated with operations and
objects to make it easier to debug these kind of multi-user things.

Also includes some tweaks to the oom manager to allow more background
processes (I have seen many times in logs where we thrash through
processes because the LRU list is too short), plus to compensate an
additional time-based metric for when to get rid of background processes,
plus some new logic to try to help things like Chrome keep around
their service processes.

Change-Id: Icda77fb2a1dd349969e3ff2c8fff0f19b40b31d3
 2012-09-26 14:50:12 -07:00
Jesse Hall
0e3fdd17a7 am 62fbb831: Merge "Document interaction of SurfaceView and post-layout transforms" into jb-mr1-dev 
* commit '62fbb8311a1fe84fd1b09e27169757c85d7933cb':
  Document interaction of SurfaceView and post-layout transforms
 2012-09-26 14:37:21 -07:00
Jesse Hall
62fbb8311a Merge "Document interaction of SurfaceView and post-layout transforms" into jb-mr1-dev 2012-09-26 14:34:44 -07:00
Fabrice Di Meglio
93ba6c22fb am fea9df63: Merge "Fix bug #6427629 Clean up layout direction APIs" into jb-mr1-dev 
* commit 'fea9df6386d66089b004719f194625e159bb344a':
  Fix bug #6427629 Clean up layout direction APIs
 2012-09-26 13:56:45 -07:00
Fabrice Di Meglio
fea9df6386 Merge "Fix bug #6427629 Clean up layout direction APIs" into jb-mr1-dev 2012-09-26 13:54:16 -07:00
Ashish Sharma
ec20564fb3 am 8b3750e2: Merge "Migrate DATA_ACTIVITY_TIMEOUT_MOBILE/WIFI from Settings.Secure to Settings.Global" into jb-mr1-dev 
* commit '8b3750e2ce6a4627df751eb239b7b75d390149cc':
  Migrate DATA_ACTIVITY_TIMEOUT_MOBILE/WIFI from Settings.Secure to Settings.Global
 2012-09-26 13:51:27 -07:00
Ashish Sharma
8b3750e2ce Merge "Migrate DATA_ACTIVITY_TIMEOUT_MOBILE/WIFI from Settings.Secure to Settings.Global" into jb-mr1-dev 2012-09-26 13:49:29 -07:00
Romain Guy
39bd0ce63a am 54ea6bf2: Merge "Always set the EGL_BUFFER_PRESERVED EGL_SWAP_BEHAVIOR Bug #7221173" into jb-mr1-dev 
* commit '54ea6bf2aa5e8d72c96f410d87ec96431abe641c':
  Always set the EGL_BUFFER_PRESERVED EGL_SWAP_BEHAVIOR Bug #7221173
 2012-09-26 13:46:17 -07:00
Ashish Sharma
404479a98c Migrate DATA_ACTIVITY_TIMEOUT_MOBILE/WIFI from Settings.Secure to Settings.Global 
Bug: 7189605
Change-Id: Id54b8d490d7849bf071c3fbfd8f7358ed873a4e8
 2012-09-26 13:45:18 -07:00
Romain Guy
54ea6bf2aa Merge "Always set the EGL_BUFFER_PRESERVED EGL_SWAP_BEHAVIOR Bug #7221173" into jb-mr1-dev 2012-09-26 13:44:03 -07:00
Jeff Sharkey
c41a803b47 am 1951db86: Merge "Multi-user ringtone playback." into jb-mr1-dev 
* commit '1951db86f527ff4e8c2ddf4306779ce956cd372d':
  Multi-user ringtone playback.
 2012-09-26 13:41:11 -07:00
Jeff Sharkey
1951db86f5 Merge "Multi-user ringtone playback." into jb-mr1-dev 2012-09-26 13:38:22 -07:00
Romain Guy
bd43152bda Always set the EGL_BUFFER_PRESERVED EGL_SWAP_BEHAVIOR 
Bug #7221173

Change-Id: I231a47187792c93af9e3b9321fd1e25bc2f20117
 2012-09-26 13:36:47 -07:00
Joe Malin
c90f20039f am fd3398c8: am 44c564f2: am d8104d9b: am 829986a5: Merge "DOC CHANGE: Fix Google Play services page" into jb-dev-docs 
* commit 'fd3398c8bf25d8ec7ce813ebda431d67d734f268':
  DOC CHANGE: Fix Google Play services page
 2012-09-26 12:50:27 -07:00
Joe Malin
fd3398c8bf am 44c564f2: am d8104d9b: am 829986a5: Merge "DOC CHANGE: Fix Google Play services page" into jb-dev-docs 
* commit '44c564f251653286f3d2b8608ff5fccba39e831f':
  DOC CHANGE: Fix Google Play services page
 2012-09-26 12:48:58 -07:00
Joe Malin
44c564f251 am d8104d9b: am 829986a5: Merge "DOC CHANGE: Fix Google Play services page" into jb-dev-docs 
* commit 'd8104d9b3debad8c960a302972488e5157702618':
  DOC CHANGE: Fix Google Play services page
 2012-09-26 12:45:58 -07:00
Joe Malin
d8104d9b3d am 829986a5: Merge "DOC CHANGE: Fix Google Play services page" into jb-dev-docs 
* commit '829986a5f6b46a744f1f9953b8af5bbe849c71a9':
  DOC CHANGE: Fix Google Play services page
 2012-09-26 12:43:38 -07:00
Joe Malin
829986a5f6 Merge "DOC CHANGE: Fix Google Play services page" into jb-dev-docs 2012-09-26 12:41:43 -07:00
Joe Malin
74708d896b DOC CHANGE: Fix Google Play services page 
Change-Id: I9b175a01ee415fee187ff4257c36b9462acfd29b
 2012-09-26 12:36:50 -07:00
Dirk Dougherty
9d66887215 am 832981c2: am 6aba1d7b: am 8a58c030: am 8e3dca8d: Merge "Doc change: Update GP services description." into jb-dev-docs 
* commit '832981c2135317d26bfaf2dc40acff30135542c3':
  Doc change: Update GP services description.
 2012-09-26 12:07:33 -07:00
Jesse Hall
c9f345ff7b Document interaction of SurfaceView and post-layout transforms 
Bug: 7179570
Change-Id: I9c4d71242bcb832c0cb3b62ec26aba54f146d70a
 2012-09-26 12:07:12 -07:00
Dirk Dougherty
832981c213 am 6aba1d7b: am 8a58c030: am 8e3dca8d: Merge "Doc change: Update GP services description." into jb-dev-docs 
* commit '6aba1d7bb9935c42ef8dd53ce81cb45184a39e45':
  Doc change: Update GP services description.
 2012-09-26 12:04:50 -07:00
Dirk Dougherty
6aba1d7bb9 am 8a58c030: am 8e3dca8d: Merge "Doc change: Update GP services description." into jb-dev-docs 
* commit '8a58c030e3a56878cac6f449161c8b29d9557006':
  Doc change: Update GP services description.
 2012-09-26 12:02:47 -07:00
Dirk Dougherty
8a58c030e3 am 8e3dca8d: Merge "Doc change: Update GP services description." into jb-dev-docs 
* commit '8e3dca8d274270d8cb43d0df10787c7409bcc8cc':
  Doc change: Update GP services description.
 2012-09-26 12:00:54 -07:00
Xia Wang
9a3fdfbcdf am b4510e3c: Merge "Fix Wifi Stress test after wifi settings are moved to Settings.global" into jb-mr1-dev 
* commit 'b4510e3c6dc645753533cd3b2e17e99de41480b4':
  Fix Wifi Stress test after wifi settings are moved to Settings.global
 2012-09-26 12:00:44 -07:00
Xia Wang
b4510e3c6d Merge "Fix Wifi Stress test after wifi settings are moved to Settings.global" into jb-mr1-dev 2012-09-26 11:58:59 -07:00
Dirk Dougherty
8e3dca8d27 Merge "Doc change: Update GP services description." into jb-dev-docs 2012-09-26 11:58:30 -07:00
Dirk Dougherty
d2a8a5ecf9 Doc change: Update GP services description. 
Change-Id: I9891c3bd900726d0c7fb39ac91157e6e58c52ed8
 2012-09-26 11:54:18 -07:00
Scott Main
69b05e74a4 am 4368ba45: am 3cda8467: am 8bf95ee6: am ed5ff3bd: add analog clock attributes to docs 
* commit '4368ba45adebf17d7962ad551363ac302cb2b1c7':
  add analog clock attributes to docs
 2012-09-26 11:51:56 -07:00
Scott Main
4368ba45ad am 3cda8467: am 8bf95ee6: am ed5ff3bd: add analog clock attributes to docs 
* commit '3cda846725c31b49f6c60ba986ccc7b2eb1adab3':
  add analog clock attributes to docs
 2012-09-26 11:49:48 -07:00