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

85855 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
Xavier Ducrohet
c0a5c1a37d am a2b978bc: (-s ours) Merge "Fix writing text version of styleable IDs. do not merge." into jb-mr1-dev 
* commit 'a2b978bc55d5ebd8c32c41a707b5a155216ee0a5':
  Fix writing text version of styleable IDs. do not merge.
 2012-09-26 11:47:39 -07:00
Scott Main
3cda846725 am 8bf95ee6: am ed5ff3bd: add analog clock attributes to docs 
* commit '8bf95ee635b0cada3c6c2d21801bbd1e871b9fcc':
  add analog clock attributes to docs
 2012-09-26 11:47:38 -07:00
Scott Main
8bf95ee635 am ed5ff3bd: add analog clock attributes to docs 
* commit 'ed5ff3bdb015b0dc391a566d6f61ba7a533b3843':
  add analog clock attributes to docs
 2012-09-26 11:45:21 -07:00
Xavier Ducrohet
a2b978bc55 Merge "Fix writing text version of styleable IDs. do not merge." into jb-mr1-dev 2012-09-26 11:45:09 -07:00
Scott Main
ed5ff3bdb0 add analog clock attributes to docs 
Change-Id: I70e8a7897f9e076664ea5069ee9e19e458e8b36b
 2012-09-26 11:42:09 -07:00
Scott Main
390e5577d3 am 80c491f0: am 16eb5366: am 54645245: am 14a36625: fix markup bugs 
* commit '80c491f07ac9f6453309fcaa601e904ae80a172e':
  fix markup bugs
 2012-09-26 11:41:49 -07:00
Scott Main
80c491f07a am 16eb5366: am 54645245: am 14a36625: fix markup bugs 
* commit '16eb53668bc000c9d6cdd9c2dd68e51f16483d25':
  fix markup bugs
 2012-09-26 11:39:54 -07:00
Scott Main
16eb53668b am 54645245: am 14a36625: fix markup bugs 
* commit '5464524524ce40af3e421e2d1c9bf810605ae43a':
  fix markup bugs
 2012-09-26 11:37:38 -07:00
Scott Main
5464524524 am 14a36625: fix markup bugs 
* commit '14a366255aee79eec81d5a80ec3d8f298af9a938':
  fix markup bugs
 2012-09-26 11:34:49 -07:00
Romain Guy
21b7be2270 am 2ea1045a: Merge "Applies a layer\'s color filter even when the layer is a quad Bug #7238059" into jb-mr1-dev 
* commit '2ea1045a0148cac45f873fc6324682044d599f73':
  Applies a layer's color filter even when the layer is a quad Bug #7238059
 2012-09-26 11:27:00 -07:00
Romain Guy
2ea1045a01 Merge "Applies a layer's color filter even when the layer is a quad Bug #7238059" into jb-mr1-dev 2012-09-26 11:25:04 -07:00
Romain Guy
e529ece37f Applies a layer's color filter even when the layer is a quad 
Bug #7238059

Change-Id: Ib4736a419bc1a9a67a01d090516ed049fe3aebca
 2012-09-26 11:23:17 -07:00
Scott Main
14a366255a fix markup bugs 
Change-Id: I37111431505f7803c2374917b3c186529c6e3d60
 2012-09-26 11:22:09 -07:00
John Spurlock
5d15dd08bf am fddedc94: Merge "Dream metadata now specified using an xml-resource." into jb-mr1-dev 
* commit 'fddedc94b77812ea13afe8cae32ad27d7266f787':
  Dream metadata now specified using an xml-resource.
 2012-09-26 11:17:55 -07:00
John Spurlock
fddedc94b7 Merge "Dream metadata now specified using an xml-resource." into jb-mr1-dev 2012-09-26 11:16:00 -07:00
Xavier Ducrohet
0122a3db31 Fix writing text version of styleable IDs. do not merge. 
(cherry picked from commit d16047434bca24b2811de7ea9d22de6ee0f87f79)

Change-Id: Ic679080d5157daf77c35516c8f682bd13e2b4d96
 2012-09-26 11:14:50 -07:00
Chet Haase
a10cec517a am d48478e4: Merge "Assign default texture id of 0" into jb-mr1-dev 
* commit 'd48478e4c6d743cd664251371fdfe4ce36c852ec':
  Assign default texture id of 0
 2012-09-26 11:07:54 -07:00
Xavier Ducrohet
f09a690eec am f8b18ced: (-s ours) am 4649d03b: (-s ours) am 6c6ddbff: Fix writing text version of styleable IDs. do not merge. 
* commit 'f8b18ced269ddac89da92c66f594084032026ab2':
  Fix writing text version of styleable IDs. do not merge.
 2012-09-26 11:07:49 -07:00
Chet Haase
d48478e4c6 Merge "Assign default texture id of 0" into jb-mr1-dev 2012-09-26 11:06:38 -07:00
Xavier Ducrohet
f8b18ced26 am 4649d03b: (-s ours) am 6c6ddbff: Fix writing text version of styleable IDs. do not merge. 
* commit '4649d03b96f576c4a7d5d4aa7d7d637a6ae091aa':
  Fix writing text version of styleable IDs. do not merge.
 2012-09-26 11:06:03 -07:00
Xavier Ducrohet
4649d03b96 am 6c6ddbff: Fix writing text version of styleable IDs. do not merge. 
* commit '6c6ddbff890afb2133f6da79237cf581f00c13ba':
  Fix writing text version of styleable IDs. do not merge.
 2012-09-26 11:03:45 -07:00
Chet Haase
98d3a64ffa Assign default texture id of 0 
Some logic depends on a default value of 0, which was not being
assigned.

Issue #7195815 chrome url bar is corrupted
Issue #7190656 Textures corrupted on mr1

Change-Id: I346b7b76e885bf8f04740e711fd88f917a5418c7
 2012-09-26 11:01:42 -07:00
Xavier Ducrohet
6c6ddbff89 Fix writing text version of styleable IDs. do not merge. 
(cherry picked from commit d16047434bca24b2811de7ea9d22de6ee0f87f79)

Change-Id: Ia1fc343e0649b175d290357f63eebec0dd1ae14a
 2012-09-26 11:00:41 -07:00
Jeff Sharkey
65c4a2b26c Multi-user ringtone playback. 
Change RingtonePlayer to open content:// Uris based on requesting
UserHandle.  Grant SystemUI visibility to all emulated storage so
it can play ringtones for apps without READ_EXTERNAL_STORAGE.

Resolve canonical file:// Uris before passing out of source app,
replacing any /emulated_legacy/-style paths with user-specific
variant so they can be opened by SystemUI.  Calling for RemoteViews,
Ringtones, and Notifications.

Bug: 7202982
Change-Id: Ibf0eca8df80c1486711144a7b648f464aadfe099
 2012-09-26 10:49:35 -07:00