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

66704 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Mathias Agopian
818b423658 Merge "add support for GL_EXT_debug_marker" 2012-01-30 15:23:47 -08:00
Mathias Agopian
e02f7b3fa8 SF now synchronizes to VSYNC 
Change-Id: Ic5e4f2ea9927ce133eef9499c03161325e9d02c5
 2012-01-30 15:21:23 -08:00
Eric Fischer
b61712bde1 Import translations. DO NOT MERGE 
Change-Id: I2395f99e947c1b75df55216e9b0246eac63f0d8f
 2012-01-30 15:21:00 -08:00
Scott Main
a76ddf9272 am 6507df8b: docs: add meta descriptions for home and sdk also revise the G+ widget to make fit 
* commit '6507df8b78d80403d66d321748ad47290a611e3f':
  docs: add meta descriptions for home and sdk also revise the G+ widget to make fit
 2012-01-30 15:14:53 -08:00
Gilles Debunne
e62beb5c20 Removed SoftInputShownOnFocus methods in TextView 
Not used by Phone, for which it was initially created.

Change-Id: I0cad668f894e88cda0a410005aaf6b6c0b89dc3e
 2012-01-30 15:10:41 -08:00
Alex Sakhartchouk
0982edb701 Merge "Fixing possible pne." into graphics-dev 2012-01-30 14:24:04 -08:00
Romain Guy
7895a7fa72 am a585e8db: Merge "Always initialize AsyncTask on the main thread." 
* commit 'a585e8dbcf33a9cfcca725b994a22e6d78d427f9':
  Always initialize AsyncTask on the main thread.
 2012-01-30 14:15:30 -08:00
Romain Guy
a585e8dbcf Merge "Always initialize AsyncTask on the main thread." 2012-01-30 14:12:37 -08:00
Romain Guy
5e9120d4ad Always initialize AsyncTask on the main thread. 
Change-Id: I039e5d6cb7157a0c8873e0d29161daf1cbda5577
 2012-01-30 14:11:44 -08:00
Alex Sakhartchouk
5de922962a Fixing possible pne. 
Change-Id: I4a8071374a72c0ca2639dc033d06d17e0a0466f7
 2012-01-30 14:05:39 -08:00
Scott Main
6507df8b78 docs: add meta descriptions for home and sdk 
also revise the G+ widget to make fit

Change-Id: Iadc8858bec2524fa9ed905534949885c7130ccc2
 2012-01-30 14:04:22 -08:00
The Android Open Source Project
8fea0266cc am c7d75153: am 827a597d: Reconcile with ics-mr1-release 
* commit 'c7d7515325e9ef827feb094dbf42f1c920ad7936':
  Revert "Fix 5797764: Increase lock screen's thread priority"
  DO NOT MERGE Revert "AudioFlinger: mix track only when really ready (2)"
 2012-01-30 13:42:59 -08:00
Kazuhiro Ondo
bc92613cf7 Display roaming indicator icon only based on ERI in CDMA case. 
Fixing CV failure. In some scenario where ERI table expects
"Roaming Indicator OFF", R icon was still displayed on
the status bar. This patch is to update the logic so that
only ERI table is used to display R icon in case of CDMA.

Bug:5932154
Change-Id: I125087cc8d700b102e05c3050d88a70485c9a86e
 2012-01-30 13:42:21 -08:00
The Android Open Source Project
c7d7515325 am 827a597d: Reconcile with ics-mr1-release 
* commit '827a597df70a51c6cccad52fae2be2c469f58b77':
  Revert "Fix 5797764: Increase lock screen's thread priority"
  DO NOT MERGE Revert "AudioFlinger: mix track only when really ready (2)"
 2012-01-30 13:38:52 -08:00
The Android Open Source Project
827a597df7 Reconcile with ics-mr1-release 
Change-Id: Ic6454a4b7929bbf2f453022fd8ae596e215657c2
 2012-01-30 13:36:34 -08:00
The Android Automerger
10d6e70a1b merge in ics-mr1-release history after reset to ics-mr1 2012-01-30 13:23:32 -08:00
Gilles Debunne
58687efd54 am a8217330: Merge "Remove onPreDrawListeners earlier in TextView" 
* commit 'a82173305991a24bc1400149b41bb998a6f50b38':
  Remove onPreDrawListeners earlier in TextView
 2012-01-30 13:01:18 -08:00
Dianne Hackborn
adc39dee13 am a6989484: am 25fe8ef1: am e22f4748: Merge "Update documentation to reflect the old approach not working." into ics-mr1 
* commit 'a69894846c0e34228da71dccf4e8ef5ae95a45a3':
  Update documentation to reflect the old approach not working.
 2012-01-30 12:58:56 -08:00
Gilles Debunne
a821733059 Merge "Remove onPreDrawListeners earlier in TextView" 2012-01-30 12:58:53 -08:00
Alex Sakhartchouk
4be5f45f2e Merge "Making the SceneGraph more robust to make sure data is propagated to RS. Caching RS name allocations." into graphics-dev 2012-01-30 12:57:40 -08:00
Dianne Hackborn
a69894846c am 25fe8ef1: am e22f4748: Merge "Update documentation to reflect the old approach not working." into ics-mr1 
* commit '25fe8ef1b51b4a36e08b3fea35c0799f3d0840e2':
  Update documentation to reflect the old approach not working.
 2012-01-30 12:56:42 -08:00
Dianne Hackborn
25fe8ef1b5 am e22f4748: Merge "Update documentation to reflect the old approach not working." into ics-mr1 
* commit 'e22f4748565915948c8af2961ac74fe81a417e3b':
  Update documentation to reflect the old approach not working.
 2012-01-30 12:54:02 -08:00
Dianne Hackborn
e22f474856 Merge "Update documentation to reflect the old approach not working." into ics-mr1 2012-01-30 12:52:11 -08:00
Andreas Huber
91b480d114 am e372593c: Merge "Instantiate software codecs locally whenever possible." 
* commit 'e372593cfb973c8f8bdc46858dece9fcae9e178c':
  Instantiate software codecs locally whenever possible.
 2012-01-30 12:35:36 -08:00
Andreas Huber
e372593cfb Merge "Instantiate software codecs locally whenever possible." 2012-01-30 12:32:58 -08:00
Stephen Hines
bc19591c1f am 855eadf9: Merge "Fix potential bug with reordered size/offset arguments." 
* commit '855eadf942c8ff5c2665d7dc3b6d4b5ba630419a':
  Fix potential bug with reordered size/offset arguments.
 2012-01-30 12:23:21 -08:00
Stephen Hines
855eadf942 Merge "Fix potential bug with reordered size/offset arguments." 2012-01-30 12:22:10 -08:00
Romain Guy
cb3fbbd037 am 69726597: Merge "Add stencil buffer to the EGL config" 
* commit '69726597b300ec32f2d2c489cd3f312efd3077c2':
  Add stencil buffer to the EGL config
 2012-01-30 12:07:07 -08:00
Romain Guy
69726597b3 Merge "Add stencil buffer to the EGL config" 2012-01-30 12:05:28 -08:00
Romain Guy
530041d319 Add stencil buffer to the EGL config 
Change-Id: If76c0cd6127534d90f9526b75c0f8e56259c6722
 2012-01-30 12:04:17 -08:00
Alex Sakhartchouk
e93db17a14 Making the SceneGraph more robust to make sure data is propagated to RS. 
Caching RS name allocations.

Change-Id: I5e7a17a9ac76f81548145ae78665da322ec51271
 2012-01-30 12:03:06 -08:00
Ben Murdoch
b5622b6008 Remove code that quits the webcore watchdog thread. 
The WebCore thread lives forever ergo so should the
watchdog.

Bug: 5920210
Change-Id: I2596a4cc4720c4e09265b9a875680bb7891bd919
 2012-01-30 20:01:41 +00:00
Jeff Sharkey
a360f1ccfb am 4d6da864: Merge "Move away from deprecated NetworkInfo extra." 
* commit '4d6da8649afc43022a156bffca6cd2c9127cefe1':
  Move away from deprecated NetworkInfo extra.
 2012-01-30 11:55:31 -08:00
Jeff Sharkey
4d6da8649a Merge "Move away from deprecated NetworkInfo extra." 2012-01-30 11:53:32 -08:00
Andreas Huber
18ffe40289 Instantiate software codecs locally whenever possible. 
Change-Id: I58d5c30b9de9873a239e91955a8900e2c72518a7
 2012-01-30 11:48:02 -08:00
Dianne Hackborn
fa9b5cae64 Update documentation to reflect the old approach not working. 
The old approach has a problem with the original application's
recent tasks entry disappearing (this is probably a bug in the
platform).  Update to an alternative approach that does work.

Change-Id: I15e582eff8c77cc22628f7b099e9f04eb5bfbce7
 2012-01-30 11:45:00 -08:00
John Wang
a8daa7ebb8 am 7a41c701: am 136704a8: am b069833e: Merge "Adjust the LTE signal bar mapping." into ics-mr1 
* commit '7a41c7013d0ed319fcb4384cc4b5cf26b22d3580':
  Adjust the LTE signal bar mapping.
 2012-01-30 11:28:14 -08:00
John Wang
7a41c7013d am 136704a8: am b069833e: Merge "Adjust the LTE signal bar mapping." into ics-mr1 
* commit '136704a803ed7dd419a452315d1c0fe4885ce441':
  Adjust the LTE signal bar mapping.
 2012-01-30 11:25:48 -08:00
John Wang
136704a803 am b069833e: Merge "Adjust the LTE signal bar mapping." into ics-mr1 
* commit 'b069833e63f711a6b140385003d67b3ff68fe66b':
  Adjust the LTE signal bar mapping.
 2012-01-30 11:23:24 -08:00
Jeff Sharkey
5e61331da5 Move away from deprecated NetworkInfo extra. 
Because the NetworkInfo included in CONNECTIVITY_ACTION broadcast
extra does not reflect the state applicable to the calling UID, and
the last sticky broadcast may have stale state, transition to calling
ConnectivityManager.getActiveNetworkInfo() directly.

Change-Id: I86b316fbedd0273585ad5f1248b091bc3a3a5520
 2012-01-30 11:21:35 -08:00
John Wang
b069833e63 Merge "Adjust the LTE signal bar mapping." into ics-mr1 2012-01-30 11:20:35 -08:00
Makoto Onuki
8d3af0926c am d53da8ef: Merge "Fixing broken unittests." 
* commit 'd53da8efa7a618562615df35ffc674620cbe2b26':
  Fixing broken unittests.
 2012-01-30 11:18:36 -08:00
Makoto Onuki
d53da8efa7 Merge "Fixing broken unittests." 2012-01-30 11:16:58 -08:00
Scott Main
3f284c7aa9 am f10d69f3: am fb300fb2: am 73790a53: Merge "docs: add G+ page announcement to homepage" into ics-mr1 
* commit 'f10d69f30107f27465684630460615443783f2bc':
  docs: add G+ page announcement to homepage
 2012-01-30 10:10:43 -08:00
Scott Main
f10d69f301 am fb300fb2: am 73790a53: Merge "docs: add G+ page announcement to homepage" into ics-mr1 
* commit 'fb300fb2f0f253c94c14090256f9695bca1a1e4b':
  docs: add G+ page announcement to homepage
 2012-01-30 10:08:14 -08:00
Scott Main
fb300fb2f0 am 73790a53: Merge "docs: add G+ page announcement to homepage" into ics-mr1 
* commit '73790a53b580b8ec8eff88e25a19b5fcfa33392a':
  docs: add G+ page announcement to homepage
 2012-01-30 10:05:59 -08:00
Scott Main
73790a53b5 Merge "docs: add G+ page announcement to homepage" into ics-mr1 2012-01-30 10:03:21 -08:00
Scott Main
b1560f2085 docs: add G+ page announcement to homepage 
Change-Id: I400334fc1465b67ec34af2071a6cca5b6eda116f
 2012-01-30 09:59:42 -08:00
Siva Velusamy
67590f0d48 am b0931673: Merge "gltrace: Use Unix Domain Socket rather than INET Socket" 
* commit 'b09316736fe7b721d92900ad901894fd5ce2b854':
  gltrace: Use Unix Domain Socket rather than INET Socket
 2012-01-30 09:09:33 -08:00
Siva Velusamy
b09316736f Merge "gltrace: Use Unix Domain Socket rather than INET Socket" 2012-01-30 09:08:27 -08:00