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

41629 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Daniel Sandler
e9caa93c41 am 25e59dae: am a7cb63a1: Merge "Remove inappropriate triangle icons from quick settings panel." into honeycomb 
* commit '25e59dae36b3b16733439bcbec64f655885039ed':
  Remove inappropriate triangle icons from quick settings panel.
 2011-01-20 17:25:45 -08:00
Kenny Root
d002c44eab am cb95ebce: am 6af08a47: Merge "Don\'t pay attention to string block on @null" into honeycomb 
* commit 'cb95ebcecfaccbfdeb1ab34559869c95792596ac':
  Don't pay attention to string block on @null
 2011-01-20 17:25:39 -08:00
Trevor Johns
a736c401c4 am fa7469ca: am 2ca4d8b7: Merge "Fixing bugs in HelloWebView tutorial on developer.android.com." into honeycomb 
* commit 'fa7469cae8511bb2dc0e40dcb548f1b5957be52c':
  Fixing bugs in HelloWebView tutorial on developer.android.com.
 2011-01-20 17:25:33 -08:00
Joe Onorato
909ac9edc4 am 2d821b8c: am 913d04aa: Merge "Don\'t log the full stack trace when we can\'t load a resource." into honeycomb 
* commit '2d821b8cb8a3c11f2cde662d48890e81430b7f8d':
  Don't log the full stack trace when we can't load a resource.
 2011-01-20 17:25:25 -08:00
Mathias Agopian
b315616495 am 6f1ee600: am 35e4a497: Merge "fix [3369743] SurfaceFlinger reads hardware composer hints before calling hwc.prepare()" into honeycomb 
* commit '6f1ee60033ba49365777776b05ef18d6d2e9cc50':
  fix [3369743] SurfaceFlinger reads hardware composer hints before calling hwc.prepare()
 2011-01-20 17:25:20 -08:00
Mathias Agopian
ea870e0af4 am 612d7f3c: am a423d868: Merge "clean-up unneeded code" into honeycomb 
* commit '612d7f3c092ec2c4a2ae44cb09d6dfb4e525a659':
  clean-up unneeded code
 2011-01-20 17:25:14 -08:00
Stephen Hines
35d5fb744d am ec5179ac: am 2e0f0bb3: Merge "Remove unnecessary library functions." into honeycomb 
* commit 'ec5179aceca4b92ea4136f0c337ba6cb909c56c7':
  Remove unnecessary library functions.
 2011-01-20 17:25:07 -08:00
Wink Saville
6f26efa6a0 am ae4fe1f7: (-s ours) am 18fcb8d8: Merge "Add two more parameters too RIL_REQUEST_SETUP_DATA_CALL, DO NOT MERGE" into honeycomb 
* commit 'ae4fe1f7ab670409b5277967dea67ce8e81c9c41':
  Add two more parameters too RIL_REQUEST_SETUP_DATA_CALL, DO NOT MERGE
 2011-01-20 17:25:01 -08:00
Daniel Sandler
25e59dae36 am a7cb63a1: Merge "Remove inappropriate triangle icons from quick settings panel." into honeycomb 
* commit 'a7cb63a15319c5a4b59f67e66c93b5b9616475d4':
  Remove inappropriate triangle icons from quick settings panel.
 2011-01-20 17:05:28 -08:00
Kenny Root
cb95ebcecf am 6af08a47: Merge "Don\'t pay attention to string block on @null" into honeycomb 
* commit '6af08a47d02ef75e18d226b93a0b553396cb6842':
  Don't pay attention to string block on @null
 2011-01-20 17:05:18 -08:00
Trevor Johns
fa7469cae8 am 2ca4d8b7: Merge "Fixing bugs in HelloWebView tutorial on developer.android.com." into honeycomb 
* commit '2ca4d8b7b97f20c8ad6897fc8c0c95616c0e80c6':
  Fixing bugs in HelloWebView tutorial on developer.android.com.
 2011-01-20 17:04:40 -08:00
Joe Onorato
2d821b8cb8 am 913d04aa: Merge "Don\'t log the full stack trace when we can\'t load a resource." into honeycomb 
* commit '913d04aa3b187beffd7691acb1e61a8b09810bbe':
  Don't log the full stack trace when we can't load a resource.
 2011-01-20 17:04:13 -08:00
Mathias Agopian
6f1ee60033 am 35e4a497: Merge "fix [3369743] SurfaceFlinger reads hardware composer hints before calling hwc.prepare()" into honeycomb 
* commit '35e4a497f4463adb78d35a57f22847bec0eaab1a':
  fix [3369743] SurfaceFlinger reads hardware composer hints before calling hwc.prepare()
 2011-01-20 17:03:55 -08:00
Mathias Agopian
612d7f3c09 am a423d868: Merge "clean-up unneeded code" into honeycomb 
* commit 'a423d868009b9961597365ce7f190aef23f4b1cc':
  clean-up unneeded code
 2011-01-20 17:03:46 -08:00
Stephen Hines
ec5179acec am 2e0f0bb3: Merge "Remove unnecessary library functions." into honeycomb 
* commit '2e0f0bb3fe63c51fa3154f8ed17bfaf611edbf5d':
  Remove unnecessary library functions.
 2011-01-20 17:03:39 -08:00
Wink Saville
ae4fe1f7ab am 18fcb8d8: Merge "Add two more parameters too RIL_REQUEST_SETUP_DATA_CALL, DO NOT MERGE" into honeycomb 
* commit '18fcb8d84abf529aad7e5b2ff5f1a9b6d7e0cbe8':
  Add two more parameters too RIL_REQUEST_SETUP_DATA_CALL, DO NOT MERGE
 2011-01-20 17:03:13 -08:00
Daniel Sandler
a7cb63a153 Merge "Remove inappropriate triangle icons from quick settings panel." into honeycomb 2011-01-20 13:31:53 -08:00
Kenny Root
6af08a47d0 Merge "Don't pay attention to string block on @null" into honeycomb 2011-01-20 13:27:35 -08:00
Trevor Johns
2ca4d8b7b9 Merge "Fixing bugs in HelloWebView tutorial on developer.android.com." into honeycomb 2011-01-20 13:19:25 -08:00
Kenny Root
7fbe4d2e74 Don't pay attention to string block on @null 
When someone referenced an empty string by putting in the special value
"@null" the string block was kept, but when filtering themes this wasn't
filtered because the framework thought it was actually a null string.

Bug: 3000940
Change-Id: I1e9a0479ef761b3e388b562ae728c5da0f4b5deb
 2011-01-20 13:18:03 -08:00
Trevor Johns
b99d136f25 Fixing bugs in HelloWebView tutorial on developer.android.com. 
- Top-level LinearLayout needs to fill_parent, rather than wrap_content,
  otherwise the child WebView has 0 width
- setWebViewClient() needs to construct a new HelloWebViewClient, not
  WebViewClientDemo (which doens't exist).

Change-Id: Ie8b14e0cbf2b498573e965ccfc27b858dedabfa0
 2011-01-20 13:04:17 -08:00
Joe Onorato
913d04aa3b Merge "Don't log the full stack trace when we can't load a resource." into honeycomb 2011-01-20 12:33:34 -08:00
Mathias Agopian
35e4a497f4 Merge "fix [3369743] SurfaceFlinger reads hardware composer hints before calling hwc.prepare()" into honeycomb 2011-01-20 12:25:33 -08:00
Mathias Agopian
a423d86800 Merge "clean-up unneeded code" into honeycomb 2011-01-20 12:25:26 -08:00
Daniel Sandler
f175155dfb Remove inappropriate triangle icons from quick settings panel. 
Bug: 3316041
Change-Id: I877a587ecd6a6a8a0b00322bdcd46e3f4235a887
 2011-01-20 15:24:45 -05:00
Stephen Hines
2e0f0bb3fe Merge "Remove unnecessary library functions." into honeycomb 2011-01-20 12:23:32 -08:00
Wink Saville
18fcb8d84a Merge "Add two more parameters too RIL_REQUEST_SETUP_DATA_CALL, DO NOT MERGE" into honeycomb 2011-01-20 12:20:59 -08:00
Mathias Agopian
1d4549ab03 clean-up unneeded code 
now that we removed the notion of a "inUse" buffer in surfaceflinger
a lot of code can be simplified / removed.

noteworthy, the whole concept of "unlockClient" wrt. "compositionComplete"
is also gone.

Change-Id: I210413d4c8c0998dae05c8620ebfc895d3e6233d
 2011-01-20 12:10:11 -08:00
Daniel Sandler
62340c7e82 am 6bc9eca3: am 04fba96b: Merge "Animate transitions between notification & settings panels." into honeycomb 
* commit '6bc9eca3fa5b268c5273c1b527176dc87d9fb216':
  Animate transitions between notification & settings panels.
 2011-01-20 12:06:59 -08:00
Daniel Sandler
6bc9eca3fa am 04fba96b: Merge "Animate transitions between notification & settings panels." into honeycomb 
* commit '04fba96bb7e3fdac2fe3b396ff5cc6560c13ecb5':
  Animate transitions between notification & settings panels.
 2011-01-20 12:02:48 -08:00
Daniel Sandler
04fba96bb7 Merge "Animate transitions between notification & settings panels." into honeycomb 2011-01-20 12:01:05 -08:00
Stephen Hines
a16a981453 Remove unnecessary library functions. 
Change-Id: I47fadb2b9e8b9e9ef5f139470366ce43c75fadbb
 2011-01-20 11:59:07 -08:00
Joe Onorato
08f1654417 Don't log the full stack trace when we can't load a resource. 
Bug: 3369315
Change-Id: I3a586bbefccbd59a0e99d712efe9a1cd3da6d058
 2011-01-20 11:50:12 -08:00
Romain Guy
571f76a24e am cff27e52: am c8219299: Merge "Remove unnecessary code." into honeycomb 
* commit 'cff27e523d68f72012bd908bac1a78cbb5b0a7e9':
  Remove unnecessary code.
 2011-01-20 11:41:18 -08:00
Romain Guy
cff27e523d am c8219299: Merge "Remove unnecessary code." into honeycomb 
* commit 'c8219299b0003793cee8049b96a3bf7530765eea':
  Remove unnecessary code.
 2011-01-20 11:39:18 -08:00
Romain Guy
c8219299b0 Merge "Remove unnecessary code." into honeycomb 2011-01-20 11:37:22 -08:00
Romain Guy
ff26a0c1c9 Remove unnecessary code. 
Change-Id: I83eba3406c26a4028af08b4d4c95ecd02803e75a
 2011-01-20 11:39:09 -08:00
Huahui Wu
3aae603e39 am baa647e3: am 292f39c1: Merge "b/3350774 Enforce clearing the flag mIsHandlingMultiTouch." into honeycomb 
* commit 'baa647e325a3ba1acaa463b8c3553de6547ff4f5':
  b/3350774 Enforce clearing the flag mIsHandlingMultiTouch.
 2011-01-20 11:16:31 -08:00
Huahui Wu
baa647e325 am 292f39c1: Merge "b/3350774 Enforce clearing the flag mIsHandlingMultiTouch." into honeycomb 
* commit '292f39c1201f2f08ac90d5562a7fd7070e9b32a0':
  b/3350774 Enforce clearing the flag mIsHandlingMultiTouch.
 2011-01-20 11:13:36 -08:00
Huahui Wu
292f39c120 Merge "b/3350774 Enforce clearing the flag mIsHandlingMultiTouch." into honeycomb 2011-01-20 11:08:33 -08:00
Svetoslav Ganov
f27e6d5d78 am f008667e: am 1ec1fdfc: Merge "API REVIEW: android.widget.NumberPicker.OnValueChangedListener" into honeycomb 
* commit 'f008667e6d6dc62f36b46c35ebe41b7592b3931c':
  API REVIEW: android.widget.NumberPicker.OnValueChangedListener
 2011-01-20 11:06:40 -08:00
Svetoslav Ganov
f008667e6d am 1ec1fdfc: Merge "API REVIEW: android.widget.NumberPicker.OnValueChangedListener" into honeycomb 
* commit '1ec1fdfce959069f3092c15d27efc1c2286dc15c':
  API REVIEW: android.widget.NumberPicker.OnValueChangedListener
 2011-01-20 11:04:27 -08:00
Romain Guy
e23cae2335 am 1eaac21e: am 68c56a51: Merge "Documentation fix." into honeycomb 
* commit '1eaac21e6f4056fd582a7e58fb9a553f37f7820a':
  Documentation fix.
 2011-01-20 11:02:25 -08:00
Svetoslav Ganov
1ec1fdfce9 Merge "API REVIEW: android.widget.NumberPicker.OnValueChangedListener" into honeycomb 2011-01-20 11:02:14 -08:00
Romain Guy
1eaac21e6f am 68c56a51: Merge "Documentation fix." into honeycomb 
* commit '68c56a51b32b5f5322c4f0f7dbba918712ad6473':
  Documentation fix.
 2011-01-20 11:00:19 -08:00
Romain Guy
482b34a6f8 Documentation fix. 
Activity's documentation wasn't clear on what would happen when
calling setContentView(View).

Change-Id: I37be6565ba897694460c80a39562346293faa8ea
 2011-01-20 10:59:28 -08:00
Romain Guy
68c56a51b3 Merge "Documentation fix." into honeycomb 2011-01-20 10:57:59 -08:00
Svetoslav Ganov
cedc446684 API REVIEW: android.widget.NumberPicker.OnValueChangedListener 
Change-Id: I1e739553ab6b99b2768e42cf379a0b155dced81a
 2011-01-20 10:41:14 -08:00
Eric Laurent
b37b90e4c5 am 4dcaeb6d: am 404946fc: Merge "Fix issue 3371096." into honeycomb 
* commit '4dcaeb6d776bc87469a97001a223099c8e805579':
  Fix issue 3371096.
 2011-01-20 10:35:29 -08:00
Eric Laurent
4dcaeb6d77 am 404946fc: Merge "Fix issue 3371096." into honeycomb 
* commit '404946fc260e5dff23c8a0db12e33ff842ab4b47':
  Fix issue 3371096.
 2011-01-20 10:33:29 -08:00