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

86659 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Romain Guy
81f9c79924 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:09 -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
John Spurlock
ccb06b4157 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:18:13 -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
Chet Haase
5b52361213 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:08:11 -07:00
Xavier Ducrohet
3db73be5e9 am f8b18ced: 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:08:08 -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
Xavier Ducrohet
05113163a9 am 253f7635: am fb34490f: Merge "Fix writing text version of styleable IDs." 
* commit '253f76357dc9acdb329f321190eca4f0b049b4af':
  Fix writing text version of styleable IDs.
 2012-09-26 10:46:46 -07:00
Xavier Ducrohet
253f76357d am fb34490f: Merge "Fix writing text version of styleable IDs." 
* commit 'fb34490f4dca7aac623fb9a80fe9a2371107a786':
  Fix writing text version of styleable IDs.
 2012-09-26 10:44:22 -07:00
Xavier Ducrohet
fb34490f4d Merge "Fix writing text version of styleable IDs." 2012-09-26 10:12:47 -07:00
Xavier Ducrohet
d16047434b Fix writing text version of styleable IDs. 
Change-Id: I3f2614689a597de3fd46628c020cf649a808c82f
 2012-09-26 10:11:54 -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
The Android Open Source Project
17b71e5937 Reconcile with jb-mr1-release - do not merge 
Change-Id: I1bdb8f9198011999f5c67dc0760cd3bc10b28b37
 2012-09-26 09:06:42 -07:00
Glenn Kasten
59860362a4 am 2832136b: Merge "Implement android.media.AudioManager.getProperty()" into jb-mr1-dev 
* commit '2832136bb6fcace61ef078051e94aa0a841aac15':
  Implement android.media.AudioManager.getProperty()
 2012-09-26 08:53:53 -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
3421fea504 am 72a37470: Merge "getBestProvider() prefers GPS over NLP" into jb-mr1-dev 
* commit '72a374705d32cf715443aa203f75c159e1bc9bd5':
  getBestProvider() prefers GPS over NLP
 2012-09-26 08:01:32 -07:00
Victoria Lease
72a374705d Merge "getBestProvider() prefers GPS over NLP" into jb-mr1-dev 2012-09-26 07:59:13 -07:00
The Android Automerger
3c508b4ee6 merge in jb-mr1-release history after reset to jb-mr1-dev 2012-09-26 06:59:34 -07:00
Satoshi Kataoka
05ff614589 am 4e1ab15b: Enable multi-user function for IMF 
* commit '4e1ab15b305aac26ad8819fc3b2951e20985944d':
  Enable multi-user function for IMF
 2012-09-26 03:25:07 -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
ab34aba130 am f05d511b: Merge "LockScreen: only set keystore password for owner" into jb-mr1-dev 
* commit 'f05d511bc95c5d0bdfa6d64c6a8a02c6a099703f':
  LockScreen: only set keystore password for owner
 2012-09-25 23:38:48 -07: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
052ec5cdff am ca68f4a3: Merge "Remove WifiStateTracker code tracking wifi p2p" into jb-mr1-dev 
* commit 'ca68f4a32f7712876cad59ceff768c37c334214c':
  Remove WifiStateTracker code tracking wifi p2p
 2012-09-25 23:33:03 -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
Mathias Agopian
20dc79cb85 am 17ef62cc: fix a possible dead-lock when clearing caches 
* commit '17ef62cc1f9d092669af0fed465a9a77e0dc1a4f':
  fix a possible dead-lock when clearing caches
 2012-09-25 22:58:48 -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
33ffed0adc am 348f08f4: Merge "make sure to destroy GL objects on the GL thread" into jb-mr1-dev 
* commit '348f08f468167d56d7f66c59401da8bc69aab746':
  make sure to destroy GL objects on the GL thread
 2012-09-25 21:55:35 -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
8568915d21 am 5e1c74db: Merge "Remove permission check in registerAdapter" into jb-mr1-dev 
* commit '5e1c74dbbe1ccf93ab13a3cc9e46e98988036762':
  Remove permission check in registerAdapter
 2012-09-25 21:06:49 -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
4cdc53862b Revert "Deleting objects on the wrong thread is a silly idea Bug #7195815" 
This reverts commit 8a1374946a928fcba7495c87ff6adda327fdfb9f

Change-Id: I53564a6c531d334afcc1fce0bea1e57ae266aa78
 2012-09-25 20:47:10 -07:00
Dave Burke
ffa6fb83f0 am cefbd143: Merge "Revert "Deleting objects on the wrong thread is a silly idea Bug #7195815"" into jb-mr1-dev 
* commit 'cefbd1438c9054e3a34b4ab93b4b26b427604cb1':
  Revert "Deleting objects on the wrong thread is a silly idea Bug #7195815"
 2012-09-25 20:33:50 -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
82c6fa5898 am e8e2b672: Merge "Further tweak touchMajor/Minor stabilization in ScaleGestureDetector" into jb-mr1-dev 
* commit 'e8e2b672563fed2820e392de48226acf894cf06b':
  Further tweak touchMajor/Minor stabilization in ScaleGestureDetector
 2012-09-25 19:38:20 -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
bbad39a1e9 am 9703880d: am 82e7fdfd: am 4f832bc7: am 3b1c5d55: add tip about including android:id for layout state 
* commit '9703880d735b331621d599518a9b0e02c78d0a8c':
  add tip about including android:id for layout state
 2012-09-25 19:10:08 -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