OSDN Git Service
Svetoslav Ganov [Wed, 12 Jan 2011 05:58:22 +0000 (21:58 -0800)]
am
2ad2bf23: Merge "Renaming NumberPicker resources to be consistent." into honeycomb
* commit '
2ad2bf232714009586c5163e08754886bdd9ea20':
Renaming NumberPicker resources to be consistent.
Svetoslav Ganov [Wed, 12 Jan 2011 05:56:03 +0000 (21:56 -0800)]
Merge "Renaming NumberPicker resources to be consistent." into honeycomb
Christopher Tate [Wed, 12 Jan 2011 04:03:57 +0000 (20:03 -0800)]
am
28514f8f: Merge "API CHANGE: startDrag() now takes "int flags" instead of "boolean localOnly"" into honeycomb
* commit '
28514f8f9cdac95799d5654a30fe36ef05443dd3':
API CHANGE: startDrag() now takes "int flags" instead of "boolean localOnly"
Christopher Tate [Wed, 12 Jan 2011 04:02:35 +0000 (20:02 -0800)]
Merge "API CHANGE: startDrag() now takes "int flags" instead of "boolean localOnly"" into honeycomb
Chung-yih Wang [Wed, 12 Jan 2011 03:49:34 +0000 (19:49 -0800)]
am
8df7b060: Merge "Merge "Add auth. username in SipProfile." from gingerbread." into honeycomb
* commit '
8df7b060fa8d3eb6d9874af01f2d189d0ceb74d7':
Merge "Add auth. username in SipProfile." from gingerbread.
Chung-yih Wang [Wed, 12 Jan 2011 03:47:48 +0000 (19:47 -0800)]
Merge "Merge "Add auth. username in SipProfile." from gingerbread." into honeycomb
Chung-yih Wang [Thu, 6 Jan 2011 10:44:43 +0000 (18:44 +0800)]
Merge "Add auth. username in SipProfile." from gingerbread.
bug:
3326867
Change-Id: Ic67dd7d4858f28224e4f01ad8b65bcd3a3c15f10
Romain Guy [Wed, 12 Jan 2011 03:34:38 +0000 (19:34 -0800)]
am
9688fdf5: am
fcf3d12d: Merge "Typo in Javadoc"
* commit '
9688fdf51edb82a73e1a6d436bf7bce706c049fb':
Typo in Javadoc
Stephen Hines [Wed, 12 Jan 2011 03:12:23 +0000 (19:12 -0800)]
am
78dd1ef3: Merge "Clean up RS math headers." into honeycomb
* commit '
78dd1ef3f70ff80bf9697ba53601bda48451c044':
Clean up RS math headers.
Stephen Hines [Wed, 12 Jan 2011 03:09:47 +0000 (19:09 -0800)]
Merge "Clean up RS math headers." into honeycomb
Christopher Tate [Tue, 11 Jan 2011 04:43:53 +0000 (20:43 -0800)]
API CHANGE: startDrag() now takes "int flags" instead of "boolean localOnly"
There will be, in the future, a flag (View.DRAG_FLAG_GLOBAL) that means
for the drag to be cross-application. For now that flag constant is @hide
and furthermore the server-side implementation strips it, enforcing
local-only drags.
Change-Id: I8db840480ab90e18a5b8ecf29d62b4e6eafd405e
Svetoslav Ganov [Wed, 12 Jan 2011 02:06:46 +0000 (18:06 -0800)]
am
5220834c: Merge "Down arrow on the month can end up at the start of the month" into honeycomb
* commit '
5220834c6ccdabf949dfe7160548ad378850d71b':
Down arrow on the month can end up at the start of the month
Svetoslav Ganov [Wed, 12 Jan 2011 02:04:42 +0000 (18:04 -0800)]
Merge "Down arrow on the month can end up at the start of the month" into honeycomb
Romain Guy [Wed, 12 Jan 2011 02:00:31 +0000 (18:00 -0800)]
am
6ed4a2f7: Merge "Disable the region compositing pipeline for layers." into honeycomb
* commit '
6ed4a2f72531c2d9f256c19b09414aa9ea5da8c5':
Disable the region compositing pipeline for layers.
Dianne Hackborn [Wed, 12 Jan 2011 02:00:26 +0000 (18:00 -0800)]
am
45a8f53b: Merge "Get rid of old ParcelFileDescriptor API." into honeycomb
* commit '
45a8f53b25c8306c7f2c37f3a1d70ace21956e28':
Get rid of old ParcelFileDescriptor API.
Svetoslav Ganov [Wed, 12 Jan 2011 01:57:08 +0000 (17:57 -0800)]
Down arrow on the month can end up at the start of the month
bug:
3338078
1. The bug was that I was claculating delta month and day from
the current date but was changing the latter in the middle
thus causing inconsistent state.
Change-Id: Id3082b01778fc2b3116aa412aff3f12e9ebf0c97
Romain Guy [Wed, 12 Jan 2011 01:58:56 +0000 (17:58 -0800)]
Merge "Disable the region compositing pipeline for layers." into honeycomb
Romain Guy [Wed, 12 Jan 2011 02:01:25 +0000 (18:01 -0800)]
Disable the region compositing pipeline for layers.
This composition mode is affecting Gmail in a bad way. Disabling until
I can figure out the problem.
Change-Id: I00e657ea2d05fc7b4a606242d19dc84dd88c1e35
Romain Guy [Wed, 12 Jan 2011 01:58:03 +0000 (17:58 -0800)]
Don't break the build!
Change-Id: I42f68c7b023c03adeedc4e979e5f4705188ee9f4
Romain Guy [Wed, 12 Jan 2011 01:58:18 +0000 (17:58 -0800)]
am
5f6e583c: Merge "Don\'t break the build!" into honeycomb
* commit '
5f6e583cc8c27ac2eb217a7d1065a6aeda00a033':
Don't break the build!
Dianne Hackborn [Wed, 12 Jan 2011 01:57:19 +0000 (17:57 -0800)]
Merge "Get rid of old ParcelFileDescriptor API." into honeycomb
Dianne Hackborn [Wed, 12 Jan 2011 01:52:22 +0000 (17:52 -0800)]
Get rid of old ParcelFileDescriptor API.
Also some new debugging code in AsyncTaskLoader.
Change-Id: Ib13386b7862821cf0ee31b003bedef78f46240f1
Svetoslav Ganov [Wed, 12 Jan 2011 01:56:11 +0000 (17:56 -0800)]
am
147f7df3: Merge "IAE: Service not registered: com.android.server.AccessibilityManagerService" into honeycomb
* commit '
147f7df35c554cf24287c732f8b74b0018e1ddbe':
IAE: Service not registered: com.android.server.AccessibilityManagerService
Romain Guy [Wed, 12 Jan 2011 01:56:09 +0000 (17:56 -0800)]
Merge "Don't break the build!" into honeycomb
Romain Guy [Wed, 12 Jan 2011 01:53:58 +0000 (17:53 -0800)]
am
d139a0ca: Merge "Better backend for hardware layers." into honeycomb
* commit '
d139a0ca25dbabfaeaed6383f3177704fe0183e2':
Better backend for hardware layers.
Romain Guy [Tue, 11 Jan 2011 22:29:25 +0000 (14:29 -0800)]
Better backend for hardware layers.
With this new backend, a hardware layer is only recreated when
its associated view is udpated. This offers fast composition
in GL and fast update of the layer in GL as well.
Change-Id: I97c43a612f5955c6bf1c192c8ca4af10fdf1d076
Svetoslav Ganov [Wed, 12 Jan 2011 01:53:15 +0000 (17:53 -0800)]
Merge "IAE: Service not registered: com.android.server.AccessibilityManagerService" into honeycomb
Romain Guy [Wed, 12 Jan 2011 01:52:05 +0000 (17:52 -0800)]
Merge "Better backend for hardware layers." into honeycomb
Jason Sams [Wed, 12 Jan 2011 01:47:42 +0000 (17:47 -0800)]
am
d345505a: Merge "Add error checks to bitmap uploads. Fix java side calculation for pixel sizes." into honeycomb
* commit '
d345505a32f991ffb74639795451f545141b8890':
Add error checks to bitmap uploads. Fix java side calculation for pixel sizes.
Svetoslav Ganov [Wed, 12 Jan 2011 01:45:37 +0000 (17:45 -0800)]
am
49c771c4: Merge "WebView accessibility key bindings do not allow mapping of all meta keys. Exception when turning off acessibility and having a WebView showing content." into honeycomb
* commit '
49c771c4da8bb7cf135e6afed3a901b1744beb67':
WebView accessibility key bindings do not allow mapping of all meta keys. Exception when turning off acessibility and having a WebView showing content.
Jason Sams [Wed, 12 Jan 2011 01:44:39 +0000 (17:44 -0800)]
Merge "Add error checks to bitmap uploads. Fix java side calculation for pixel sizes." into honeycomb
Svetoslav Ganov [Wed, 12 Jan 2011 01:43:01 +0000 (17:43 -0800)]
Merge "WebView accessibility key bindings do not allow mapping of all meta keys. Exception when turning off acessibility and having a WebView showing content." into honeycomb
Jason Sams [Wed, 12 Jan 2011 01:42:52 +0000 (17:42 -0800)]
Add error checks to bitmap uploads.
Fix java side calculation for pixel sizes.
Change-Id: I2636db2ccdc9a330214fe9d8b26617b33e52ec8e
Eric Fischer [Wed, 12 Jan 2011 01:41:01 +0000 (17:41 -0800)]
am
2ea2553b: Merge "Update large-screen translations." into honeycomb
* commit '
2ea2553bda727f60fb05043cd13588091533f551':
Update large-screen translations.
Eric Fischer [Wed, 12 Jan 2011 01:39:12 +0000 (17:39 -0800)]
Merge "Update large-screen translations." into honeycomb
Justin Ho [Wed, 12 Jan 2011 01:36:38 +0000 (17:36 -0800)]
am
2d2899f9: Merge "Updated expander assets from Gingerbread" into honeycomb
* commit '
2d2899f9ff292ecb7d1d8564ed52229bdd93819b':
Updated expander assets from Gingerbread
Justin Ho [Wed, 12 Jan 2011 01:34:34 +0000 (17:34 -0800)]
Merge "Updated expander assets from Gingerbread" into honeycomb
Justin Ho [Wed, 12 Jan 2011 01:33:10 +0000 (17:33 -0800)]
Updated expander assets from Gingerbread
Change-Id: Ieb5e47bc6907e6805ae55be3a9efa13b47309cdd
Irfan Sheriff [Wed, 12 Jan 2011 01:28:39 +0000 (17:28 -0800)]
am
7ac190d6: Merge "default wifi sleep policy change" into honeycomb
* commit '
7ac190d60d794b5f75b094a0b9a3f666742d42fb':
default wifi sleep policy change
Irfan Sheriff [Wed, 12 Jan 2011 01:26:18 +0000 (17:26 -0800)]
Merge "default wifi sleep policy change" into honeycomb
Xavier Ducrohet [Wed, 12 Jan 2011 01:25:27 +0000 (17:25 -0800)]
am
3a762f2f: Merge "LayoutLib: Log error when style can\'t be found." into honeycomb
* commit '
3a762f2fd1447868c028978ef57801f5f246a504':
LayoutLib: Log error when style can't be found.
Xavier Ducrohet [Wed, 12 Jan 2011 01:24:06 +0000 (17:24 -0800)]
Merge "LayoutLib: Log error when style can't be found." into honeycomb
Joe Onorato [Wed, 12 Jan 2011 01:11:09 +0000 (17:11 -0800)]
am
14770e04: Merge "The status bar half of making the status bar resize when hdmi is plugged in." into honeycomb
* commit '
14770e049e10377bd963623891ccb0976b2dd6ee':
The status bar half of making the status bar resize when hdmi is plugged in.
Joe Onorato [Wed, 12 Jan 2011 01:11:02 +0000 (17:11 -0800)]
am
d938e216: Merge "Update AppWidgetHostActivity to work again." into honeycomb
* commit '
d938e216cb24f7c154cf62135e90b8e6f3de2464':
Update AppWidgetHostActivity to work again.
Xavier Ducrohet [Wed, 12 Jan 2011 01:11:01 +0000 (17:11 -0800)]
LayoutLib: Log error when style can't be found.
Change-Id: I9a88cdac44a2d31c053e7f0c92a14e69bd82ac83
Joe Onorato [Wed, 12 Jan 2011 01:09:16 +0000 (17:09 -0800)]
Merge "The status bar half of making the status bar resize when hdmi is plugged in." into honeycomb
Joe Onorato [Wed, 12 Jan 2011 01:08:52 +0000 (17:08 -0800)]
Merge "Update AppWidgetHostActivity to work again." into honeycomb
Joe Onorato [Wed, 12 Jan 2011 01:07:41 +0000 (17:07 -0800)]
The status bar half of making the status bar resize when hdmi is plugged in.
Change-Id: Ia349413774ba709fb3242780671c7b459850f4a4
Svetoslav Ganov [Wed, 12 Jan 2011 00:54:01 +0000 (16:54 -0800)]
Renaming NumberPicker resources to be consistent.
1. The resources for the NumberPicker now start with 'numberpicker_' instead of the legacy 'timepicker_'
2. Removed unused resources.
Change-Id: Ide7c61df1936f174b6fffc778cba3a58b324556a
Stephen Hines [Tue, 11 Jan 2011 22:38:18 +0000 (14:38 -0800)]
Clean up RS math headers.
Fix types for ilogb and remquo.
Change-Id: I54f8634b1fe8b6cfb136d3bdf6aab5a5961e6827
Eric Fischer [Wed, 12 Jan 2011 00:59:54 +0000 (16:59 -0800)]
Update large-screen translations.
Change-Id: Iff616447f1cd547d887c0aa84071daa34166a5ad
Justin Ho [Wed, 12 Jan 2011 00:13:06 +0000 (16:13 -0800)]
am
1a6c5b64: Merge "Dropdown, checkboxes, buttons from Gingerbread" into honeycomb
* commit '
1a6c5b64deac492bc58eb94ffdb0ba21aa1934f0':
Dropdown, checkboxes, buttons from Gingerbread
Justin Ho [Wed, 12 Jan 2011 00:11:35 +0000 (16:11 -0800)]
Merge "Dropdown, checkboxes, buttons from Gingerbread" into honeycomb
Justin Ho [Wed, 12 Jan 2011 00:00:39 +0000 (16:00 -0800)]
Dropdown, checkboxes, buttons from Gingerbread
Change-Id: Iec4818958f7a0cf41dab94695a06b9b3d0f72acb
Adam Powell [Tue, 11 Jan 2011 23:59:54 +0000 (15:59 -0800)]
am
16ffa6cb: Merge "Fix bug
3338079 - Dialog styled activity decor" into honeycomb
* commit '
16ffa6cb2d31d130bb0b58afca31c461c784ce5d':
Fix bug
3338079 - Dialog styled activity decor
Adam Powell [Tue, 11 Jan 2011 23:58:29 +0000 (15:58 -0800)]
Merge "Fix bug
3338079 - Dialog styled activity decor" into honeycomb
Adam Powell [Tue, 11 Jan 2011 23:37:04 +0000 (15:37 -0800)]
Fix bug
3338079 - Dialog styled activity decor
Fixed a bug in FastScroller that could cause a crash on an empty list
in always-show mode.
Fix holo light button text color
Change-Id: I7b50043d715b9b870eb34808017d743ba64d2e08
Justin Ho [Tue, 11 Jan 2011 23:41:37 +0000 (15:41 -0800)]
am
9b5b54b7: Merge "List selectors, menu backgrounds, popups, menu backgrounds from Gingerbread (HDPI and MDPI)" into honeycomb
* commit '
9b5b54b72349982213c1482cfdf2908346921ecd':
List selectors, menu backgrounds, popups, menu backgrounds from Gingerbread (HDPI and MDPI)
Justin Ho [Tue, 11 Jan 2011 23:41:34 +0000 (15:41 -0800)]
am
d5c91fe0: Merge "Updated HDPI btn_default states from Gingerbread" into honeycomb
* commit '
d5c91fe067d7d65d0a5b31954218d2795f2b7f58':
Updated HDPI btn_default states from Gingerbread
Irfan Sheriff [Tue, 11 Jan 2011 23:40:35 +0000 (15:40 -0800)]
default wifi sleep policy change
Keep wifi sleep policy as never when charged as long as
user has not changed the settings
Bug:
3038345
Change-Id: I0598af41fe0144f2dfddc5bd331bd91d91e0ffea
Justin Ho [Tue, 11 Jan 2011 23:39:40 +0000 (15:39 -0800)]
Merge "List selectors, menu backgrounds, popups, menu backgrounds from Gingerbread (HDPI and MDPI)" into honeycomb
Justin Ho [Tue, 11 Jan 2011 23:39:10 +0000 (15:39 -0800)]
Merge "Updated HDPI btn_default states from Gingerbread" into honeycomb
Xavier Ducrohet [Tue, 11 Jan 2011 23:37:21 +0000 (15:37 -0800)]
am
85de0087: Merge "LayoutLib: misc fix." into honeycomb
* commit '
85de0087fc6a65a66d3994f0b8dd3fecd9db2526':
LayoutLib: misc fix.
Xavier Ducrohet [Tue, 11 Jan 2011 23:34:44 +0000 (15:34 -0800)]
Merge "LayoutLib: misc fix." into honeycomb
Andreas Huber [Tue, 11 Jan 2011 23:22:46 +0000 (15:22 -0800)]
am
0827e697: Merge "Increase cache size and low-watermark threshold, also" into honeycomb
* commit '
0827e697a9965195ca12ba593332c555702aa94a':
Increase cache size and low-watermark threshold, also
Andreas Huber [Tue, 11 Jan 2011 23:22:42 +0000 (15:22 -0800)]
am
7f92be88: Merge "Properly parse Matroska lacing flags and extract all frames contained in a block." into honeycomb
* commit '
7f92be88e0d89a693bed4d620a83aea1a989c68e':
Properly parse Matroska lacing flags and extract all frames contained in a block.
Romain Guy [Tue, 11 Jan 2011 23:22:39 +0000 (15:22 -0800)]
am
b7968896: Merge "Solve translucency issue when drawing paths." into honeycomb
* commit '
b796889671c089fb7e2fc4498aa701d3e8e552a3':
Solve translucency issue when drawing paths.
Andreas Huber [Tue, 11 Jan 2011 23:20:39 +0000 (15:20 -0800)]
Merge "Increase cache size and low-watermark threshold, also" into honeycomb
Andreas Huber [Tue, 11 Jan 2011 23:16:04 +0000 (15:16 -0800)]
Merge "Properly parse Matroska lacing flags and extract all frames contained in a block." into honeycomb
Xavier Ducrohet [Tue, 11 Jan 2011 23:14:13 +0000 (15:14 -0800)]
LayoutLib: misc fix.
Change-Id: I0e2eff376d8f8e7682c28ef771b886d5fab5ff65
Svetoslav Ganov [Tue, 11 Jan 2011 22:19:17 +0000 (14:19 -0800)]
WebView accessibility key bindings do not allow mapping of all meta keys. Exception when turning off acessibility and having a WebView showing content.
bug:
3341772
1. Now a key in the binding is represented as a long with 32 MSB for modifiers and 32 LSB for keyCode.
bug:
3340732
1. Added check in the WebView key handling code to diable the accessibility injector/injected script in
case accessibility is been disabled after loading the content.
Change-Id: Ic3746dff16ec77ba682a5b139cec0e6afd8fc839
Andreas Huber [Tue, 11 Jan 2011 23:05:28 +0000 (15:05 -0800)]
Increase cache size and low-watermark threshold, also
MediaPlayer now sends out MEDIA_INFO,MEDIA_INFO_VIDEO_TRACK_LAGGING messages
to the JAVA client informing it how much (if at all) the video lags behind
audio (arg2 is the media delay in ms).
Change-Id: I6933f573d8597a35112e4b5ee0fcb826a7f6ddd1
related-to-bug:
3335220
Svetoslav Ganov [Tue, 11 Jan 2011 23:04:40 +0000 (15:04 -0800)]
IAE: Service not registered: com.android.server.AccessibilityManagerService
bug:
3331645
1. Let the binder the AccessibilityManagerService has obtained while connecting
to an accessibility services be garbage collected since when binding we will
will get in the on #onServiceConnected callback and it can be potentially
another instance.
Change-Id: I87aa5e5f741e2e54c72d3d0d396ac00eda5aeb5c
Romain Guy [Tue, 11 Jan 2011 23:01:02 +0000 (15:01 -0800)]
Merge "Solve translucency issue when drawing paths." into honeycomb
Romain Guy [Tue, 11 Jan 2011 23:02:21 +0000 (15:02 -0800)]
Solve translucency issue when drawing paths.
Change-Id: I68ae0e2ccddaca2f76b5b2dd3e3cf1277fddaad6
Gloria Wang [Tue, 11 Jan 2011 22:55:56 +0000 (14:55 -0800)]
am
9e0bb6d5: am
0544d059: Merge "DRM Framework bug fixes."
* commit '
9e0bb6d5eef5dfe2da60c50f3aaa39512307d11d':
DRM Framework bug fixes.
Scott Main [Tue, 11 Jan 2011 22:53:52 +0000 (14:53 -0800)]
Merge "resolved conflicts for merge of
ac8d7926 to honeycomb-plus-aosp" into honeycomb-plus-aosp
Jaikumar Ganesh [Tue, 11 Jan 2011 22:53:21 +0000 (14:53 -0800)]
am
0c848553: Merge "Update status bar icons for BT reverse tethering." into honeycomb
* commit '
0c848553346b0f80c7baa0aa08ec1b9d440e442c':
Update status bar icons for BT reverse tethering.
Scott Main [Tue, 11 Jan 2011 22:51:21 +0000 (14:51 -0800)]
resolved conflicts for merge of
ac8d7926 to honeycomb-plus-aosp
Change-Id: I873904e7724c3822d6011b507649c9d2d9e9bfef
Jaikumar Ganesh [Tue, 11 Jan 2011 22:51:01 +0000 (14:51 -0800)]
Merge "Update status bar icons for BT reverse tethering." into honeycomb
Scott Main [Tue, 11 Jan 2011 22:22:14 +0000 (14:22 -0800)]
am
246a01b1: am
3d0f0108: cherry pick Change-Id: Ic4fe5e2d1ef3082c34fb448dd1f4705f73f2235f docs: update dashboard
* commit '
246a01b1dedd11e4de4678dedc5cf8eeca922ead':
cherry pick Change-Id: Ic4fe5e2d1ef3082c34fb448dd1f4705f73f2235f docs: update dashboard
Scott Main [Tue, 11 Jan 2011 22:22:06 +0000 (14:22 -0800)]
Yu Shan Emily Lau [Tue, 11 Jan 2011 22:21:59 +0000 (14:21 -0800)]
am
5619da8d: am
2af4e71d: Merge "Fix the test application orientation. Bug#
3205196" into gingerbread
* commit '
5619da8d8b66337db182a016619efa1f31266a78':
Fix the test application orientation. Bug#
3205196
Gilles Debunne [Tue, 11 Jan 2011 22:21:51 +0000 (14:21 -0800)]
am
ce77f1b7: (-s ours) am
9ffb0a0d: Merge "Ran fixPngMetaTags on all the core/res assets." into gingerbread
* commit '
ce77f1b7ff24a7c867a8274ffb6388ba2a874441':
Ran fixPngMetaTags on all the core/res assets.
Justin Ho [Tue, 11 Jan 2011 22:21:48 +0000 (14:21 -0800)]
List selectors, menu backgrounds, popups, menu backgrounds from Gingerbread (HDPI and MDPI)
Change-Id: I74ecf0133e7b395caa699b41a7e4f8e60772fd13
Irfan Sheriff [Tue, 11 Jan 2011 22:17:59 +0000 (14:17 -0800)]
am
50cf2106: Merge "Fix network availability reporting" into honeycomb
* commit '
50cf2106b77d4009e1cefe11c57c42fe4584345f':
Fix network availability reporting
Irfan Sheriff [Tue, 11 Jan 2011 22:16:04 +0000 (14:16 -0800)]
Merge "Fix network availability reporting" into honeycomb
Jim Miller [Tue, 11 Jan 2011 22:15:55 +0000 (14:15 -0800)]
am
c82c787c: Merge "Update AndroidClock font for LockScreen and tweak transparency." into honeycomb
* commit '
c82c787caa6bf4ef08a81e0a6ed9e12e52f35114':
Update AndroidClock font for LockScreen and tweak transparency.
Jim Miller [Tue, 11 Jan 2011 22:13:37 +0000 (14:13 -0800)]
Merge "Update AndroidClock font for LockScreen and tweak transparency." into honeycomb
Justin Ho [Tue, 11 Jan 2011 22:07:14 +0000 (14:07 -0800)]
am
910a347c: Merge "Updated btn default states (MDPI) from Gingerbread" into honeycomb
* commit '
910a347cee738bbd8da4b6386bfe95c0bf0566bf':
Updated btn default states (MDPI) from Gingerbread
Justin Ho [Tue, 11 Jan 2011 22:05:28 +0000 (14:05 -0800)]
Merge "Updated btn default states (MDPI) from Gingerbread" into honeycomb
Huahui Wu [Tue, 11 Jan 2011 22:02:46 +0000 (14:02 -0800)]
am
3ee37b12: Merge "b/
3331379 reduce ping-to-zoom jitter." into honeycomb
* commit '
3ee37b12d598d7354fddb698bc6bdefb3b390f64':
b/
3331379 reduce ping-to-zoom jitter.
Justin Ho [Tue, 11 Jan 2011 22:02:13 +0000 (14:02 -0800)]
Updated HDPI btn_default states from Gingerbread
Change-Id: I3defa049dfe2364fc2cda6dcce50126ad242d0fb
Huahui Wu [Tue, 11 Jan 2011 21:59:46 +0000 (13:59 -0800)]
Merge "b/
3331379 reduce ping-to-zoom jitter." into honeycomb
Justin Ho [Tue, 11 Jan 2011 21:58:24 +0000 (13:58 -0800)]
Updated btn default states (MDPI) from Gingerbread
Change-Id: I09006ef68d7b17e0a1dde56d24bf90a97cb4069d
Gilles Debunne [Tue, 11 Jan 2011 21:54:03 +0000 (13:54 -0800)]
Merge branch 'honeycomb-plus-aosp' of ssh://android-git:29418/platform/frameworks/base into honeycomb-plus-aosp
Gilles Debunne [Tue, 11 Jan 2011 21:53:43 +0000 (13:53 -0800)]
am
f9335c1f: (-s ours) am
97664784: Merge "Asset cleanup. DO NOT MERGE" into gingerbread
* commit '
f9335c1f23270b0b0d2649f6a95fe7f4cc0422ee':
Asset cleanup. DO NOT MERGE
Marco Nelissen [Tue, 11 Jan 2011 21:53:34 +0000 (13:53 -0800)]
am
2888208b: am
f13d4501: Send "compilation" tag when inserting into the database. It\'s not actually inserted into the database, but the media provider uses it for disambiguating albums. b/
3311831
* commit '
2888208b0bb38ac93bb6b500992869c8a6bf244c':
Send "compilation" tag when inserting into the database. It's not actually inserted into the database, but the media provider uses it for disambiguating albums. b/
3311831
Justin Ho [Tue, 11 Jan 2011 21:53:33 +0000 (13:53 -0800)]
am
2706a1f8: Merge "Updated permission bullet" into honeycomb
* commit '
2706a1f8f60f21bc9b483a93a4b694e60bc68888':
Updated permission bullet
Justin Ho [Tue, 11 Jan 2011 21:53:27 +0000 (13:53 -0800)]
am
69c3f8c6: Merge "Updated Help icon" into honeycomb
* commit '
69c3f8c6720fd320dd7c8ebf2182b02d7d6d9586':
Updated Help icon