OSDN Git Service
Roman Nurik [Sat, 8 Oct 2011 23:23:16 +0000 (16:23 -0700)]
Merge "Update Icon Guidelines and Icon Templates Pack for ICS"
Costin Manolache [Sat, 8 Oct 2011 00:54:05 +0000 (17:54 -0700)]
Merge "b/
5399355 StringIndexOutOfBoundsException from AccountManagerService"
Mathias Agopian [Fri, 7 Oct 2011 22:38:50 +0000 (15:38 -0700)]
Merge "don't log EGL errors due to unimplemented proprietary extensions"
Roman Nurik [Wed, 28 Sep 2011 20:01:20 +0000 (13:01 -0700)]
Update Icon Guidelines and Icon Templates Pack for ICS
Change-Id: I2e0f132e636a288d21989095bac0da443e128d04
Dianne Hackborn [Fri, 7 Oct 2011 22:12:17 +0000 (15:12 -0700)]
Merge "Fix how we hide and show the nav bar."
Jeff Brown [Fri, 7 Oct 2011 22:08:24 +0000 (15:08 -0700)]
Merge changes Idbfeb3cc,I03e8e2e7,Iff9eed78
* changes:
Fix regression in CursorWindow.getString() Bug:
5332296
Clean up CursorWindow lifetime. Bug:
5332296
Fix regression in CursorWindow.copyStingToBuffer. Bug:
5332296
Jeff Brown [Fri, 7 Oct 2011 22:07:56 +0000 (15:07 -0700)]
Merge "Restore broken CursorWindow.getType behavior. Bug:
5430009"
Michael Kolb [Fri, 7 Oct 2011 22:07:29 +0000 (15:07 -0700)]
Merge "Handle audio focus in HTML5 audio"
Romain Guy [Fri, 7 Oct 2011 22:04:15 +0000 (15:04 -0700)]
Merge "Stupid fixed point math. Bug #
5423215"
Romain Guy [Fri, 7 Oct 2011 22:03:24 +0000 (15:03 -0700)]
Stupid fixed point math.
Bug #
5423215
Change-Id: I39379e1f8fb4d59de4ede6e4fe7cf7a2c7cc625a
Steven Ross [Fri, 7 Oct 2011 21:36:25 +0000 (14:36 -0700)]
Merge "Fixing alarm clock bug"
Dianne Hackborn [Fri, 7 Oct 2011 05:35:11 +0000 (22:35 -0700)]
Fix how we hide and show the nav bar.
The PhoneWindowManager is now responsible for hiding and showing
the nav bar.
For hiding, it just moves it off the screen (easy way to get a
nice slide animation on and off). At the same time, we use a
new WM facility to put up a fake input window to capture all
touch events.
When a touch event is received, we force the system UI to clear
the navigation hiding bit so it will be shown again.
This removes a bunch of code from the system UI for hiding and
showing the nav bar. Also removes the code calling from userActivity()
to the system UI, which was bad. (Also no longer using userActivity()
fixes bugs around re-showing the nav bar due to key presses and
other wrong things.)
Change-Id: I8c3174873b5bcaa36a92322a51e8f7993e88e551
Michael Kolb [Thu, 6 Oct 2011 23:20:17 +0000 (16:20 -0700)]
Handle audio focus in HTML5 audio
Bug:
5416191
Video will follow later
Change-Id: I51da05aa0e3c8c0f33151df84d84a65cb7003080
Jeff Brown [Fri, 7 Oct 2011 21:17:09 +0000 (14:17 -0700)]
Fix regression in CursorWindow.getString()
Bug:
5332296
NewStringUTF expects modified UTF-8, so it barfs on UTF-8 strings
that contain high codepoints. Even though it results in an extra
copy being performed, first convert to UTF-16, then call NewString.
Change-Id: Idbfeb3cc2c4b731834e4482848dcac2fa33ec2d0
Christopher Tate [Fri, 7 Oct 2011 20:36:09 +0000 (13:36 -0700)]
Merge "Fix wallpaper restore"
Jeff Brown [Fri, 7 Oct 2011 20:29:37 +0000 (13:29 -0700)]
Clean up CursorWindow lifetime.
Bug:
5332296
Removed dead code in SQLiteCursor related to the use of a background
query thread. This code could result in CursorWindows being modified
concurrently or used after free. This code is broken, unused and
is just in the way.
Added comments to explain how CursorWindow ownership is
supposed to work for AbstractWindowedCursors. (There are still cases
where cursor windows get dropped on the floor without being closed.
Those will be taken care of in a subsequent patch.)
Cleaned up SQLiteQuery.fillWindow to eliminate duplicate code and
remove bits that were only needed for background loading, like
returning -1.
Change-Id: I03e8e2e73ff0c11df76d63f57df4c5ada06ae1cb
Jeff Brown [Fri, 7 Oct 2011 20:28:18 +0000 (13:28 -0700)]
Fix regression in CursorWindow.copyStingToBuffer.
Bug:
5332296
Change-Id: Iff9eed786f0a8293b6156f883a66a322ddad5e99
Jeff Brown [Fri, 7 Oct 2011 20:15:59 +0000 (13:15 -0700)]
Restore broken CursorWindow.getType behavior.
Bug:
5430009
Some CTS tests try to call getType on fields in empty
cursor windows or with out of bound column indices (-1).
Restoring the previous behavior of returning FIELD_TYPE_NULL
instead of throwing. Fix this later.
Change-Id: I782bd02012474e7dabc5bb7ea2dc45e8b0c7ef25
Steven Ross [Fri, 7 Oct 2011 17:35:21 +0000 (13:35 -0400)]
Fixing alarm clock bug
The alarm clock doesn't actually hide the view until AFTER Facelock starts
hence the need to kill Facelock after it has started when the even is caught
Also fixing phone black box background in case the user cancels the call quickly
Also eliminating blackscreen after 4s for multiple reasons
so people can login if lockscreen locks up
also so cancel fade is to the backup lock
Change-Id: I8162ff67453038559f289408f4f0d452d4f79ab3
John Reck [Fri, 7 Oct 2011 20:10:55 +0000 (13:10 -0700)]
Merge "Fix calc visible to account for action bar"
Matthew Xie [Fri, 7 Oct 2011 19:57:08 +0000 (12:57 -0700)]
Merge "Turn off debug messge"
Christopher Tate [Fri, 7 Oct 2011 19:37:42 +0000 (12:37 -0700)]
Fix wallpaper restore
Following a restore of the wallpaper data files, the settingsRestored()
method was binding the new wallpaper by passing null as the component,
because once upon a time that meant just use the configuration that had
just been loaded from the [newly restored] settings filed. However, at
some point this broke when the load from settings was made a staging
operation, not also the commitment of the changes.
This CL passes the newly-determined component configuration explicitly
to the bind, overriding the product default that may already have been
emplaced by the time the restore happens.
It also turns off the (minor) debugging that had been enabled in
WallpaperBackupHelper while digging into the issue.
Bug
5416839
Change-Id: I963893c236e24c75d10dde75836805295ea42cbb
Fabrice Di Meglio [Fri, 7 Oct 2011 19:30:58 +0000 (12:30 -0700)]
Merge "Fix bug #
5371117 Regression : The Hebrew / Arabic text behavior in ICS latest build is wrong"
Jason Sams [Fri, 7 Oct 2011 18:58:15 +0000 (11:58 -0700)]
Merge "Simplify the way we get the version info. Reduces startup overhead."
Fabrice Di Meglio [Thu, 6 Oct 2011 01:11:59 +0000 (18:11 -0700)]
Fix bug #
5371117 Regression : The Hebrew / Arabic text behavior in ICS latest build is wrong
- welcome back start / count
- goodbye log clusters
- clean Paint code
- make private some functions as they should be
- improve memory allocation (create only one Shaper and reuse it for for shaping the runs in
the same input text)
Change-Id: I89a320c7f041319851308c8c9a919fbeafa82cdd
Adam Powell [Fri, 7 Oct 2011 18:16:51 +0000 (11:16 -0700)]
Merge "Fix bug
5399568 - ListView check states inconsistent after data set change"
Matthew Xie [Fri, 7 Oct 2011 18:15:03 +0000 (11:15 -0700)]
Turn off debug messge
Bug
5425619
Change-Id: I7accb88a40604c5b8a8f2323e751a7f8f3cb9da8
Andreas Huber [Fri, 7 Oct 2011 17:08:48 +0000 (10:08 -0700)]
Merge "Specifying -1 for both low and highwater marks would not actually do the right thing"
Andreas Huber [Fri, 7 Oct 2011 17:00:38 +0000 (10:00 -0700)]
Specifying -1 for both low and highwater marks would not actually do the right thing
before this change. Also make it more consistent in that specifying -1 for the
keepalive settings specifies the default.
Change-Id: I086f530fbf42abce66d1c8e61157215cb474e044
Iliyan Malchev [Fri, 7 Oct 2011 16:57:26 +0000 (09:57 -0700)]
Merge "Add initialize method to CameraHardwareInterface"
Steve Block [Fri, 7 Oct 2011 16:53:43 +0000 (09:53 -0700)]
Merge "Add WebViewClient.onProceededAfterSslError()"
Costin Manolache [Fri, 7 Oct 2011 16:42:49 +0000 (09:42 -0700)]
b/
5399355 StringIndexOutOfBoundsException from AccountManagerService
Change-Id: I13426a8b57d6fcbc7a43ffd61922439b0fae332c
Tyler Luu [Thu, 6 Oct 2011 05:00:03 +0000 (00:00 -0500)]
Add initialize method to CameraHardwareInterface
Add intialize() method to CameraHardwareInterface so we can
return a proper error value to CameraService if open of camera
hardware module fails.
b/
5405235
Change-Id: I09c627034ddd22a5753c5163392c4fcff301e0b9
Signed-off-by: Tyler Luu <tluu@ti.com>
Signed-off-by: Iliyan Malchev <malchev@google.com>
Andreas Huber [Fri, 7 Oct 2011 14:59:35 +0000 (07:59 -0700)]
Merge "Allow a system property "media.stagefright.cache-params" to override cache/prefetcher"
Steve Block [Tue, 4 Oct 2011 18:09:13 +0000 (19:09 +0100)]
Add WebViewClient.onProceededAfterSslError()
This is used to notify the host application that an SSL error occurred while
loading a resource, but the WebView but chose to proceed anyway based on a
decision retained from a previous response to onReceivedSslError().
Bug:
5403366
Change-Id: I51a25b93d7824b7eb7b6d5a961cba948e37c85db
The Android Open Source Project [Fri, 7 Oct 2011 12:35:36 +0000 (05:35 -0700)]
Reconcile with ics-factoryrom-release
Change-Id: I432900d452f3f8869f42a0ff4ae0d34e1c34dc46
Chih-Chung Chang [Fri, 7 Oct 2011 10:20:26 +0000 (03:20 -0700)]
Merge "Allow shutter/recording sound to be adjusted unless it's forced."
Wu-cheng Li [Fri, 7 Oct 2011 10:08:23 +0000 (03:08 -0700)]
Merge "Allow Camera.setDisplayOrientation to be called when preview is active."
Wu-cheng Li [Fri, 7 Oct 2011 05:13:54 +0000 (13:13 +0800)]
Allow Camera.setDisplayOrientation to be called when preview is active.
bug:
5422679
Change-Id: I4c936ab00428fc158b5947fe8f10b1028869bbdb
Scott Main [Fri, 7 Oct 2011 05:57:25 +0000 (22:57 -0700)]
docs: Add api overview for ICS
Change-Id: Ia280d94e06762e0f2b524cbd262568c50e48a601
Dirk Dougherty [Fri, 7 Oct 2011 06:24:55 +0000 (23:24 -0700)]
Doc change: revise API diffs.
Change-Id: I28d1aeb6e785a22b610dc0984210dd921ce42ffa
Scott Main [Fri, 7 Oct 2011 05:58:33 +0000 (22:58 -0700)]
Revert "Doc change: add diffs for API level 14." due to api change
This reverts commit
d94931ab251da2f2bed00d4c2d0aa087920e3de2.
Chih-Chung Chang [Fri, 7 Oct 2011 05:37:42 +0000 (13:37 +0800)]
Allow shutter/recording sound to be adjusted unless it's forced.
Change-Id: I7080d5f50a87f92c8e9395d4cf8f927a6760fa70
The Android Automerger [Fri, 7 Oct 2011 03:52:50 +0000 (20:52 -0700)]
merge in ics-factoryrom-release history after reset to ics-factoryrom
James Dong [Fri, 7 Oct 2011 03:38:29 +0000 (20:38 -0700)]
Merge "Fix an issue where we should allow negative values but did not"
John Reck [Fri, 7 Oct 2011 03:37:01 +0000 (20:37 -0700)]
Fix calc visible to account for action bar
Bug:
5425892
Change-Id: I15bc1779013dbb33511d9c5bff9b678115dec102
Christopher Tate [Fri, 7 Oct 2011 03:00:25 +0000 (20:00 -0700)]
am
a0c39e28: (-s ours) DO NOT MERGE: fix wallpaper restore
* commit '
a0c39e28e56d642168ad18dccb86f5787b4e1592':
DO NOT MERGE: fix wallpaper restore
Adam Powell [Fri, 7 Oct 2011 02:46:18 +0000 (19:46 -0700)]
Fix bug
5399568 - ListView check states inconsistent after data set change
ListView tracks check states in two ways, by position and by ID if an
adapter reports stable IDs. After a data set change there was no
guarantee that the position checked mapping was consistent.
Fix up the position mapping from the ID mapping after a data set
change. In the future this should happen by asking the adapter where a
given ID is now located, but this will require new API and not all
adapters in the wild will implement it. For now make a best guess by
searching in a limited window around the item's last known position.
Change-Id: I70ba89eb103c438b0410c3c6d066acc3918459f9
Scott Main [Fri, 7 Oct 2011 01:41:48 +0000 (18:41 -0700)]
Merge "docs: deprecate thingy"
Scott Main [Fri, 7 Oct 2011 01:32:43 +0000 (18:32 -0700)]
docs: deprecate thingy
Change-Id: I579824680f3b5110d56981becaaf81f917989e7e
Nicolas Roard [Fri, 7 Oct 2011 01:29:20 +0000 (18:29 -0700)]
Merge "Trigger a full screen repaint when touching layers, as webkitDraw() may not generate the correct invalidations."
Ying Wang [Fri, 7 Oct 2011 01:25:22 +0000 (18:25 -0700)]
Merge "Make symlinks for DroidSans.ttf and DroidSans-Bold.ttf"
Anirudh Dewani [Fri, 7 Oct 2011 00:57:55 +0000 (17:57 -0700)]
Merge "Docs changes for WiFiDirect sample"
Jason Sams [Fri, 7 Oct 2011 00:54:45 +0000 (17:54 -0700)]
Simplify the way we get the version info.
Reduces startup overhead.
Change-Id: Id9556dfe553c23bf3f870a524ca5e687bb9fe777
Svetoslav Ganov [Fri, 7 Oct 2011 00:28:51 +0000 (17:28 -0700)]
Merge "Accessibility test automation API not working."
Christopher Tate [Fri, 7 Oct 2011 00:24:54 +0000 (17:24 -0700)]
DO NOT MERGE: fix wallpaper restore
Following a restore of the wallpaper data files, the settingsRestored()
method was binding the new wallpaper by passing null as the component,
because once upon a time that meant just use the configuration that had
just been loaded from the [newly restored] settings filed. However, at
some point this broke when the load from settings was made a staging
operation, not also the commitment of the changes.
This CL passes the newly-determined component configuration explicitly
to the bind, overriding the product default that may already have been
emplaced by the time the restore happens.
Will not merge cleanly downstream; the parallel (small) change will
be made explicitly there.
Bug
5416839
Change-Id: I50b5d57fafd176529ac7a90cac8116bbc9f696fd
Philip Milne [Fri, 7 Oct 2011 00:21:08 +0000 (17:21 -0700)]
Merge "Move Activity1 and Activity2 to API Demos area in development/samples."
Nicolas Roard [Fri, 7 Oct 2011 00:12:40 +0000 (17:12 -0700)]
Trigger a full screen repaint when touching layers, as webkitDraw()
may not generate the correct invalidations.
counterpart java CL: https://android-git.corp.google.com/g/#/c/140427/
bug:
5425608 bug:
5218173
Change-Id: I4a958a6fac4054a1040cb077cdfa2aff076e3fad
Justin Ho [Thu, 6 Oct 2011 23:28:57 +0000 (16:28 -0700)]
Merge "Reference download asset through intermediate."
Jeff Brown [Thu, 6 Oct 2011 23:28:15 +0000 (16:28 -0700)]
Merge "Clean up CursorWindow code. Bug:
5332296"
Philip Milne [Thu, 6 Oct 2011 23:11:35 +0000 (16:11 -0700)]
Move Activity1 and Activity2 to API Demos area in development/samples.
Change-Id: Ib6521caca69b0a0d96c66d9df754d2af17cb6908
Ying Wang [Thu, 6 Oct 2011 18:14:13 +0000 (11:14 -0700)]
Make symlinks for DroidSans.ttf and DroidSans-Bold.ttf
Bug:
5420351
Make the following symlinks:
/system/fonts/DroidSans.ttf -> Roboto-Regular.ttf
/system/fonts/DroidSans-Bold.ttf -> Roboto-Bold.ttf
Change-Id: If9a74ef4ac2386cdb46d125fed8ce5771e872310
Justin Ho [Thu, 6 Oct 2011 22:57:38 +0000 (15:57 -0700)]
am
65162b1e: Merge "Adding 3 additional notification sounds Bug:
5416299" into ics-factoryrom
* commit '
65162b1ee430cb8050109327a7fd958fa72d64ac':
Adding 3 additional notification sounds Bug:
5416299
Justin Ho [Thu, 6 Oct 2011 22:51:43 +0000 (15:51 -0700)]
Merge "Adding 3 additional notification sounds Bug:
5416299" into ics-factoryrom
Chia-chi Yeh [Thu, 6 Oct 2011 22:29:50 +0000 (15:29 -0700)]
Merge "VPN: temporarily disable the default proxy when VPN is active."
Chia-chi Yeh [Thu, 6 Oct 2011 22:29:43 +0000 (15:29 -0700)]
Merge "ConnectivityService: detach the logic of global proxy."
Andreas Huber [Wed, 5 Oct 2011 21:32:17 +0000 (14:32 -0700)]
Allow a system property "media.stagefright.cache-params" to override cache/prefetcher
default parameters. To override specify a property
adb shell setprop media.stagefright.cache-params "4096/20480/15" to
set the low water threshold to 4096 KB, the high water threshold to 20 MB
and the keepalive interval to 15 secs.
if high and/or lowwater mark are negative, the default values are used for
the respective value.
if keep-alive interval is 0, keep-alives are disabled.
Change-Id: I89a4a06836e4a2f473d7a92b567ab07818c2f87d
Justin Ho [Thu, 6 Oct 2011 22:23:23 +0000 (15:23 -0700)]
Adding 3 additional notification sounds
Bug:
5416299
Change-Id: I69c6ddd1c4202f640ce14a2a7e4a233e1d93e53d
Dianne Hackborn [Thu, 6 Oct 2011 22:15:32 +0000 (15:15 -0700)]
Merge "Fix issue #
5371530: SYSTEMUI_FLAG_HIDE_NAVIGATION reasserts itself immediately"
Svetoslav Ganov [Thu, 6 Oct 2011 22:13:06 +0000 (15:13 -0700)]
Merge "Fixing errors in position information of scrollable views reported for accessibility."
Dianne Hackborn [Thu, 6 Oct 2011 18:51:27 +0000 (11:51 -0700)]
Fix issue #
5371530: SYSTEMUI_FLAG_HIDE_NAVIGATION reasserts itself immediately
This cleans up how ui flags are managed between the client and window manager.
It still reports the global UI mode state to the callback, but we now only clear
certain flags when the system goes out of a state (currently this just means the
hide nav bar mode), and don't corrupt other flags in the application when the
global state changes.
Also introduces a sequence number between the app and window manager, to avoid
using bad old data coming from the app during these transitions.
Change-Id: I40bbd12d9b7b69fc0ff1c7dc0cb58a933d4dfb23
Svetoslav Ganov [Thu, 6 Oct 2011 05:26:05 +0000 (22:26 -0700)]
Fixing errors in position information of scrollable views reported for accessibility.
1. ScrollView/HorizontalScroll view were reporting only the scroll X and Y but
failed to convey the max scroll along X and Y so the position can be determined.
2. WebView was not reporting correctly its scroll position for accessibility.
3. Some descendants of AdapterView were reporting incorrect position information.
4. Updated the accessibility docs with some details about the scroll information.
5. Cleaned up duplicated code.
bug:
5412132
bug:
5412265
Change-Id: I165e73ecde027dad811425b9f395a3f758c923ba
Jeff Brown [Thu, 6 Oct 2011 20:11:04 +0000 (13:11 -0700)]
Clean up CursorWindow code.
Bug:
5332296
The code is functionally equivalent, but a little more efficient
and much easier to maintain.
Change-Id: I90670a13799df05831843a5137ab234929281b7c
Chet Haase [Thu, 6 Oct 2011 21:35:53 +0000 (14:35 -0700)]
Merge "Fix issue #
5367164: memory leak in LayoutTransition"
Svetoslav Ganov [Tue, 27 Sep 2011 17:47:58 +0000 (10:47 -0700)]
Accessibility test automation API not working.
1. Due to a previous change that disabled accessibility if not enabled
and installed serivces are present the automation APIs stopped working
since they use fake automation service that is not installed.
2. Added clean up of death recipients when binders die.
bug:
5374662
bug:
5239044
Change-Id: I1f3c8cd1d1c79753a4a64e2b8b2963025abb2939
Jake Hamby [Thu, 6 Oct 2011 21:05:58 +0000 (14:05 -0700)]
Merge "Enable support for multiple SMSDispatchers in CDMALTEPhone."
Robert Ly [Thu, 6 Oct 2011 20:54:42 +0000 (13:54 -0700)]
Merge "docs: tools and adt notes"
Christopher Tate [Thu, 6 Oct 2011 20:09:58 +0000 (13:09 -0700)]
Merge "Disable db_sample logging"
Christopher Tate [Thu, 6 Oct 2011 20:09:52 +0000 (13:09 -0700)]
Merge "Prevent concurrent backup operations"
Robert Ly [Wed, 5 Oct 2011 19:59:29 +0000 (12:59 -0700)]
docs: tools and adt notes
Change-Id: I432148d53127443662e180942b95f21c6f199476
Xavier Ducrohet [Thu, 6 Oct 2011 19:56:58 +0000 (12:56 -0700)]
Merge "Update dev guide for new build system and new lib system."
Irfan Sheriff [Thu, 6 Oct 2011 19:42:48 +0000 (12:42 -0700)]
Merge "Mobile hotspot provision string"
Chet Haase [Thu, 6 Oct 2011 18:16:40 +0000 (11:16 -0700)]
Fix issue #
5367164: memory leak in LayoutTransition
When a transition occurs, layout change listeners are added to the container
being transitioned as well as every container up the view hierarchy. The
parent views were not having those listeners removed, so every time a transition
ran, more listeners would be added. Adding to that, the use of an ArrayList
as the collection to hold the listeners meant that adding duplicate items
would just increase the size of the list. There's now a sanity-check on the add
call to make sure that the listener does not exist already, but more importantly
we remove all listeners added when the transition ends.
Change-Id: I4ea05adf30765db091124065539b0ffd32729b3b
Daniel Sandler [Thu, 6 Oct 2011 19:40:53 +0000 (12:40 -0700)]
Merge "Cascading clear-all in the phone notifications panel."
Chet Haase [Thu, 6 Oct 2011 19:14:26 +0000 (12:14 -0700)]
Merge "Fix issue #
5384631: hw windows not resizing correctly"
Chet Haase [Thu, 6 Oct 2011 15:34:13 +0000 (08:34 -0700)]
Fix issue #
5384631: hw windows not resizing correctly
When the SystemUi becomes visible, the activity window resizes.
The hardware renderer was not begin resized to suit, so it was drawing
to a surface larger than that of the activity window, and some of the
rendering (like the action bar) appeared off the screen.
The fix is to keep track of the surface size in HardwareRenderer and to
recreate the surface when the size changes.
This change also removes the BUFFER_CHANGE flag from WindowManager.LayoutParams.
The only reason the flag existed was to trigger a hardware surface recreation,
but checking the old/new size is a more direct way of handling this.
Change-Id: I9d6bf6385794886d1d93c60609c170864cdcdfab
Irfan Sheriff [Thu, 6 Oct 2011 18:47:07 +0000 (11:47 -0700)]
Mobile hotspot provision string
Bug:
5346812
Change-Id: Iff4d2558308836c66bcbe30d987ecade66b666ba
Jeff Sharkey [Thu, 6 Oct 2011 18:22:40 +0000 (11:22 -0700)]
am
a50d0f89: Merge "Hide quota APIs until finalized." into ics-factoryrom
* commit '
a50d0f8985d811a6a2f49aa65e31892048e96ccf':
Hide quota APIs until finalized.
Jeff Sharkey [Thu, 6 Oct 2011 18:19:29 +0000 (11:19 -0700)]
Merge "Hide quota APIs until finalized." into ics-factoryrom
Scott Main [Thu, 6 Oct 2011 18:19:25 +0000 (11:19 -0700)]
Merge "docs: add new action item and state list drawable resource attributes"
Eric Fischer [Thu, 6 Oct 2011 18:03:18 +0000 (11:03 -0700)]
am
2fc826ec: (-s ours) Import translations for late permission additions.
* commit '
2fc826ec944cf85d1c3e65011091c58dc94110c0':
Import translations for late permission additions.
Wink Saville [Thu, 6 Oct 2011 17:52:13 +0000 (10:52 -0700)]
Merge "Set mGotCountryCode properly."
Jeff Sharkey [Thu, 6 Oct 2011 17:50:09 +0000 (10:50 -0700)]
Hide quota APIs until finalized.
Bug:
5383656
Change-Id: Ia2a978a6ff2ee642b0ea4d7d6b8857b7efffd612
Daniel Sandler [Wed, 5 Oct 2011 01:49:30 +0000 (21:49 -0400)]
Cascading clear-all in the phone notifications panel.
Bug:
5156350
Change-Id: I22c5a19b162e4aa35bf66d51cd17c1e0cd079053
Steve Block [Thu, 6 Oct 2011 17:35:33 +0000 (10:35 -0700)]
Merge "Improve a warning message in WebViewCore's EventHub"
Eric Fischer [Thu, 6 Oct 2011 17:28:28 +0000 (10:28 -0700)]
Import translations for late permission additions.
Change-Id: I80c968b0f6fd74cc52443a3729d02490c77aef30
Wink Saville [Thu, 6 Oct 2011 17:23:32 +0000 (10:23 -0700)]
Set mGotCountryCode properly.
mGotCountryCode needs to be set to false when we don't know
the country code and to true only when we do.
Bug:
2578334
Change-Id: I7cb21e627ae115880df5f9b2095cb4ba094ab751
Ben Murdoch [Thu, 6 Oct 2011 17:23:20 +0000 (10:23 -0700)]
Merge "Pass correct units for text size in autocomplete drop down."
John Reck [Thu, 6 Oct 2011 17:22:03 +0000 (10:22 -0700)]
Merge "Prevent adapter flickering"
Roman Nurik [Thu, 6 Oct 2011 17:11:32 +0000 (10:11 -0700)]
Merge "Mark random music player sample as updated in the resource TOC"