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

69169 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Dianne Hackborn
8931da12e8 Merge "Fix crash." 2012-03-08 19:27:21 -08:00
Dianne Hackborn
d9781fe7ee Fix crash. 
Change-Id: Id219351625494c54524e400055755d41f3bef868
 2012-03-08 18:04:18 -08:00
Jeff Sharkey
8ac70c4250 Merge "Split Parcel JNI details away from Binder." 2012-03-08 17:52:54 -08:00
Eric Laurent
d10a5992f9 Merge "audio policy: use audio_devices_t when appropriate" 2012-03-08 17:45:44 -08:00
Eric Fischer
a4ef63f6c6 Merge "Import translations. DO NOT MERGE" 2012-03-08 17:44:04 -08:00
Eric Fischer
2ac9b4a38c Merge "Import translations. DO NOT MERGE" 2012-03-08 17:43:57 -08:00
Adam Powell
787f2699f1 Merge "Public API for android.widget.Switch properties" 2012-03-08 17:18:10 -08:00
Jeff Brown
34264670da Merge "Should recycle TypedArray." 2012-03-08 16:43:57 -08:00
Jeff Brown
14577c4df5 Should recycle TypedArray. 
Change-Id: Ia318de37c22e4533fff631be816cee539a5cd83d
 2012-03-08 16:42:29 -08:00
Jeff Tinker
62ee80873b Merge "Fix videos app bandwidth accounting for 4G streaming" 2012-03-08 16:40:44 -08:00
Jeff Sharkey
061ccee7f3 Merge "Deprecate some FileUtils, pointing to Os instead." 2012-03-08 16:29:54 -08:00
Jeff Brown
df813c03b1 Merge "Use the Choreographer for Drawable animations." 2012-03-08 16:28:48 -08:00
Jeff Sharkey
d84e1ce0b5 Split Parcel JNI details away from Binder. 
This is purely a refactoring, with no change to the underlying
functionality.

Change-Id: I41b59f14e57d1cc144274a01f77658d99a1bfe02
 2012-03-08 16:06:30 -08:00
Xia Wang
21b4d6b7a5 Merge "Fix CM test http://b/issue?id=6125619" 2012-03-08 16:01:00 -08:00
Xia Wang
27284da88c Fix CM test 
http://b/issue?id=6125619

Change-Id: I33306619424ab54281aaf592c78581179ebbfc6e
 2012-03-08 15:57:26 -08:00
Eric Laurent
c9ab9f5c2c audio policy: use audio_devices_t when appropriate 
Change-Id: I1b3a5879e81c789fb53d356af3d3a1ee2dca955f
 2012-03-08 15:57:09 -08:00
Romain Guy
67b3a9ea61 Merge "Fix the docs" 2012-03-08 15:56:59 -08:00
Romain Guy
1e3d313c78 Fix the docs 
Change-Id: I73bcb684eac01db870936aa5e29df930b5432833
 2012-03-08 15:55:56 -08:00
Amith Yamasani
28ca8f9f95 Merge "Make SyncManager and AccountManagerService multi-user aware." 2012-03-08 15:55:20 -08:00
Romain Guy
754682e513 Merge "Fix the build." 2012-03-08 15:41:29 -08:00
Romain Guy
43e8eb1e21 Fix the build. 
That's twice today. I am ashamed.

Change-Id: I0ec7ab2b742e8054980a1ab7790c4896da9e2729
 2012-03-08 15:40:14 -08:00
Adam Powell
6c86e1ba41 Public API for android.widget.Switch properties 
Bug 6104562

Add properties that can be set/retrieved programmatically to match the
XML attributes available.

Change-Id: Ief28e5cad9ec3e6c2d12dd11ff9fa24f22eecec3
 2012-03-08 15:12:48 -08:00
Romain Guy
583fcb9175 Merge "Dispatch screen state change events to Views Bug #6120957" 2012-03-08 15:06:50 -08:00
Romain Guy
bb9908b828 Dispatch screen state change events to Views 
Bug #6120957

Using this new callback, views can interrupt and resume their
animations or other periodic tasks based on the current state
of the display.

Change-Id: I398f4abd421e9c5f207107bf1009a7b92cf45daa
 2012-03-08 15:05:12 -08:00
Ben Gruver
a0b29f5565 Merge "Fix an issue where a non-styled string could be made into a styled string" 2012-03-08 14:52:09 -08:00
Mathias Agopian
7d8775a87e Merge changes I140d291e,Id443ec5c 
* changes:
  remove files that moved to frameworks/native
  fixup hardcoded include paths for new project
 2012-03-08 14:45:51 -08:00
Dianne Hackborn
c9ab47b4fc Merge "Add new Intent API for associating a ClipData with an Intent." 2012-03-08 14:38:09 -08:00
Dianne Hackborn
21c241e061 Add new Intent API for associating a ClipData with an Intent. 
Allows applications to propagate multiple URI grants through an
Intent.

Later on, we should probably redefine the share actions to be
based on this ClipData with the old extras-based approach only
there for compatibility.  Even if we don't do that, though, this
allows you to do a multi-select share that grants multiple URI
permissions by stuffing the URIs in a ClipData.

Also add some documentation in various places telling people how
they can grant URI permissions.

Change-Id: Id4ba8e72c11caf7e1f1f438cb7af058d1586a37c
 2012-03-08 14:34:03 -08:00
Jeff Sharkey
929b5899a3 Deprecate some FileUtils, pointing to Os instead. 
Change-Id: I5d306784ea924ffd8c32c4768f975190445932a4
 2012-03-08 14:31:57 -08:00
Alex Sakhartchouk
c53254ec92 Merge "Enable AA in scenegraph. Minor shader work in sample." 2012-03-08 14:25:56 -08:00
Eino-Ville Talvala
ae8945ab23 Merge "Allow multiple releases to be called on MediaActionSound." 2012-03-08 14:25:35 -08:00
Eino-Ville Talvala
a4fd93751d Allow multiple releases to be called on MediaActionSound. 
Bug: 6136088
Change-Id: I80ff09a90cd65d874ae016d450c4cc8c6a56d387
 2012-03-08 14:18:06 -08:00
Eric Fischer
ae4e6d8d4b Import translations. DO NOT MERGE 
Change-Id: I02d61de9903b0c96622dc4d670658c8cd92fa67e
 2012-03-08 12:51:06 -08:00
Eric Fischer
152202bb55 Import translations. DO NOT MERGE 
Change-Id: I503dca8c62c09f8831d313fd7e39405e4397097b
 2012-03-08 12:39:18 -08:00
Megha Joshi
c8462e322b am 2126508d: am fa71583e: am 33372b21: Merge "A few updates for TVs." into ics-mr1 
* commit '2126508d20d5ee9e5d5c8dbaf63286421fcddb38':
 2012-03-08 12:31:47 -08:00
Megha Joshi
b6c90f03c9 am b5ef90be: am e0e6612d: am 33372b21: Merge "A few updates for TVs." into ics-mr1 
* commit 'b5ef90bee0d8aaf61be0da705066b1f262c88873':
  A few updates for TVs.
 2012-03-08 12:31:44 -08:00
Megha Joshi
9e3f21e472 am 1994e1d1: am 702d9cbc: am 84099f3d: Merge "Adding TV related updates." into ics-mr1 
* commit '1994e1d1cb0d8e5f2a2ecdd8791005ec296ae861':
 2012-03-08 12:29:16 -08:00
Megha Joshi
2126508d20 am fa71583e: am 33372b21: Merge "A few updates for TVs." into ics-mr1 
* commit 'fa71583e15d1fda1b5fa51b22e0f8510082d5355':
 2012-03-08 12:29:09 -08:00
Megha Joshi
b5ef90bee0 am e0e6612d: am 33372b21: Merge "A few updates for TVs." into ics-mr1 
* commit 'e0e6612d30308a68c107d517582eb68f0e4caa99':
  A few updates for TVs.
 2012-03-08 12:27:41 -08:00
Megha Joshi
7ec22d33ac am 5c2fa5e5: am bb0a1602: am 84099f3d: Merge "Adding TV related updates." into ics-mr1 
* commit '5c2fa5e5c94994822e8e4b139f8db5799568240f':
  Adding TV related updates.
 2012-03-08 12:26:44 -08:00
Fabrice Di Meglio
bbd8226e97 Merge "More fixes about padding" 2012-03-08 12:26:22 -08:00
Elliott Hughes
940fcbddd3 Merge "Tracking changes to SSLParametersImpl.getDefaultTrustManager()" 2012-03-08 12:25:48 -08:00
Megha Joshi
1994e1d1cb am 702d9cbc: am 84099f3d: Merge "Adding TV related updates." into ics-mr1 
* commit '702d9cbc5d501dfa81030be2d0aec46d8f06e797':
 2012-03-08 12:25:34 -08:00
Megha Joshi
e0e6612d30 am 33372b21: Merge "A few updates for TVs." into ics-mr1 
* commit '33372b217ea5e9950560449aa5c86e0f0ddacc74':
  A few updates for TVs.
 2012-03-08 12:25:08 -08:00
Adam Powell
f8f0c8ea4b Merge "Fix measurement issues with Spinner and ListPopupWindow" 2012-03-08 12:24:32 -08:00
Megha Joshi
fa71583e15 am 33372b21: Merge "A few updates for TVs." into ics-mr1 
* commit '33372b217ea5e9950560449aa5c86e0f0ddacc74':
  A few updates for TVs.
 2012-03-08 12:24:29 -08:00
Megha Joshi
5c2fa5e5c9 am bb0a1602: am 84099f3d: Merge "Adding TV related updates." into ics-mr1 
* commit 'bb0a160229cdfc86529517905b60d0ace2dd2172':
  Adding TV related updates.
 2012-03-08 12:24:20 -08:00
Brian Carlstrom
866666071b Tracking changes to SSLParametersImpl.getDefaultTrustManager() 
Change-Id: I0bcf2bbcd2581f6b66e08d1c6f0de24bf8d34199
 2012-03-08 12:23:53 -08:00
Megha Joshi
33372b217e Merge "A few updates for TVs." into ics-mr1 2012-03-08 12:22:49 -08:00
Megha Joshi
702d9cbc5d am 84099f3d: Merge "Adding TV related updates." into ics-mr1 
* commit '84099f3d788974169a8ea282f9413cb399d17012':
  Adding TV related updates.
 2012-03-08 12:22:05 -08:00