OSDN Git Service
Justin Ho [Mon, 17 Oct 2011 14:07:16 +0000 (07:07 -0700)]
am
ccf29b4c: Merge "Updating numberpicker assets" into ics-mr0
* commit '
ccf29b4c03422a858a2fcc644e3d2ecbcc555208':
Updating numberpicker assets
Justin Ho [Mon, 17 Oct 2011 14:07:14 +0000 (07:07 -0700)]
am
a6389a9c: Merge "Updated codelock assets" into ics-mr0
* commit '
a6389a9c1e1a50fe040961dfead76102b530b149':
Updated codelock assets
Justin Ho [Mon, 17 Oct 2011 14:07:11 +0000 (07:07 -0700)]
am
af951c17: Merge "Update presence away asset" into ics-mr0
* commit '
af951c17e75b378a382dc4e7fefa7464f7bdfddb':
Update presence away asset
Justin Ho [Mon, 17 Oct 2011 14:07:10 +0000 (07:07 -0700)]
am
52670cd4: Merge "Update list selector background (disabled state)" into ics-mr0
* commit '
52670cd4f73aa28a72dc1df4e7fa92fb0d972781':
Update list selector background (disabled state)
Justin Ho [Mon, 17 Oct 2011 14:07:08 +0000 (07:07 -0700)]
am
3c2bbc24: Merge "Update share pack assets" into ics-mr0
* commit '
3c2bbc2406e491b11e16b9f8bb0495d433097d52':
Update share pack assets
Scott Main [Mon, 17 Oct 2011 14:07:05 +0000 (07:07 -0700)]
am
8009752d: Merge "fix android beam demo path" into ics-mr0
* commit '
8009752da64f5c6ec4df4f1737032bba74ebb2a4':
fix android beam demo path
Justin Ho [Mon, 17 Oct 2011 14:07:04 +0000 (07:07 -0700)]
am
686420a4: Merge "Update rating star buttons" into ics-mr0
* commit '
686420a40e2bfd7c701cba9748d4771315dcd1cc':
Update rating star buttons
Justin Ho [Mon, 17 Oct 2011 14:07:02 +0000 (07:07 -0700)]
am
cd8f69dd: Merge "Update unlock halo asset" into ics-mr0
* commit '
cd8f69dd84306267db23426c538f86b577d82511':
Update unlock halo asset
Justin Ho [Mon, 17 Oct 2011 14:07:00 +0000 (07:07 -0700)]
am
269c64de: Merge "Update lockscreen assets" into ics-mr0
* commit '
269c64de8817e158e9ae49ea489344fbfc46f160':
Update lockscreen assets
Justin Ho [Mon, 17 Oct 2011 14:06:57 +0000 (07:06 -0700)]
am
41c5a607: Merge "Update bullet permission asset" into ics-mr0
* commit '
41c5a607498b8922105ba9dfeb6adf8dd0a82050':
Update bullet permission asset
Steve Block [Mon, 17 Oct 2011 09:30:41 +0000 (02:30 -0700)]
Merge "Improve documentation for WebChromeClient.onCreateWindow()"
Steve Block [Mon, 17 Oct 2011 09:30:00 +0000 (02:30 -0700)]
Merge "Clean up documentation for WebView.loadUrl()"
Alex Sakhartchouk [Sun, 16 Oct 2011 19:13:18 +0000 (12:13 -0700)]
Merge "Adding getter functions for script side RS objects. Multiproject change involving on device linker"
Jeff Brown [Sat, 15 Oct 2011 04:06:31 +0000 (21:06 -0700)]
Merge "Use MatrixCursor instead of ArrayListCursor."
Jeff Brown [Sat, 15 Oct 2011 04:06:22 +0000 (21:06 -0700)]
Merge "Add a CrossProcessCursorWrapper. Bug:
5220669"
Jeff Brown [Sat, 15 Oct 2011 04:06:15 +0000 (21:06 -0700)]
Merge "AbstractWindowedCursor is not special."
Jeff Brown [Sat, 15 Oct 2011 04:06:08 +0000 (21:06 -0700)]
Merge "Make default implementation of fillWindow typesafe. Bug:
5218310"
Jeff Brown [Sat, 15 Oct 2011 04:05:58 +0000 (21:05 -0700)]
Merge "Deprecate local-only CursorWindows."
Romain Guy [Fri, 14 Oct 2011 22:48:40 +0000 (15:48 -0700)]
Merge "Disable hardware acceleration for apps in compatibility mode"
Justin Ho [Fri, 14 Oct 2011 21:41:45 +0000 (14:41 -0700)]
Merge "Updating numberpicker assets" into ics-mr0
Justin Ho [Fri, 14 Oct 2011 21:41:37 +0000 (14:41 -0700)]
Merge "Updated codelock assets" into ics-mr0
Justin Ho [Fri, 14 Oct 2011 21:41:28 +0000 (14:41 -0700)]
Merge "Update presence away asset" into ics-mr0
Justin Ho [Fri, 14 Oct 2011 21:36:03 +0000 (14:36 -0700)]
Merge "Update list selector background (disabled state)" into ics-mr0
Justin Ho [Fri, 14 Oct 2011 21:35:54 +0000 (14:35 -0700)]
Merge "Update share pack assets" into ics-mr0
Scott Main [Fri, 14 Oct 2011 21:31:09 +0000 (14:31 -0700)]
Merge "fix android beam demo path" into ics-mr0
Justin Ho [Fri, 14 Oct 2011 21:26:58 +0000 (14:26 -0700)]
Merge "Update rating star buttons" into ics-mr0
Justin Ho [Fri, 14 Oct 2011 21:23:41 +0000 (14:23 -0700)]
Merge "Update unlock halo asset" into ics-mr0
Justin Ho [Fri, 14 Oct 2011 21:17:26 +0000 (14:17 -0700)]
Merge "Update lockscreen assets" into ics-mr0
Justin Ho [Fri, 14 Oct 2011 21:12:02 +0000 (14:12 -0700)]
Merge "Update bullet permission asset" into ics-mr0
Stephen Hines [Fri, 14 Oct 2011 21:02:43 +0000 (14:02 -0700)]
Merge "Make launchtestxlw use constant."
Justin Ho [Fri, 14 Oct 2011 21:00:38 +0000 (14:00 -0700)]
am
e95aaf06: Merge "Update indicator_code lock assets" into ics-mr0
* commit '
e95aaf06fba2766521aac24ee252db289ce2e1ef':
Update indicator_code lock assets
Justin Ho [Fri, 14 Oct 2011 20:58:52 +0000 (13:58 -0700)]
Merge "Update indicator_code lock assets" into ics-mr0
Justin Ho [Fri, 14 Oct 2011 20:58:15 +0000 (13:58 -0700)]
am
8b319150: Merge "Update text select handles" into ics-mr0
* commit '
8b3191506bf646b9a0568b8e523eb794796b2c20':
Update text select handles
Justin Ho [Fri, 14 Oct 2011 20:58:13 +0000 (13:58 -0700)]
am
048e5c80: Merge "Update spinners" into ics-mr0
* commit '
048e5c804ed07249ba59372df384c0977ca9b8df':
Update spinners
Justin Ho [Fri, 14 Oct 2011 20:55:57 +0000 (13:55 -0700)]
am
4a6f76da: Merge "Updated scrubber_control assets" into ics-mr0
* commit '
4a6f76da2326c351c6094050761571d229da178d':
Updated scrubber_control assets
Justin Ho [Fri, 14 Oct 2011 20:55:56 +0000 (13:55 -0700)]
am
64ba25de: Merge "Update fastscroll" into ics-mr0
* commit '
64ba25de51d0b0b35012acc2a30014e8cb0ede53':
Update fastscroll
Justin Ho [Fri, 14 Oct 2011 20:55:54 +0000 (13:55 -0700)]
am
3cc6f5b4: Merge "Update checkboxes" into ics-mr0
* commit '
3cc6f5b447ae8af9b09568fd0c686a5533e229f9':
Update checkboxes
Justin Ho [Fri, 14 Oct 2011 20:55:08 +0000 (13:55 -0700)]
Merge "Update text select handles" into ics-mr0
Justin Ho [Fri, 14 Oct 2011 20:54:58 +0000 (13:54 -0700)]
Merge "Update spinners" into ics-mr0
Justin Ho [Fri, 14 Oct 2011 20:53:25 +0000 (13:53 -0700)]
am
3b89e3a5: Merge "Updating rating stars" into ics-mr0
* commit '
3b89e3a51f9d8e763f669dd1be88104ba7c8e9a0':
Updating rating stars
Justin Ho [Fri, 14 Oct 2011 20:53:08 +0000 (13:53 -0700)]
Merge "Updated scrubber_control assets" into ics-mr0
Justin Ho [Fri, 14 Oct 2011 20:52:57 +0000 (13:52 -0700)]
Merge "Update fastscroll" into ics-mr0
Justin Ho [Fri, 14 Oct 2011 20:52:45 +0000 (13:52 -0700)]
Merge "Update checkboxes" into ics-mr0
Justin Ho [Fri, 14 Oct 2011 20:51:25 +0000 (13:51 -0700)]
Merge "Updating rating stars" into ics-mr0
Jack Palevich [Fri, 14 Oct 2011 20:35:10 +0000 (13:35 -0700)]
Merge "Work around race condition when shutting down a surface flinger surface."
Martijn Coenen [Fri, 14 Oct 2011 20:00:45 +0000 (13:00 -0700)]
am
202b38cb: Merge "Remove NfcFragment from activity when no longer sharing." into ics-mr0
* commit '
202b38cb71d123e4ebc8741643e84fa455ecd002':
Remove NfcFragment from activity when no longer sharing.
Eric Laurent [Fri, 14 Oct 2011 19:58:40 +0000 (12:58 -0700)]
am
615858a8: Merge "Indicate screen off condition to audio framework." into ics-mr0
* commit '
615858a8ebb12b3541fd709e6e965ac814880261':
Indicate screen off condition to audio framework.
Jamie Gennis [Fri, 14 Oct 2011 19:58:37 +0000 (12:58 -0700)]
am
a1e273ae: Merge "Surface: fix a protected buffer test" into ics-mr0
* commit '
a1e273ae590ee08cf27baca7facfce51e598d995':
Surface: fix a protected buffer test
Martijn Coenen [Fri, 14 Oct 2011 19:57:34 +0000 (12:57 -0700)]
Merge "Remove NfcFragment from activity when no longer sharing." into ics-mr0
Eric Laurent [Fri, 14 Oct 2011 19:56:52 +0000 (12:56 -0700)]
Merge "Indicate screen off condition to audio framework." into ics-mr0
Jamie Gennis [Fri, 14 Oct 2011 19:56:28 +0000 (12:56 -0700)]
Merge "Surface: fix a protected buffer test" into ics-mr0
Daniel Sandler [Fri, 14 Oct 2011 19:24:40 +0000 (12:24 -0700)]
am
7362e0d8: Merge "Adjust text sizes for better behavior under user scaling." into ics-mr0
* commit '
7362e0d8fe6bd6739dbd22c2ad4c2c7fb0f7c1d4':
Adjust text sizes for better behavior under user scaling.
Daniel Sandler [Fri, 14 Oct 2011 19:22:07 +0000 (12:22 -0700)]
Merge "Adjust text sizes for better behavior under user scaling." into ics-mr0
Scott Main [Fri, 14 Oct 2011 19:15:05 +0000 (12:15 -0700)]
am
c02c33e5: Merge "docs: misc changes to overview and add known issues link to sdk tools notes" into ics-mr0
* commit '
c02c33e5bb13cc2a740d01ba979cce20adcd8128':
docs: misc changes to overview and add known issues link to sdk tools notes
Scott Main [Fri, 14 Oct 2011 19:12:53 +0000 (12:12 -0700)]
Merge "docs: misc changes to overview and add known issues link to sdk tools notes" into ics-mr0
satok [Fri, 14 Oct 2011 18:16:57 +0000 (11:16 -0700)]
am
e6fee18d: Merge "Invalidate SuggestionSpan with FLAG_AUTO_CORRECTION when it\'s removed." into ics-mr0
* commit '
e6fee18d16a86c266afef48f7705268435a99111':
Invalidate SuggestionSpan with FLAG_AUTO_CORRECTION when it's removed.
satok [Fri, 14 Oct 2011 18:15:05 +0000 (11:15 -0700)]
Merge "Invalidate SuggestionSpan with FLAG_AUTO_CORRECTION when it's removed." into ics-mr0
Jim Miller [Fri, 14 Oct 2011 18:12:41 +0000 (11:12 -0700)]
Gilles Debunne [Fri, 14 Oct 2011 18:09:59 +0000 (11:09 -0700)]
Merge "Bug
5420741: exception when rotating device while suggestion popup is visible"
Gilles Debunne [Fri, 14 Oct 2011 18:09:44 +0000 (11:09 -0700)]
Merge "Spell checher's language synced with keyboard."
Joe Fernandez [Fri, 14 Oct 2011 17:54:29 +0000 (10:54 -0700)]
am
471fa9d1: Merge "docs: add developer guide cross-references, Project ACRE, Round 2" into ics-mr0
* commit '
471fa9d10b4fa4da070c0ffb5fa5ea1354c8e6b8':
docs: add developer guide cross-references, Project ACRE, Round 2
Joe Fernandez [Fri, 14 Oct 2011 17:52:33 +0000 (10:52 -0700)]
Merge "docs: add developer guide cross-references, Project ACRE, Round 2" into ics-mr0
The Android Open Source Project [Fri, 14 Oct 2011 17:52:16 +0000 (10:52 -0700)]
Reconcile with ics-mr0-release
Change-Id: I53af9dda1856406a193e3def554e576553d9e868
Christopher Tate [Fri, 14 Oct 2011 17:35:40 +0000 (10:35 -0700)]
am
8f4e49a8: (-s ours) Merge "DO NOT MERGE - Require device encryption password for adb backup/restore" into ics-mr0
* commit '
8f4e49a8fe4f568b2be090768f3297655ecd6d34':
DO NOT MERGE - Require device encryption password for adb backup/restore
Amith Yamasani [Fri, 14 Oct 2011 17:33:29 +0000 (10:33 -0700)]
am
00005385: Merge "Use ringer assets for notification volume since the two volumes are tied." into ics-mr0
* commit '
000053859290d322625dfcbdb0467fc34d5e55f4':
Use ringer assets for notification volume since the two volumes are tied.
Christopher Tate [Fri, 14 Oct 2011 17:33:13 +0000 (10:33 -0700)]
Merge "DO NOT MERGE - Require device encryption password for adb backup/restore" into ics-mr0
Scott Main [Fri, 14 Oct 2011 17:31:24 +0000 (10:31 -0700)]
am
33210ec1: Merge "change android beam sample name" into ics-mr0
* commit '
33210ec1f5c8364c4865c718f4d0de00e28b5774':
change android beam sample name
Amith Yamasani [Fri, 14 Oct 2011 17:30:43 +0000 (10:30 -0700)]
Merge "Use ringer assets for notification volume since the two volumes are tied." into ics-mr0
Scott Main [Fri, 14 Oct 2011 17:29:53 +0000 (10:29 -0700)]
Merge "change android beam sample name" into ics-mr0
Jim Miller [Fri, 14 Oct 2011 17:20:48 +0000 (10:20 -0700)]
am
1a59c7e3: Merge "Fix
5358124: Better transport control visibility management in lock screen" into ics-mr0
* commit '
1a59c7e3973cd2de23e45afde1a5e8fdd8a2d30f':
Fix
5358124: Better transport control visibility management in lock screen
Jim Miller [Fri, 14 Oct 2011 17:19:13 +0000 (10:19 -0700)]
Merge "Fix
5358124: Better transport control visibility management in lock screen" into ics-mr0
Daniel Sandler [Fri, 14 Oct 2011 17:18:33 +0000 (10:18 -0700)]
am
ed37b1bf: Merge "Shrink the ticker\'s icon to match the status bar." into ics-mr0
* commit '
ed37b1bf73ae274da6e50194c824a669fcecb5c0':
Shrink the ticker's icon to match the status bar.
Peter Ng [Fri, 14 Oct 2011 17:16:30 +0000 (10:16 -0700)]
am
43642ab9: Merge "Stat icons for phone are now the right size" into ics-mr0
* commit '
43642ab9322b90613c496785ae459b64bf9aea4a':
Stat icons for phone are now the right size
Daniel Sandler [Fri, 14 Oct 2011 17:16:14 +0000 (10:16 -0700)]
Merge "Shrink the ticker's icon to match the status bar." into ics-mr0
Peter Ng [Fri, 14 Oct 2011 17:15:08 +0000 (10:15 -0700)]
Merge "Stat icons for phone are now the right size" into ics-mr0
John Reck [Fri, 14 Oct 2011 17:12:14 +0000 (10:12 -0700)]
am
d82cc1de: Merge "Fixup JNI" into ics-mr0
* commit '
d82cc1de848a678fa4bcaefdbc763307f3df4a75':
Fixup JNI
John Reck [Fri, 14 Oct 2011 17:10:07 +0000 (10:10 -0700)]
Merge "Fixup JNI" into ics-mr0
Jean-Michel Trivi [Fri, 14 Oct 2011 16:02:49 +0000 (09:02 -0700)]
am
9ad680ca: Merge "Fix
5380695 Lockscreen transport control must reflect error state" into ics-mr0
* commit '
9ad680ca2be19679c355de9526d79ded2887ea97':
Fix
5380695 Lockscreen transport control must reflect error state
Jean-Michel Trivi [Fri, 14 Oct 2011 16:01:08 +0000 (09:01 -0700)]
Merge "Fix
5380695 Lockscreen transport control must reflect error state" into ics-mr0
Jean-Michel Trivi [Fri, 14 Oct 2011 15:46:09 +0000 (08:46 -0700)]
am
b9c9cf65: Merge "Fix
5367082 correct assets for "next" and "previous" in lockscreen" into ics-mr0
* commit '
b9c9cf65308ed66ef825ecb485385d2b94e40f2c':
Fix
5367082 correct assets for "next" and "previous" in lockscreen
Jean-Michel Trivi [Fri, 14 Oct 2011 15:46:08 +0000 (08:46 -0700)]
am
e48440d5: Merge "Fix
5153611 remove remote control client/display log from AudioService" into ics-mr0
* commit '
e48440d59a52c0f13166da2fd32023356d9215d9':
Fix
5153611 remove remote control client/display log from AudioService
Jean-Michel Trivi [Fri, 14 Oct 2011 15:44:50 +0000 (08:44 -0700)]
Merge "Fix
5367082 correct assets for "next" and "previous" in lockscreen" into ics-mr0
Jean-Michel Trivi [Fri, 14 Oct 2011 15:44:15 +0000 (08:44 -0700)]
Merge "Fix
5153611 remove remote control client/display log from AudioService" into ics-mr0
Mathew Inwood [Fri, 14 Oct 2011 13:35:26 +0000 (06:35 -0700)]
Merge "Allow setting of source bounds on global search intents."
Scott Main [Fri, 14 Oct 2011 12:01:56 +0000 (05:01 -0700)]
am
23b80f08: Merge "docs: add new screenshots for hc gallery sample" into ics-mr0
* commit '
23b80f083b0a2ccd26f37298d4f9611de3857a31':
docs: add new screenshots for hc gallery sample
Scott Main [Fri, 14 Oct 2011 11:28:05 +0000 (04:28 -0700)]
am
6b1531ee: Merge "docs: preliminary homepage announcement (offline version)" into ics-mr0
* commit '
6b1531eec06abebb0c786556e12411fbef5a0f62':
docs: preliminary homepage announcement (offline version)
Scott Main [Fri, 14 Oct 2011 11:19:36 +0000 (04:19 -0700)]
Merge "docs: add new screenshots for hc gallery sample" into ics-mr0
Scott Main [Fri, 14 Oct 2011 11:00:03 +0000 (04:00 -0700)]
Merge "docs: preliminary homepage announcement (offline version)" into ics-mr0
Scott Main [Fri, 14 Oct 2011 10:49:33 +0000 (03:49 -0700)]
am
e1e9e937: docs: revisions to ics api overview
* commit '
e1e9e9379dc1236e15bd379f2bdc871c096a882c':
docs: revisions to ics api overview
Steven Ross [Fri, 14 Oct 2011 04:04:15 +0000 (21:04 -0700)]
am
34068869: Merge "Making FaceUnlock not pop up for overlays Fixes
5451837 Fixes
5446341" into ics-mr0
* commit '
3406886939b0f28c426acefbe9dc77292210d8b4':
Making FaceUnlock not pop up for overlays Fixes
5451837 Fixes
5446341
Steven Ross [Fri, 14 Oct 2011 04:02:15 +0000 (21:02 -0700)]
Merge "Making FaceUnlock not pop up for overlays Fixes
5451837 Fixes
5446341" into ics-mr0
Brian Colonna [Fri, 14 Oct 2011 03:03:55 +0000 (20:03 -0700)]
am
2ce6882b: Fixed problem where Face Unlock area was showing
* commit '
2ce6882bb498c93af114626daa79cfa4f3f4e366':
Fixed problem where Face Unlock area was showing
Brian Colonna [Fri, 14 Oct 2011 01:21:50 +0000 (18:21 -0700)]
am
3505abf3: Merge "Fix
5451144: Poking wakelock upon fallback" into ics-mr0
* commit '
3505abf31df8dafab2c83ceb8f85b5694cac3b78':
Fix
5451144: Poking wakelock upon fallback
Brian Colonna [Fri, 14 Oct 2011 01:19:30 +0000 (18:19 -0700)]
Merge "Fix
5451144: Poking wakelock upon fallback" into ics-mr0
Wink Saville [Fri, 14 Oct 2011 00:42:58 +0000 (17:42 -0700)]
am
8a058cbf: Merge "In releaseWifiLockLocked call noteReleaseWifiLock." into ics-mr0
* commit '
8a058cbf12c590db810fe8d9fab6f4f614909329':
In releaseWifiLockLocked call noteReleaseWifiLock.
Wink Saville [Fri, 14 Oct 2011 00:40:01 +0000 (17:40 -0700)]
Merge "In releaseWifiLockLocked call noteReleaseWifiLock." into ics-mr0
Kenny Root [Fri, 14 Oct 2011 00:12:35 +0000 (17:12 -0700)]
am
22dad40d: Merge "Add support for signature in getPackageArchiveInfo" into ics-mr0
* commit '
22dad40d3e8ce54a00f337ea06b9b0bbfbd3fd6b':
Add support for signature in getPackageArchiveInfo
Kenny Root [Fri, 14 Oct 2011 00:10:17 +0000 (17:10 -0700)]
Merge "Add support for signature in getPackageArchiveInfo" into ics-mr0
Peter Ng [Thu, 13 Oct 2011 23:58:03 +0000 (16:58 -0700)]
am
dcb4e158: (-s ours) Merge "Do Not Merge darker notification press state and divider" into ics-mr0
* commit '
dcb4e158bcddb8266afaf863ae8832b92bed62a7':
Do Not Merge darker notification press state and divider
The Android Automerger [Thu, 13 Oct 2011 23:57:44 +0000 (16:57 -0700)]
merge in ics-mr0-release history after reset to ics-mr0
OSDN Git Service
