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

85157 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
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
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
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
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
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
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
John Spurlock
f41f505fac Dream metadata now specified using an xml-resource. 
Removed old metadata key for dream settings activity, now defined in attrs.xml.

Also took this opportunity to remove Dream#lightsOut.

Bug:7172816
Bug:7211867
Change-Id: Ied18a527d2dc2aacc19d7a9543f090653232f0ed
 2012-09-26 12:44:39 -04:00
Xia Wang
3272a38dbc Fix Wifi Stress test after wifi settings are moved to Settings.global 
Change-Id: I823e99b39bc340683b686bb0dd43a473865656f0
 2012-09-26 09:23:59 -07:00
Glenn Kasten
2832136bb6 Merge "Implement android.media.AudioManager.getProperty()" into jb-mr1-dev 2012-09-26 08:51:33 -07:00
Victoria Lease
72a374705d Merge "getBestProvider() prefers GPS over NLP" into jb-mr1-dev 2012-09-26 07:59:13 -07:00
Satoshi Kataoka
4e1ab15b30 Enable multi-user function for IMF 
Bug: 6931482

Change-Id: Ib23849d352db33f0747aa9d5a178f00ac726c13b
 2012-09-26 19:22:04 +09:00
Kenny Root
f05d511bc9 Merge "LockScreen: only set keystore password for owner" into jb-mr1-dev 2012-09-25 23:35:56 -07:00
Dave Burke
ca68f4a32f Merge "Remove WifiStateTracker code tracking wifi p2p" into jb-mr1-dev 2012-09-25 23:30:48 -07:00
Irfan Sheriff
0f08b813bb Remove WifiStateTracker code tracking wifi p2p 
This code was never supposed to have been there. It just remained
from an old implementation and actually results in
CS getting the wrong network info when both wifi and p2p are connected

Exposing p2p network type to CS needs to be done differently.

Bug: 7233984
Change-Id: I84a6091b8236cf5bdfcef3e7f626163d629e372d
 2012-09-25 23:02:47 -07:00
Kenny Root
df8bfe0cf6 LockScreen: only set keystore password for owner 
Since KeyStore doesn't support multi-user, only unlock or set the
password on the keystore when the "owner" enters a password.

Bug: 7169463
Change-Id: I97b4ba714dc6e400a6e45825c71f81c4629392d8
 2012-09-25 22:57:41 -07:00
Mathias Agopian
17ef62cc1f fix a possible dead-lock when clearing caches 
Bug: 7195815
Change-Id: I8e226b7ec445f9f4fe46ae216ef7cc41efc5a0fd
 2012-09-25 22:52:40 -07:00
Dave Burke
348f08f468 Merge "make sure to destroy GL objects on the GL thread" into jb-mr1-dev 2012-09-25 21:53:31 -07:00
Mathias Agopian
54643d72f8 make sure to destroy GL objects on the GL thread 
Bug: 7195815
Change-Id: I5bcac61cd0b903d1ccca0754fdb9cb1023efbe0f
 2012-09-25 21:41:38 -07:00
Matthew Xie
5e1c74dbbe Merge "Remove permission check in registerAdapter" into jb-mr1-dev 2012-09-25 21:04:15 -07:00
Dave Burke
cefbd1438c Merge "Revert "Deleting objects on the wrong thread is a silly idea Bug #7195815"" into jb-mr1-dev 2012-09-25 20:31:08 -07:00
Dave Burke
56257aff8a Revert "Deleting objects on the wrong thread is a silly idea Bug #7195815" 
This reverts commit 8a1374946a928fcba7495c87ff6adda327fdfb9f

Change-Id: I53564a6c531d334afcc1fce0bea1e57ae266aa78
 2012-09-25 20:30:09 -07:00
Adam Powell
e8e2b67256 Merge "Further tweak touchMajor/Minor stabilization in ScaleGestureDetector" into jb-mr1-dev 2012-09-25 19:35:54 -07:00
Adam Powell
d736d2069b Further tweak touchMajor/Minor stabilization in ScaleGestureDetector 
Change-Id: Ifa717c7dee96c5a2eb18a414a257f01762365b00
 2012-09-25 19:30:44 -07:00
Scott Main
9703880d73 am 82e7fdfd: am 4f832bc7: am 3b1c5d55: add tip about including android:id for layout state 
* commit '82e7fdfd47e7de5408c3a0e296475bb1e945f339':
  add tip about including android:id for layout state
 2012-09-25 19:08:15 -07:00
Scott Main
82e7fdfd47 am 4f832bc7: am 3b1c5d55: add tip about including android:id for layout state 
* commit '4f832bc796bad90e5632c3ab69e305b3c7c008ba':
  add tip about including android:id for layout state
 2012-09-25 19:05:35 -07:00
Scott Main
4f832bc796 am 3b1c5d55: add tip about including android:id for layout state 
* commit '3b1c5d55517260516bfa5591ca08bb39d336d511':
  add tip about including android:id for layout state
 2012-09-25 19:03:33 -07:00
Scott Main
3b1c5d5551 add tip about including android:id for layout state 
Change-Id: I9bc9157b320f8a8ac37ab30bc31fb9c457ecf4f6
 2012-09-25 19:01:09 -07:00