Kenny Root
6af08a47d0
Merge "Don't pay attention to string block on @null" into honeycomb
2011-01-20 13:27:35 -08:00
Adam Powell
1264c33163
Fix bug 3362375 - API REVIEW: remove unused public 'up' id
...
Fix bug 3362453 - API REVIEW: android.app.ActionBar
Change-Id: I4e0233cd9355a47682bfe7b4a7fda39801586f1a
2011-01-20 13:25:08 -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
Shih-wei Liao
040d7d8ce7
Handle fatal errors from calling bccRegisterSymbolCallback (if any).
...
Change-Id: I53f35b6efd26abc1e8559f6f1e37abb55a1df7db
2011-01-20 12:35:44 -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
Eric Laurent
404946fc26
Merge "Fix issue 3371096." into honeycomb
2011-01-20 10:31:21 -08:00
Svetoslav Ganov
2cf5f5a103
am 655f6e10: am 19484fac: Merge "Some touches on the NumberPicker UI." into honeycomb
...
* commit '655f6e1026f1d6a4db9a4453ee25897fdd5a4006':
Some touches on the NumberPicker UI.
2011-01-20 10:12:37 -08:00
Svetoslav Ganov
655f6e1026
am 19484fac: Merge "Some touches on the NumberPicker UI." into honeycomb
...
* commit '19484fac336ce1606a9f0b464d6bfc33ae0523e7':
Some touches on the NumberPicker UI.
2011-01-20 10:10:20 -08:00
Svetoslav Ganov
19484fac33
Merge "Some touches on the NumberPicker UI." into honeycomb
2011-01-20 10:08:39 -08:00
Gilles Debunne
353b4f10a6
am a04cfb9a: am 6b20dc43: Merge "Error popup no longer flickers in TextViews." into honeycomb
...
* commit 'a04cfb9a023448f872691e773a08c0ff811ce20c':
Error popup no longer flickers in TextViews.
2011-01-20 09:57:16 -08:00
Gilles Debunne
a04cfb9a02
am 6b20dc43: Merge "Error popup no longer flickers in TextViews." into honeycomb
...
* commit '6b20dc43a0b835254840746f1027945b5414654b':
Error popup no longer flickers in TextViews.
2011-01-20 09:55:32 -08:00
Gilles Debunne
6b20dc43a0
Merge "Error popup no longer flickers in TextViews." into honeycomb
2011-01-20 09:53:18 -08:00
Irfan Sheriff
4624d669e4
Merge "Add untether call during softap shutdown"
2011-01-20 09:47:15 -08:00
Daniel Sandler
14db0bc047
Animate transitions between notification & settings panels.
...
We're still not stretching the panel smoothly yet; this just
fades the panels in and out at the right times.
Bug: 3323063
Change-Id: I6eb87c44726f48f39fab77710b1ffe5d0783d588
2011-01-20 12:44:11 -05:00
James Dong
7b56c2b8ff
am 3230f1a9: am 637739d4: Merge "Eliminate recording sound by starting the video track before audio track." into honeycomb
...
* commit '3230f1a97db64e2d4ac3a0c691955f1a259d425a':
Eliminate recording sound by starting the video track before audio track.
2011-01-20 09:30:44 -08:00
James Dong
3230f1a97d
am 637739d4: Merge "Eliminate recording sound by starting the video track before audio track." into honeycomb
...
* commit '637739d4bf014e82af19ec4465e6031579ca6eea':
Eliminate recording sound by starting the video track before audio track.
2011-01-20 09:28:55 -08:00
James Dong
637739d4bf
Merge "Eliminate recording sound by starting the video track before audio track." into honeycomb
2011-01-20 09:27:01 -08:00
Huahui Wu
bc7c148285
b/3350774 Enforce clearing the flag mIsHandlingMultiTouch.
...
b/3350774 was fixed by https://android-git.corp.google.com/g/#change,91337
But there is small chance that the flag mIsHandlingMultiTouch is not cleared
correctly. This CL enforces to clear the flag.
Change-Id: I79ba6b401a7d7b3c772d3f123912343491551507
2011-01-20 09:23:09 -08:00
Iain Merrick
5f1216cb98
am bf98190b: am 8192b417: Merge "Add BrowserFrame.setCertificate() method." into honeycomb
...
* commit 'bf98190b4b49644fe3d2be688e33bebb59b3d3c9':
Add BrowserFrame.setCertificate() method.
2011-01-20 08:21:30 -08:00
Iain Merrick
bf98190b4b
am 8192b417: Merge "Add BrowserFrame.setCertificate() method." into honeycomb
...
* commit '8192b4179fd96629383c15f19f38edb22b674e99':
Add BrowserFrame.setCertificate() method.
2011-01-20 08:19:37 -08:00