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

64553 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Dianne Hackborn
df3c49ee2e am 2ad8a89b: am a1279586: Merge "SDK only: now that support lib is in SDK, we can link to it." into ics-mr1 
* commit '2ad8a89b4b55f1cf8994e5b044d496d889839403':
  SDK only: now that support lib is in SDK, we can link to it.
 2011-12-12 18:01:22 -08:00
Gilles Debunne
ba36428502 am 8e22ec9b: am a1277de3: Merge "Prevent a memory leak in TextLine." into ics-mr1 
* commit '8e22ec9bc6c59d9e54a6b48f1133881be97af1a7':
  Prevent a memory leak in TextLine.
 2011-12-12 17:49:31 -08:00
Gilles Debunne
a4b1b8ab3c am 7ffadba5: am 1fb90497: Merge "Text blinking cursor hard to see." into ics-mr1 
* commit '7ffadba5dfbeeaa93a9559ca3eaf1a7719426a5f':
  Text blinking cursor hard to see.
 2011-12-12 17:49:29 -08:00
Adam Powell
f8c2abcadd am bffe0be3: am 9c92fcd9: Merge "Bug 5727679 - CTS test ViewGroupTest#testGetChildVisibleRect" into ics-mr1 
* commit 'bffe0be3af2bd19a392e7d332cbfda9a60b8e057':
  Bug 5727679 - CTS test ViewGroupTest#testGetChildVisibleRect
 2011-12-12 17:49:21 -08:00
Scott Main
801fda548c AndroidU lesson on designing for multiple screens. 
This change adds the text for the AndroidU lesson "Designing for Multiple
Screens", which shows how to write applications that adapt properly
to screen size, density and orientation for maximum compatibility.
Update makefile and resources-data.js for rendering source in HTML
Add ZIP file for sample

Change-Id: I671bb3063d5bf02681bc547ffe5262a9df22037a
 2011-12-12 17:13:31 -08:00
Dianne Hackborn
0ae6e1719b am 359bb3b4: Final API 15. 
* commit '359bb3b432b21590c12588c3ca3880ac17aadc96':
  Final API 15.
 2011-12-12 17:04:04 -08:00
Irfan Sheriff
311b0f57ce am 36838993: Merge "Fix configured network status" 
* commit '36838993dfb67a2056468ab74a77a81afa053c9c':
  Fix configured network status
 2011-12-12 16:57:53 -08:00
Irfan Sheriff
36838993df Merge "Fix configured network status" 2011-12-12 16:55:49 -08:00
Romain Guy
dcd03fcca3 am d2ea737a: Merge "Remove leftover debugging code" 
* commit 'd2ea737a1f28b43ce2e01686d64a5cf8243daa49':
  Remove leftover debugging code
 2011-12-12 16:53:45 -08:00
Romain Guy
b23e7499e3 am ebb2c6b3: Merge "Keep shaders to render properly" 
* commit 'ebb2c6b36da049b32c1dba6f14f16660d860eb09':
  Keep shaders to render properly
 2011-12-12 16:51:41 -08:00
Romain Guy
d2ea737a1f Merge "Remove leftover debugging code" 2011-12-12 16:50:55 -08:00
Romain Guy
f44e66fcf7 Remove leftover debugging code 
Change-Id: I1589af7991da36744071d5081daa24ebae5b4dfd
 2011-12-12 16:50:13 -08:00
Romain Guy
ebb2c6b36d Merge "Keep shaders to render properly" 2011-12-12 16:49:40 -08:00
Romain Guy
3e263fac8c Keep shaders to render properly 
I don't know who's to blame, SGX or Tegra2 but one of those two GPUs is not
following the OpenGL ES 2.0 spec.

Change-Id: I2624e0efbc9c57d571c55c8b440a5e43f08a54f2
 2011-12-12 16:47:48 -08:00
Irfan Sheriff
cdc077c9dd Fix configured network status 
For a connected network, keep status as CURRENT. For a network,
that is disconnected it should be ENABLED. A disabled network
will have the status as DISABLED

Also, add a unit test to ensure there is only one CURRENT network
that is connected

Change-Id: Iaa4a7124a0c372a8f6df3d846ae8c15d9b29cf13
 2011-12-12 16:47:02 -08:00
Dianne Hackborn
359bb3b432 Final API 15. 
Change-Id: Ic356a7b4d56237e928e653c68e87b070e923d145
 2011-12-12 16:26:38 -08:00
Amith Yamasani
3066afdc6f Update VIBRATE_ON to a supported value when upgrading from GB. 
Bug: 5738552

If value has ringer set to VIBRATE_OFF, we need to update it to the
now default, as VIBRATE_OFF is inconsistent with the new UI controls.

Make sure notification vibrate setting follows ringer vibrate setting.
Change-Id: I6638c8a8729d850e71db10d27a0b50d24dc11f19
 2011-12-12 16:24:13 -08:00
Gilles Debunne
1db98136b0 am c1761e7f: Fixed build after merge 
* commit 'c1761e7fe10390d90b805f373b51ecaabf214dac':
  Fixed build after merge
 2011-12-12 16:16:05 -08:00
Jamie Gennis
ab68400106 am f08403ba: am 74e0fcae: am a1dee3f5: Merge "SurfaceTexture: fix a verbose-log compile error" into ics-mr1 
* commit 'f08403ba92999448512c4af7062fe30206e32dcf':
  SurfaceTexture: fix a verbose-log compile error
 2011-12-12 16:13:58 -08:00
Dianne Hackborn
2ad8a89b4b am a1279586: Merge "SDK only: now that support lib is in SDK, we can link to it." into ics-mr1 
* commit 'a1279586dd1a866dd58d669aa0980d71f6c589d9':
  SDK only: now that support lib is in SDK, we can link to it.
 2011-12-12 16:12:40 -08:00
Gilles Debunne
c1761e7fe1 Fixed build after merge 
Change-Id: Ifac89a70afa82047d97994860c6e58954f5d91d0
 2011-12-12 16:11:47 -08:00
Jamie Gennis
f08403ba92 am 74e0fcae: am a1dee3f5: Merge "SurfaceTexture: fix a verbose-log compile error" into ics-mr1 
* commit '74e0fcaed1cd20ae8632224ff5a5404ff1a6e497':
  SurfaceTexture: fix a verbose-log compile error
 2011-12-12 16:10:28 -08:00
Dianne Hackborn
a1279586dd Merge "SDK only: now that support lib is in SDK, we can link to it." into ics-mr1 2011-12-12 16:09:54 -08:00
Gilles Debunne
8e22ec9bc6 am a1277de3: Merge "Prevent a memory leak in TextLine." into ics-mr1 
* commit 'a1277de3c393fb0861d26ec5551ae4247e32dee4':
  Prevent a memory leak in TextLine.
 2011-12-12 15:56:33 -08:00
Gilles Debunne
7ffadba5df am 1fb90497: Merge "Text blinking cursor hard to see." into ics-mr1 
* commit '1fb90497b73b1560c55f1cb73cd394c3b8714212':
  Text blinking cursor hard to see.
 2011-12-12 15:54:38 -08:00
Gilles Debunne
a1277de3c3 Merge "Prevent a memory leak in TextLine." into ics-mr1 2011-12-12 15:53:25 -08:00
Gilles Debunne
1fb90497b7 Merge "Text blinking cursor hard to see." into ics-mr1 2011-12-12 15:52:39 -08:00
Raphael
335dc4cc41 am b2bf2471: am ab8d6785: (-s ours) am 2ace3b01: Merge "Merge "AAPT fix printf %zd crash on Windows". Do not merge." into ics-mr1 
* commit 'b2bf2471b1f0b4a76660e63f91a8de84cc643da8':
  Merge "AAPT fix printf %zd crash on Windows". Do not merge.
 2011-12-12 15:44:16 -08:00
Matthew Xie
d6fc4cf24f am 470d057a: am 18ad6514: am ed0830c5: Merge "Move broadcastState STATE_TURNING_ON before persistSwitchSetting" into ics-mr1 
* commit '470d057aedee2f1a8b88a95419f8b1bb42f2120a':
  Move broadcastState STATE_TURNING_ON before persistSwitchSetting
 2011-12-12 15:44:14 -08:00
Eric Fischer
c17b6885bf am 74bc6075: am f3ea0231: (-s ours) am 386f2084: Merge "Import revised translations. DO NOT MERGE" into ics-mr1 
* commit '74bc6075e13f871a47622d2a08d91b259448a24e':
  Import revised translations.  DO NOT MERGE
 2011-12-12 15:44:12 -08:00
The Android Open Source Project
c2df2e11bd am 8ca8f5ed: am 40375099: Reconcile with ics-mr1-release 
* commit '8ca8f5ed128cd31f0122b9d778e0dd37cb8756c9':
 2011-12-12 15:44:11 -08:00
The Android Open Source Project
6c3b637d44 am b34027bb: am f14dc291: Merge from ics-mr1 
* commit 'b34027bb2fc3394d054986d7bbbcf54261436c11':
  Fix drm enumeration order, resolves failure to play forward lock ringtones
 2011-12-12 15:44:09 -08:00
Adam Powell
bffe0be3af am 9c92fcd9: Merge "Bug 5727679 - CTS test ViewGroupTest#testGetChildVisibleRect" into ics-mr1 
* commit '9c92fcd91c67a98f3a767255e7d3748bca3ef751':
  Bug 5727679 - CTS test ViewGroupTest#testGetChildVisibleRect
 2011-12-12 15:42:22 -08:00
Adam Powell
9c92fcd91c Merge "Bug 5727679 - CTS test ViewGroupTest#testGetChildVisibleRect" into ics-mr1 2011-12-12 15:40:00 -08:00
Dianne Hackborn
7871badd5d SDK only: now that support lib is in SDK, we can link to it. 
Update some of the platform documentation to directly link to
relevent support lib docs.  Yay!

Also improve BroadcastReceiver documentation to more clearly
discussion security around receivers, and how the support
lib's LocalBroadcastManager can help.

Change-Id: I563c7516d5fbf91ab884c86bc411aff726249e42
 2011-12-12 15:39:50 -08:00
Raphael
b2bf2471b1 am ab8d6785: (-s ours) am 2ace3b01: Merge "Merge "AAPT fix printf %zd crash on Windows". Do not merge." into ics-mr1 
* commit 'ab8d6785dcefa5b2b66f6c042475a0f9f558dd45':
  Merge "AAPT fix printf %zd crash on Windows". Do not merge.
 2011-12-12 15:39:30 -08:00
Matthew Xie
470d057aed am 18ad6514: am ed0830c5: Merge "Move broadcastState STATE_TURNING_ON before persistSwitchSetting" into ics-mr1 
* commit '18ad6514bbeb68a96c12ba1636ab8df8e3945f37':
  Move broadcastState STATE_TURNING_ON before persistSwitchSetting
 2011-12-12 15:39:27 -08:00
Eric Fischer
74bc6075e1 am f3ea0231: (-s ours) am 386f2084: Merge "Import revised translations. DO NOT MERGE" into ics-mr1 
* commit 'f3ea02319fc8d1f882ef7f392c245e197ab858de':
  Import revised translations.  DO NOT MERGE
 2011-12-12 15:39:23 -08:00
The Android Open Source Project
8ca8f5ed12 am 40375099: Reconcile with ics-mr1-release 
* commit '40375099d10139b6c96c1db8b8295874d60c712e':
 2011-12-12 15:39:19 -08:00
The Android Open Source Project
b34027bb2f am f14dc291: Merge from ics-mr1 
* commit 'f14dc29104340f8ccf9d42aef8dba2cc23f7f5e1':
  Fix drm enumeration order, resolves failure to play forward lock ringtones
 2011-12-12 15:39:17 -08:00
Irfan Sheriff
5ceeaf7d21 am afb847a4: Merge "Clean up synchronization" 
* commit 'afb847a4692a6e5cded8c7a330d00b70b794896a':
  Clean up synchronization
 2011-12-12 15:37:53 -08:00
Irfan Sheriff
afb847a469 Merge "Clean up synchronization" 2011-12-12 15:35:25 -08:00
Justin Ho
6ee5c04df3 am ee8005e6: am df83cfc9: am 1cec30a1: Merge "Quick settings icons updated to match ics style on tablet" into ics-mr1 
* commit 'ee8005e6ecbb95dad98cf1badbeb2b66c794b790':
  Quick settings icons updated to match ics style on tablet
 2011-12-12 15:34:51 -08:00
Jeff Tinker
18e76fd74e am a6e54945: am dc44e06e: am ef664f62: Merge "Fix drm flag setting missed in false drm recognition fix." into ics-mr1 
* commit 'a6e549455a17970b5e7b75686d6cc1c7169d59c3':
  Fix drm flag setting missed in false drm recognition fix.
 2011-12-12 15:34:49 -08:00
Joe Fernandez
15b47788d5 am 3f6efeaa: am a4f49ac5: am 4b3227de: am 89c3bc38: Merge "docs: Android 4.0.2 (SDK Tools r16) Release Notes - RC6" into ics-mr0 
* commit '3f6efeaad72bac766351b91d7c47639ca6d08330':
  docs: Android 4.0.2 (SDK Tools r16) Release Notes - RC6
 2011-12-12 15:34:47 -08:00
Gilles Debunne
61eda07157 am 0288c6c5: am f107abec: am caf4ead3: Merge "Blinking cursor in Talk" into ics-mr1 
* commit '0288c6c562bcef5ebeb100d32c1f4083c798573d':
  Blinking cursor in Talk
 2011-12-12 15:34:45 -08:00
The Android Open Source Project
291e94a5db am ac9860bb: am 175d5d76: Reconcile with ics-mr1-release 
* commit 'ac9860bb738e6536eb4d89d6a4811e67901c6181':
 2011-12-12 15:34:43 -08:00
James Dong
e21fb8ce87 am b7e02819: am 406dd5d1: am aadbd80b: Fixed the false drm recognition. 
* commit 'b7e0281900db002e9aed8dff0e2fbcd8b22bf91d':
  Fixed the false drm recognition.
 2011-12-12 15:34:41 -08:00
Justin Ho
ee8005e6ec am df83cfc9: am 1cec30a1: Merge "Quick settings icons updated to match ics style on tablet" into ics-mr1 
* commit 'df83cfc95c1b909ffcfc31f3dd30262a49cffced':
  Quick settings icons updated to match ics style on tablet
 2011-12-12 15:30:36 -08:00
Gilles Debunne
f625582963 am 7cb77c1a: resolved conflicts for merge of 1742f20c to master 
* commit '7cb77c1a0d86b0fbc8774cd90cc81debc3508be1':
  Performance improvements for long text edition.
 2011-12-12 15:30:25 -08:00