OSDN Git Service
Stephen Hines [Mon, 8 Aug 2011 23:12:56 +0000 (16:12 -0700)]
Merge "Migrate perf-critical functions away from librs."
Jason Sams [Mon, 8 Aug 2011 23:02:12 +0000 (16:02 -0700)]
Merge "Add RS docs for rs_core.rsh"
Justin Ho [Mon, 8 Aug 2011 22:56:38 +0000 (15:56 -0700)]
Merge "Bug
5080369: merging new assets"
Justin Ho [Mon, 8 Aug 2011 22:53:06 +0000 (15:53 -0700)]
Merge "Removing unused spinner_active Bug:
5076695"
Justin Ho [Mon, 8 Aug 2011 22:52:14 +0000 (15:52 -0700)]
Merge "Updated switches Bug:
5076695"
Chet Haase [Mon, 8 Aug 2011 22:13:12 +0000 (15:13 -0700)]
Merge "Fix cancellation of AnimatorSet when child animation has delay"
Romain Guy [Mon, 8 Aug 2011 22:09:27 +0000 (15:09 -0700)]
Merge "Don't draw more than what we need."
Eric Fischer [Mon, 8 Aug 2011 22:07:58 +0000 (15:07 -0700)]
Merge "Import revised translations."
Adam Powell [Mon, 8 Aug 2011 22:00:32 +0000 (15:00 -0700)]
Merge "Fix bug
5116434 - Bookmark label is not highlighted."
Fabrice Di Meglio [Mon, 8 Aug 2011 21:47:02 +0000 (14:47 -0700)]
Merge "Follow up to TextView's baseline is correctly computed for empty text"
Jason Sams [Mon, 8 Aug 2011 21:35:16 +0000 (14:35 -0700)]
Merge "Add docs to rs_types.rsh"
Neel Parekh [Mon, 8 Aug 2011 20:57:30 +0000 (13:57 -0700)]
Merge "Prevent NPE when registering a remote control client"
Justin Ho [Mon, 8 Aug 2011 20:41:42 +0000 (13:41 -0700)]
Merge "Updated fastscroll assets Bug:
5076695"
Justin Ho [Mon, 8 Aug 2011 20:26:00 +0000 (13:26 -0700)]
Merge "Updated numberpicker_ assets Bug:
5076695"
Justin Ho [Mon, 8 Aug 2011 20:23:42 +0000 (13:23 -0700)]
Merge "Updated rating stars Bug:
5076695"
Justin Ho [Mon, 8 Aug 2011 20:21:31 +0000 (13:21 -0700)]
Merge "Updated quickcontact badges Bug:
5076695"
Daniel Lehmann [Mon, 8 Aug 2011 20:06:01 +0000 (13:06 -0700)]
Merge "Don't perform query if QuickContactBadge has been initialized via assignContactUri"
Fabrice Di Meglio [Mon, 8 Aug 2011 19:56:05 +0000 (12:56 -0700)]
Merge "Revert "Adapt TextLayoutCache for new Harfbuzz scripts""
Fabrice Di Meglio [Mon, 8 Aug 2011 19:42:51 +0000 (12:42 -0700)]
Merge "Revert "Fix bug #
5114358 If writing Numbers with Hebrew & Arabic keyboard, they appear as LTR""
Chia-chi Yeh [Mon, 8 Aug 2011 18:33:57 +0000 (11:33 -0700)]
Merge "VPN: introduce VpnService as the base class for user space VPN."
Mark Brophy [Mon, 8 Aug 2011 18:30:19 +0000 (11:30 -0700)]
Merge "Store last-resume times in a separate XML file."
Alex Sakhartchouk [Mon, 8 Aug 2011 18:25:03 +0000 (11:25 -0700)]
Merge "Fixing rs crash when no texture is bound."
Fabrice Di Meglio [Mon, 8 Aug 2011 17:58:13 +0000 (10:58 -0700)]
Merge "Fix bug #
4584320 Single Line EditText not drawing correctly with spans applied (ICS)"
Justin Ho [Mon, 8 Aug 2011 17:21:09 +0000 (10:21 -0700)]
Merge "Updated tab assets, removing [un]selected_pressed_focused states Updated appropriate style Bug:
5076695"
Justin Ho [Mon, 8 Aug 2011 17:16:42 +0000 (10:16 -0700)]
Merge "Updated overscroll assets Bug:
5076695"
Adam Powell [Mon, 8 Aug 2011 16:53:36 +0000 (09:53 -0700)]
Merge "Fix bug
5112702 - switches should have "ON" on the right"
Adam Powell [Mon, 8 Aug 2011 16:53:23 +0000 (09:53 -0700)]
Merge "Fix bug
5116342 - don't keep fragment state around once resumed"
Eric Laurent [Mon, 8 Aug 2011 16:31:42 +0000 (09:31 -0700)]
Merge "AudioFlinger: protect input/output stream access"
Jean-Michel Trivi [Mon, 8 Aug 2011 16:17:41 +0000 (09:17 -0700)]
Merge "Bug
5045498 API for client to notify remote control info changed"
Daniel Sandler [Mon, 8 Aug 2011 14:11:40 +0000 (07:11 -0700)]
Merge "Don't show network type if no SIM."
Svetoslav Ganov [Mon, 8 Aug 2011 13:50:19 +0000 (06:50 -0700)]
Merge "Turning off accessibility feature reboots the device"
Adam Powell [Sun, 7 Aug 2011 23:59:02 +0000 (16:59 -0700)]
Merge "Fix bug
5011824 - New Holo overflow menu for physical menu key devices"
Adam Powell [Sun, 7 Aug 2011 23:41:39 +0000 (16:41 -0700)]
Merge "Fix bug
5124712 - allow partial items when measuring height of list popups"
Jim Miller [Sun, 7 Aug 2011 21:56:17 +0000 (14:56 -0700)]
Merge "Fix
5125978: remove lockscreen logspew"
Jim Miller [Sun, 7 Aug 2011 21:21:16 +0000 (14:21 -0700)]
Merge "Fix
5044158: Fix landscape PIN layout issue"
Jean-Michel Trivi [Sun, 7 Aug 2011 20:48:04 +0000 (13:48 -0700)]
Merge "Make retrieving remote control client go through binder interface"
Daniel Sandler [Sun, 7 Aug 2011 20:37:59 +0000 (13:37 -0700)]
Merge "Remove notifications when an app is disabled."
Dianne Hackborn [Sat, 6 Aug 2011 01:18:52 +0000 (18:18 -0700)]
Merge "Improved memory use reporting."
Mike Lockwood [Fri, 5 Aug 2011 23:30:20 +0000 (16:30 -0700)]
Merge "MediaScanner: Fix UnsupportedOperationException when scanning internal media"
John Wang [Fri, 5 Aug 2011 23:29:27 +0000 (16:29 -0700)]
Merge "Enable concurrent voice and data for LTE."
Fabrice Di Meglio [Fri, 5 Aug 2011 23:17:07 +0000 (16:17 -0700)]
Merge "Update BiDi unit tests"
Amith Yamasani [Fri, 5 Aug 2011 22:28:53 +0000 (15:28 -0700)]
Merge "SearchView asset changes."
Christopher Tate [Fri, 5 Aug 2011 22:07:41 +0000 (15:07 -0700)]
Merge "Fix bug where sometimes the full backup pw would not be validated"
Christopher Tate [Fri, 5 Aug 2011 22:07:21 +0000 (15:07 -0700)]
Merge "Handle rotation gracefully in the backup/restore confirmation UI"
Wink Saville [Fri, 5 Aug 2011 20:55:39 +0000 (13:55 -0700)]
Merge "resolved conflicts for merge of
7bb2d942 to master"
Stephen Hines [Fri, 5 Aug 2011 20:47:00 +0000 (13:47 -0700)]
Merge "Start using bcinfo components within librs."
Wink Saville [Fri, 5 Aug 2011 18:40:22 +0000 (11:40 -0700)]
resolved conflicts for merge of
7bb2d942 to master
Change-Id: I026b01805c81d8b26d22e4a195e5e38655a34d32
Jaikumar Ganesh [Fri, 5 Aug 2011 18:37:22 +0000 (11:37 -0700)]
Merge "Provide address and name in BT Hot off state."
Philip Milne [Fri, 5 Aug 2011 18:32:20 +0000 (11:32 -0700)]
Merge "Remove call to setPadding() in setUseDefaultMargins()."
Amith Yamasani [Fri, 5 Aug 2011 18:02:55 +0000 (11:02 -0700)]
Merge "Don't change system sound defaults for upgrades."
Martijn Coenen [Fri, 5 Aug 2011 17:41:10 +0000 (10:41 -0700)]
Merge "Add Android app RTD type and convenience method."
Adam Powell [Fri, 5 Aug 2011 17:29:49 +0000 (10:29 -0700)]
Merge "Fix bug
5111513 - Spinner asset updates for action bars"
Daniel Sandler [Fri, 5 Aug 2011 17:23:22 +0000 (10:23 -0700)]
Merge "Fix crash in log message."
Irfan Sheriff [Fri, 5 Aug 2011 17:21:51 +0000 (10:21 -0700)]
Merge "Update scanresult capability check"
Daniel Sandler [Fri, 5 Aug 2011 15:45:55 +0000 (08:45 -0700)]
Merge "Stop popping up the compatibility mode dialog all the time."
Steve Block [Fri, 5 Aug 2011 14:53:11 +0000 (07:53 -0700)]
Merge "Improve a network error description"
Svetoslav Ganov [Fri, 5 Aug 2011 11:59:04 +0000 (04:59 -0700)]
Merge "ACTION_HOVER_EXIT sometimes not delivered during touch exploration."
Svetoslav Ganov [Fri, 5 Aug 2011 11:57:24 +0000 (04:57 -0700)]
Merge "AccessibilityEvent#toString() always reports -1 for record count."
Daniel Sandler [Fri, 5 Aug 2011 11:46:09 +0000 (04:46 -0700)]
Merge "Clear all notifications on tablet actually works now."
Daniel Sandler [Fri, 5 Aug 2011 11:45:53 +0000 (04:45 -0700)]
Merge "Instrumentation to track notification panel touch bugs."
satok [Fri, 5 Aug 2011 10:59:06 +0000 (03:59 -0700)]
Merge "API cleanup for the spell checker framework"
Jim Miller [Fri, 5 Aug 2011 06:26:48 +0000 (23:26 -0700)]
Merge "Fix
5117544: Fix crash in KeyguardStatusViewManager when resId==0"
Daniel Sandler [Fri, 5 Aug 2011 02:15:49 +0000 (19:15 -0700)]
Merge "Fix another NPE."
The Android Open Source Project [Fri, 5 Aug 2011 01:46:02 +0000 (18:46 -0700)]
Reconcile with gingerbread-release gingerbread-mr4-release
Change-Id: I4ef90a9d38940c8484c030056157a99a103f6aa9
Tsu Chiang Chuang [Fri, 5 Aug 2011 01:34:53 +0000 (18:34 -0700)]
Merge "Bandwidth microbenchmark test app for ICS."
Adam Powell [Fri, 5 Aug 2011 01:32:18 +0000 (18:32 -0700)]
Merge "Fix bug
5118908 - ImageView.setImageDrawable always requests layout"
Amith Yamasani [Fri, 5 Aug 2011 01:25:32 +0000 (18:25 -0700)]
Merge "Don't call onQueryTextChanged more often than necessary."
Jim Miller [Fri, 5 Aug 2011 01:06:03 +0000 (18:06 -0700)]
Merge "Fix
5045008: replace "ring/silence" target in LockScreen with camera app"
Jeff Sharkey [Fri, 5 Aug 2011 00:33:19 +0000 (17:33 -0700)]
Merge "Data cycle ends on last second of month."
Gloria Wang [Thu, 4 Aug 2011 23:32:10 +0000 (16:32 -0700)]
Merge "Close the DRM session in the destructor of ChromiumHTTPDataSource. Fix for bug
5015079."
Wink Saville [Thu, 4 Aug 2011 23:11:41 +0000 (16:11 -0700)]
am
090df1dc: Merge "Delay connectivity change notifications." into honeycomb-LTE
* commit '
090df1dc4188e5b9ef10a0aca5081a196085ff56':
Delay connectivity change notifications.
Wink Saville [Thu, 4 Aug 2011 23:10:11 +0000 (16:10 -0700)]
Merge "Delay connectivity change notifications." into honeycomb-LTE
Chet Haase [Thu, 4 Aug 2011 22:47:21 +0000 (15:47 -0700)]
Merge "Fix AnimatorSet cancellation issues"
Jeff Sharkey [Thu, 4 Aug 2011 22:39:24 +0000 (15:39 -0700)]
Merge "Network stats with varint, omit parcel fields."
Steve Block [Thu, 4 Aug 2011 22:36:04 +0000 (15:36 -0700)]
am
03f8fcb8: (-s ours) am
c4d93ba5: Cherry-pick DeviceMotionService CL from master [do not merge]
* commit '
03f8fcb8b017556df08d9926f8ca41b383c5ad08':
Cherry-pick DeviceMotionService CL from master [do not merge]
Irfan Sheriff [Thu, 4 Aug 2011 22:34:47 +0000 (15:34 -0700)]
Merge "Rewrote DnsPinger - now is async and concurrant"
Gloria Wang [Thu, 4 Aug 2011 22:33:12 +0000 (15:33 -0700)]
Merge "resolved conflicts for merge of
845fdba7 to master"
Andreas Huber [Thu, 4 Aug 2011 22:20:24 +0000 (15:20 -0700)]
Merge "Eliminate superfluous memcpys by wrapping an ABuffer in a MediaBuffer"
Gloria Wang [Thu, 4 Aug 2011 22:13:14 +0000 (15:13 -0700)]
resolved conflicts for merge of
845fdba7 to master
Change-Id: I716b6ceb03bd733f9e7f49008112c8f2c53ad9ce
Steve Block [Thu, 4 Aug 2011 21:49:44 +0000 (14:49 -0700)]
am
c4d93ba5: Cherry-pick DeviceMotionService CL from master [do not merge]
* commit '
c4d93ba55fbe905fa72ee7a068efd7c5fb4e8257':
Cherry-pick DeviceMotionService CL from master [do not merge]
Gloria Wang [Thu, 4 Aug 2011 21:47:43 +0000 (14:47 -0700)]
am
8a6fb50d: am
4e197ea8: am
e15a73ee: Merge "Bug fixes in OMA DRM v1 Forward Lock Agent"
* commit '
8a6fb50d69ec40a413b117bc9145a97ec427852f':
Bug fixes in OMA DRM v1 Forward Lock Agent
Gloria Wang [Thu, 4 Aug 2011 21:36:45 +0000 (14:36 -0700)]
am
4e197ea8: am
e15a73ee: Merge "Bug fixes in OMA DRM v1 Forward Lock Agent"
* commit '
4e197ea8a6c5d5f4393a474591cccdd3fa27ecde':
Bug fixes in OMA DRM v1 Forward Lock Agent
Gloria Wang [Thu, 4 Aug 2011 21:33:06 +0000 (14:33 -0700)]
am
e15a73ee: Merge "Bug fixes in OMA DRM v1 Forward Lock Agent"
* commit '
e15a73ee4c9a28d89888095c7649a70c116ee160':
Bug fixes in OMA DRM v1 Forward Lock Agent
Gloria Wang [Thu, 4 Aug 2011 21:20:53 +0000 (14:20 -0700)]
Merge "Bug fixes in OMA DRM v1 Forward Lock Agent"
Jean-Michel Trivi [Thu, 4 Aug 2011 21:10:57 +0000 (14:10 -0700)]
Merge "Remove empty remote control client listener methods"
Adam Powell [Thu, 4 Aug 2011 20:21:07 +0000 (13:21 -0700)]
Merge "Fix bug
5121406 - ActionBar.setLogo"
Chia-chi Yeh [Thu, 4 Aug 2011 20:04:51 +0000 (13:04 -0700)]
Merge "VPN: move away from the VPN permission."
Andreas Huber [Thu, 4 Aug 2011 19:57:45 +0000 (12:57 -0700)]
Merge "Restart HLS streaming from the bottom of the playlist if we miss the boat on the"
Xavier Ducrohet [Thu, 4 Aug 2011 19:56:46 +0000 (12:56 -0700)]
am
23ce76ce: am
320834c9: am
b9e8b25e: am
6b3a0123: Merge "Insert a break wraparound."
* commit '
23ce76ce1666e5e8b0b17825c271b133ba2626d6':
Insert a break wraparound.
Xavier Ducrohet [Thu, 4 Aug 2011 19:54:49 +0000 (12:54 -0700)]
am
320834c9: am
b9e8b25e: am
6b3a0123: Merge "Insert a break wraparound."
* commit '
320834c9e02364b39b98b610f1d2244cbb9a4f26':
Insert a break wraparound.
Xavier Ducrohet [Thu, 4 Aug 2011 19:52:34 +0000 (12:52 -0700)]
am
b9e8b25e: am
6b3a0123: Merge "Insert a break wraparound."
* commit '
b9e8b25e9066d6f2da0635eaac524246b729fbfa':
Insert a break wraparound.
Xavier Ducrohet [Thu, 4 Aug 2011 19:50:11 +0000 (12:50 -0700)]
am
6b3a0123: Merge "Insert a break wraparound."
* commit '
6b3a0123486e729aca7e7de0c3a78c4c3300d0c9':
Insert a break wraparound.
Xavier Ducrohet [Thu, 4 Aug 2011 19:36:11 +0000 (12:36 -0700)]
Merge "Insert a break wraparound."
Xavier Ducrohet [Thu, 4 Aug 2011 19:18:17 +0000 (12:18 -0700)]
Merge "Layoutlib: implement Resources.getBoolean(int)."
Adam Powell [Thu, 4 Aug 2011 17:51:57 +0000 (10:51 -0700)]
Merge "Fix bug
5073637 - Market apps crashing FastScroller"
Irfan Sheriff [Thu, 4 Aug 2011 17:29:23 +0000 (10:29 -0700)]
Merge "Fix p2p package paths"
Fabrice Di Meglio [Thu, 4 Aug 2011 17:09:24 +0000 (10:09 -0700)]
Merge "Fix bug #
5114358 If writing Numbers with Hebrew & Arabic keyboard, they appear as LTR"
Daniel Sandler [Thu, 4 Aug 2011 16:56:53 +0000 (09:56 -0700)]
Merge "Log some signal condition diagnostics for now."
Daniel Sandler [Thu, 4 Aug 2011 16:46:45 +0000 (09:46 -0700)]
Merge "Crushing Dreams."
Mike Lockwood [Thu, 4 Aug 2011 16:46:09 +0000 (09:46 -0700)]
Merge "Resolve merge conflict for '
75f1fdec':"
OSDN Git Service
