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

87111 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Baligh Uddin
9a7b3cf6fa am 35566f9b: (-s ours) am f8d618cb: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev 
* commit '35566f9b4f1a72526712986c4356141ed68db353':
  Import translations. DO NOT MERGE
 2012-09-19 15:21:12 -07:00
Adam Powell
7962fd36fc am d1f13586: am 10bd4106: am baed0a8f: am 56fd88d8: am ab12f0f7: Merge "Implement resolving of icon attributes to resIds in AlertController" 
* commit 'd1f135869e1e89348ea9d1ee916749e30933fe7f':
  Implement resolving of icon attributes to resIds in AlertController
 2012-09-19 15:21:04 -07:00
Fabrice Di Meglio
6f7f916ae6 am d02341d0: am 072533e9: Merge "Fix bug #7146516 Padding can be "over" resolved" into jb-mr1-dev 
* commit 'd02341d0bd4a7a36bc7b9c991ed47d6f98a756ee':
  Fix bug #7146516 Padding can be "over" resolved
 2012-09-19 15:21:00 -07:00
Fabrice Di Meglio
ea19ae20db am eebe7df2: am efa56852: Merge "Fix some typos in Javadoc for Accessibility APIs" into jb-mr1-dev 
* commit 'eebe7df2a37520bc97f9fc8025827d46fb22b32b':
  Fix some typos in Javadoc for Accessibility APIs
 2012-09-19 15:20:57 -07:00
Raph Levien
3fb7dd4f27 am 3c9a0b11: am d79dd344: Merge "Add Roboto Thin and Thin Italic fonts, as sans-serif-thin family" into jb-mr1-dev 
* commit '3c9a0b11de89f9337752b3e6ed6a864198fb5d0a':
  Add Roboto Thin and Thin Italic fonts, as sans-serif-thin family
 2012-09-19 15:20:48 -07:00
Dianne Hackborn
79c8c7a4ff am 9b4d528d: am 09ad0832: Merge "Switch to showing top-most thumbnail of recent apps." into jb-mr1-dev 
* commit '9b4d528d7edf3d55a925b79ab7ba7664a9cb7a5e':
  Switch to showing top-most thumbnail of recent apps.
 2012-09-19 15:20:41 -07:00
Scott Main
c0dbf36f9c am 7b882e36: am 5580005c: am 9198495b: am 19a39686: am b79d8ecc: udpate media formats for JB 
* commit '7b882e36ce4a8d7a44ac07fe212f1f873f961eac':
  udpate media formats for JB
 2012-09-19 15:20:36 -07:00
Jeff Sharkey
d3800acea5 am f40a2ba1: am a490bddc: Merge changes I4513afbd,I20e2194c into jb-mr1-dev 
* commit 'f40a2ba1469304b44097d40c526f1bc9500ded93':
  Make getMediaStorageDirectory() user-aware.
  Lockdown should only augment connected networks.
 2012-09-19 15:20:32 -07:00
Glenn Kasten
7958595a16 am a84ed723: am 549be8be: Merge "New API for querying audio properties" into jb-mr1-dev 
* commit 'a84ed72307c178daefcfd65a35be4ad946b421d9':
  New API for querying audio properties
 2012-09-19 15:20:24 -07:00
Baligh Uddin
9ef9de7fdb am ed6650c5: (-s ours) am 7b6ec1f6: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev 
* commit 'ed6650c500bab5fcdff9f5b14c93c65267e9a250':
  Import translations. DO NOT MERGE
 2012-09-19 15:19:58 -07:00
Narayan Kamath
ec0e97fe7a am 40c5a7a6: am 5d1a870a: Merge "Add APIs to enable SNI and session tickets on sockets." into jb-mr1-dev 
* commit '40c5a7a6e14447bbe66e6daeca7e992bcf200012':
  Add APIs to enable SNI and session tickets on sockets.
 2012-09-19 15:19:38 -07:00
Irfan Sheriff
6ad0da54a8 am 74f4997c: am 5d4206a5: Merge "Get strings in" into jb-mr1-dev 
* commit '74f4997ca467bda930e1c270f82731e66666999c':
  Get strings in
 2012-09-19 15:19:08 -07:00
Jim Miller
bb05cb958b am a149f197: am 5d8d169b: Merge "Fix wrong pattern count in keyguard pattern security view." into jb-mr1-dev 
* commit 'a149f19742a1b7ea8a6539d1f77bbc70980c7d1c':
  Fix wrong pattern count in keyguard pattern security view.
 2012-09-19 15:19:01 -07:00
Amith Yamasani
dc5b1dd508 am 728f3193: am 4adb9d34: Merge "DevicePolicyManager per user" into jb-mr1-dev 
* commit '728f3193efbdacc81442f7cdcfc49d3c8804e5ee':
  DevicePolicyManager per user
 2012-09-19 15:18:46 -07:00
Jason Sams
f5f8ee13ed am dd2f703d: am 2d95a33d: Merge "Fix build. Missed current.txt in previous checkin." into jb-mr1-dev 
* commit 'dd2f703df5ecb27de07279f28bbfc7ca0dabc3a0':
  Fix build.  Missed current.txt in previous checkin.
 2012-09-19 15:18:36 -07:00
Romain Guy
5a6408c88b am deaa0701: am 4e54f930: Merge "Add test for layer updates optimizations" into jb-mr1-dev 
* commit 'deaa0701131b739310da8e75b21898209c43ed5e':
  Add test for layer updates optimizations
 2012-09-19 15:18:31 -07:00
Adam Powell
1587a6531f am 6837fc34: am 2a81fe68: Merge "Further tune config_minScalingSpan for small screen devices." into jb-mr1-dev 
* commit '6837fc3442b552775d9a657ad943569d8221c35a':
  Further tune config_minScalingSpan for small screen devices.
 2012-09-19 15:18:26 -07:00
Jason Sams
9cb3f96e39 am c7b20e5c: am 55db6865: Merge "Clean up and publish the YUV to RGB intrinsic." into jb-mr1-dev 
* commit 'c7b20e5cd4abfbdae8ab615a6a6d78ecb12a4b40':
  Clean up and publish the YUV to RGB intrinsic.
 2012-09-19 15:18:21 -07:00
Adam Powell
5b76cede6b am 3179154c: am 98c370e7: Merge "Make invalidateOptionsMenu asynchronous" into jb-mr1-dev 
* commit '3179154c367ace1deb56340a641a7ebc53ba5e82':
  Make invalidateOptionsMenu asynchronous
 2012-09-19 15:18:17 -07:00
Baligh Uddin
35566f9b4f am f8d618cb: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev 
* commit 'f8d618cb6e634c158efbbf93dad74edd3090559c':
  Import translations. DO NOT MERGE
 2012-09-19 12:37:16 -07:00
Baligh Uddin
5d90374016 Merge "Import translations. DO NOT MERGE" 2012-09-19 12:36:48 -07:00
Baligh Uddin
f8d618cb6e Merge "Import translations. DO NOT MERGE" into jb-mr1-dev 2012-09-19 12:34:40 -07:00
Adam Powell
d1f135869e am 10bd4106: am baed0a8f: am 56fd88d8: am ab12f0f7: Merge "Implement resolving of icon attributes to resIds in AlertController" 
* commit '10bd4106efc22efd57875a2fb914110475c91856':
  Implement resolving of icon attributes to resIds in AlertController
 2012-09-19 12:31:39 -07:00
Adam Powell
10bd4106ef am baed0a8f: am 56fd88d8: am ab12f0f7: Merge "Implement resolving of icon attributes to resIds in AlertController" 
* commit 'baed0a8f0b43191c8f001e064ff42cf27a305d87':
  Implement resolving of icon attributes to resIds in AlertController
 2012-09-19 12:26:06 -07:00
Fabrice Di Meglio
d02341d0bd am 072533e9: Merge "Fix bug #7146516 Padding can be "over" resolved" into jb-mr1-dev 
* commit '072533e934e759b95228ba61152e7d958b641b96':
  Fix bug #7146516 Padding can be "over" resolved
 2012-09-19 12:23:36 -07:00
Fabrice Di Meglio
eebe7df2a3 am efa56852: Merge "Fix some typos in Javadoc for Accessibility APIs" into jb-mr1-dev 
* commit 'efa568525fc7755ac49e44e75246b2be1ef5269f':
  Fix some typos in Javadoc for Accessibility APIs
 2012-09-19 12:23:32 -07:00
Adam Powell
baed0a8f0b am 56fd88d8: am ab12f0f7: Merge "Implement resolving of icon attributes to resIds in AlertController" 
* commit '56fd88d87ff607f65a963b5500b27ae3d4d2670e':
  Implement resolving of icon attributes to resIds in AlertController
 2012-09-19 12:21:15 -07:00
Fabrice Di Meglio
072533e934 Merge "Fix bug #7146516 Padding can be "over" resolved" into jb-mr1-dev 2012-09-19 12:11:49 -07:00
Raph Levien
3c9a0b11de am d79dd344: Merge "Add Roboto Thin and Thin Italic fonts, as sans-serif-thin family" into jb-mr1-dev 
* commit 'd79dd34482b7a9252485c28ff17aede669f70986':
  Add Roboto Thin and Thin Italic fonts, as sans-serif-thin family
 2012-09-19 11:59:45 -07:00
Adam Powell
56fd88d87f am ab12f0f7: Merge "Implement resolving of icon attributes to resIds in AlertController" 
* commit 'ab12f0f72c22143523e2bce7d58d9f1021abde5c':
  Implement resolving of icon attributes to resIds in AlertController
 2012-09-19 11:56:40 -07:00
Fabrice Di Meglio
efa568525f Merge "Fix some typos in Javadoc for Accessibility APIs" into jb-mr1-dev 2012-09-19 11:55:31 -07:00
Raph Levien
d79dd34482 Merge "Add Roboto Thin and Thin Italic fonts, as sans-serif-thin family" into jb-mr1-dev 2012-09-19 11:53:03 -07:00
Dianne Hackborn
9b4d528d7e am 09ad0832: Merge "Switch to showing top-most thumbnail of recent apps." into jb-mr1-dev 
* commit '09ad0832e0c28fa43a2e2bf53bef87df39bd4416':
  Switch to showing top-most thumbnail of recent apps.
 2012-09-19 11:42:56 -07:00
Dianne Hackborn
09ad0832e0 Merge "Switch to showing top-most thumbnail of recent apps." into jb-mr1-dev 2012-09-19 11:40:18 -07:00
Scott Main
7b882e36ce am 5580005c: am 9198495b: am 19a39686: am b79d8ecc: udpate media formats for JB 
* commit '5580005cc7f333e15326b219a0ff06b7c6eca529':
  udpate media formats for JB
 2012-09-19 11:30:31 -07:00
Scott Main
5580005cc7 am 9198495b: am 19a39686: am b79d8ecc: udpate media formats for JB 
* commit '9198495b2767c507eb983f94b0449f23516240db':
  udpate media formats for JB
 2012-09-19 11:27:42 -07:00
Dianne Hackborn
15491c6a72 Switch to showing top-most thumbnail of recent apps. 
The way it should have been, and with the new recents enter animation
the way it must be.

Added a new method to retrieve this thumbnail, since it would be less
efficient to use the existing API (which always returns the "base"
thumbnail).  Probably at some point that existing API should be tweaked
to always return the top thumbnail instead, but that is for a later time.

Also removed code that would clear the thumbnail associated with an
activity when it is resumed.  I don't think there should ever be a
reason to clear a thumbnail -- it's much better to have *something*
for the task, even if it is a little out of date.

Change-Id: I83e6ca6403eb2df5e4de3009dfe8c210e8cf8d5b
 2012-09-19 11:25:40 -07:00
Jeff Sharkey
f40a2ba146 am a490bddc: Merge changes I4513afbd,I20e2194c into jb-mr1-dev 
* commit 'a490bddc8bf0812973dee34ead5c04c87e7ecb15':
  Make getMediaStorageDirectory() user-aware.
  Lockdown should only augment connected networks.
 2012-09-19 11:25:25 -07:00
Jeff Sharkey
a490bddc8b Merge changes I4513afbd,I20e2194c into jb-mr1-dev 
* changes:
  Make getMediaStorageDirectory() user-aware.
  Lockdown should only augment connected networks.
 2012-09-19 11:22:14 -07:00
Scott Main
9198495b27 am 19a39686: am b79d8ecc: udpate media formats for JB 
* commit '19a39686b7bcf5c47cc0e2f99caca7beb9173212':
  udpate media formats for JB
 2012-09-19 11:22:02 -07:00
Glenn Kasten
a84ed72307 am 549be8be: Merge "New API for querying audio properties" into jb-mr1-dev 
* commit '549be8beadf5ad2a56b7f4269d419753c0d61be8':
  New API for querying audio properties
 2012-09-19 11:16:56 -07:00
Glenn Kasten
549be8bead Merge "New API for querying audio properties" into jb-mr1-dev 2012-09-19 11:13:58 -07:00
Scott Main
19a39686b7 am b79d8ecc: udpate media formats for JB 
* commit 'b79d8ecc27c0c7a8c2f8dcc1a752450e4d7d39e2':
  udpate media formats for JB
 2012-09-19 11:00:23 -07:00
Adam Powell
ab12f0f72c Merge "Implement resolving of icon attributes to resIds in AlertController" 2012-09-19 10:51:41 -07:00
Baligh Uddin
ed6650c500 am 7b6ec1f6: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev 
* commit '7b6ec1f6fd4f2858063d2d441b6118ac22da5569':
  Import translations. DO NOT MERGE
 2012-09-19 09:23:04 -07:00
Baligh Uddin
7b6ec1f6fd Merge "Import translations. DO NOT MERGE" into jb-mr1-dev 2012-09-19 09:14:59 -07:00
Baligh Uddin
07b199c8b0 Merge "Import translations. DO NOT MERGE" 2012-09-19 09:11:04 -07:00
Derek Sollenberger
2a6ecae93d Fix Skia assertions where we were allowing immutable bitmaps to be written to. 
bug: 7092330
Change-Id: I4a9d1d299244d46172562080c56c8360f5e4af02
 2012-09-19 07:21:12 -07:00
Dianne Hackborn
1cf4289349 am 8f2ec436: am 1e5aeecb: Merge "Don\'t allow more than 3 actively running users at a time." into jb-mr1-dev 
* commit '8f2ec4365f518a9752e379ca87e3fcdcd2c4c55f':
  Don't allow more than 3 actively running users at a time.
 2012-09-19 05:50:39 -07:00
Narayan Kamath
40c5a7a6e1 am 5d1a870a: Merge "Add APIs to enable SNI and session tickets on sockets." into jb-mr1-dev 
* commit '5d1a870a25f7495755432a42cf8c81818dc369fa':
  Add APIs to enable SNI and session tickets on sockets.
 2012-09-19 05:50:08 -07:00