OSDN Git Service
Dianne Hackborn [Thu, 16 Feb 2012 22:43:43 +0000 (14:43 -0800)]
am
06a591cd: Fix last change -- don\'t call startInputInner() with lock held.
* commit '
06a591cdd6d90600db006906d5d1524d156d6529':
Fix last change -- don't call startInputInner() with lock held.
The Android Open Source Project [Thu, 16 Feb 2012 18:10:13 +0000 (10:10 -0800)]
Reconcile with ics-mr1-release
Change-Id: I7c4496218c25c8d2b0271782ad08b4b63055ed92
The Android Automerger [Thu, 16 Feb 2012 17:40:11 +0000 (09:40 -0800)]
merge in ics-mr1-release history after reset to ics-mr1
Justin Ho [Thu, 16 Feb 2012 17:28:12 +0000 (09:28 -0800)]
am
e8e0527a: Merge "Update WiMAX notification icons Bug:
5724605" into ics-mr1
* commit '
e8e0527aa699c7db999b659b044d16cea6c67901':
Update WiMAX notification icons Bug:
5724605
Justin Ho [Thu, 16 Feb 2012 17:27:05 +0000 (09:27 -0800)]
Merge "Update WiMAX notification icons Bug:
5724605" into ics-mr1
Justin Ho [Thu, 16 Feb 2012 17:25:03 +0000 (09:25 -0800)]
am
c470b2dd: Merge "Part of fixing issue #
6006757: Keyboard dismissal lags" into ics-mr1
* commit '
c470b2dd49ae2c4894de22f7bdd9f91af1a085f8':
Part of fixing issue #
6006757: Keyboard dismissal lags
Justin Ho [Thu, 16 Feb 2012 17:23:01 +0000 (09:23 -0800)]
Merge "Part of fixing issue #
6006757: Keyboard dismissal lags" into ics-mr1
Scott Main [Thu, 16 Feb 2012 01:33:15 +0000 (17:33 -0800)]
am
2a1d1917: Merge "docs: move USB installation info into the OEM USB Drivers document because the Google USB Driver is deprecated, so consolidating the USB info makes more sense for the common case of needing an OEM driver A few changes to the device setup doc also;
* commit '
2a1d19174e32bb6056086ec603948cd476a2ea67':
docs: move USB installation info into the OEM USB Drivers document because the Google USB Driver is deprecated, so consolidating the USB info makes more sense for the common case of needing an OEM driver A few changes to the device setup doc also; such as removing the "unknown sources" step, because that doesn't apply to adb installs.
Scott Main [Thu, 16 Feb 2012 01:31:54 +0000 (17:31 -0800)]
Merge "docs: move USB installation info into the OEM USB Drivers document because the Google USB Driver is deprecated, so consolidating the USB info makes more sense for the common case of needing an OEM driver A few changes to the device setup doc also; such as removing the "unknown sources" step, because that doesn't apply to adb installs." into ics-mr1
Scott Main [Wed, 15 Feb 2012 21:26:27 +0000 (13:26 -0800)]
am
26703326: docs: Google+ badge now sizes properly; remove reposition hack
* commit '
26703326784a6de45830236bd0a97345f93448d4':
docs: Google+ badge now sizes properly; remove reposition hack
The Android Automerger [Tue, 14 Feb 2012 22:15:44 +0000 (14:15 -0800)]
merge in ics-mr1-release history after reset to ics-mr1
Robert Greenwalt [Tue, 14 Feb 2012 21:39:55 +0000 (13:39 -0800)]
am
c8711ca7: Merge "Stop using shared DUN APN when tethering stops." into ics-mr1
* commit '
c8711ca7eb962072ccd6175be3cfa861195ba6cd':
Stop using shared DUN APN when tethering stops.
Robert Greenwalt [Tue, 14 Feb 2012 21:39:53 +0000 (13:39 -0800)]
am
fc19160a: Merge "Add a config to set Dun capabilities." into ics-mr1
* commit '
fc19160a6a464eb71e50794fc1aa1e99c4173e31':
Add a config to set Dun capabilities.
Robert Greenwalt [Tue, 14 Feb 2012 21:38:15 +0000 (13:38 -0800)]
Merge "Stop using shared DUN APN when tethering stops." into ics-mr1
Robert Greenwalt [Tue, 14 Feb 2012 21:37:44 +0000 (13:37 -0800)]
Merge "Add a config to set Dun capabilities." into ics-mr1
Justin Ho [Tue, 14 Feb 2012 21:31:28 +0000 (13:31 -0800)]
am
c312ba32: Merge "Update 4G WiMAX assets for notification area as well Bug:
5724605" into ics-mr1
* commit '
c312ba322b5f204753a2ad8e40062c26114a15d8':
Update 4G WiMAX assets for notification area as well Bug:
5724605
Justin Ho [Tue, 14 Feb 2012 21:29:08 +0000 (13:29 -0800)]
Merge "Update 4G WiMAX assets for notification area as well Bug:
5724605" into ics-mr1
Joe Fernandez [Tue, 14 Feb 2012 20:37:43 +0000 (12:37 -0800)]
am
835e07f8: Merge "docs: Android NDK r7b Release Notes" into ics-mr1
* commit '
835e07f8f437e1872451dd23c0faf925388e1aef':
docs: Android NDK r7b Release Notes
Mike Lockwood [Tue, 14 Feb 2012 20:37:40 +0000 (12:37 -0800)]
am
ffc89899: Merge "Don\'t pulse LED on new notification unless notification has LED flag set" into ics-mr1
* commit '
ffc89899652f5c815b6d156f55a909001420891e':
Don't pulse LED on new notification unless notification has LED flag set
John Wang [Tue, 14 Feb 2012 20:37:38 +0000 (12:37 -0800)]
am
63b59666: Merge "Only use CDMA rssi for config_alwaysUseCdmaRssi." into ics-mr1
* commit '
63b596664c3fdb70ad32c8f641f477ec9140d6ec':
Only use CDMA rssi for config_alwaysUseCdmaRssi.
Joe Fernandez [Tue, 14 Feb 2012 20:05:25 +0000 (12:05 -0800)]
Merge "docs: Android NDK r7b Release Notes" into ics-mr1
Mike Lockwood [Tue, 14 Feb 2012 19:30:05 +0000 (11:30 -0800)]
Merge "Don't pulse LED on new notification unless notification has LED flag set" into ics-mr1
John Wang [Tue, 14 Feb 2012 18:09:26 +0000 (10:09 -0800)]
Merge "Only use CDMA rssi for config_alwaysUseCdmaRssi." into ics-mr1
Ramanan Rajeswaran [Mon, 13 Feb 2012 22:22:44 +0000 (14:22 -0800)]
Merge "DO NOT MERGE" into ics-scoop
Ramanan Rajeswaran [Mon, 13 Feb 2012 21:53:39 +0000 (13:53 -0800)]
DO NOT MERGE
Revert "Add xxhdpi; fix ActivityManager.getLauncherLargeIconSize() etc."
This reverts commit
c1496d2d9a496e4aba817a58ecb9e07fe55cdba5.
Change-Id: If60df742b19c925cc99b20d01108b84415b124ad
Tsu Chiang Chuang [Mon, 13 Feb 2012 21:42:45 +0000 (13:42 -0800)]
am
08eb7dd6: Merge "extending timeout to stabilize tests" into ics-mr1
* commit '
08eb7dd630a2de8dd51a988a747da26ff9d3f8fb':
extending timeout to stabilize tests
Tsu Chiang Chuang [Mon, 13 Feb 2012 21:41:37 +0000 (13:41 -0800)]
Merge "extending timeout to stabilize tests" into ics-mr1
Dianne Hackborn [Wed, 25 Jan 2012 23:12:23 +0000 (15:12 -0800)]
Add xxhdpi; fix ActivityManager.getLauncherLargeIconSize() etc.
Change-Id: I519d6cdc527a402d93b98df17a64fc1da52ad598
Wink Saville [Fri, 10 Feb 2012 23:14:40 +0000 (15:14 -0800)]
am
197fe269: Merge "Add OEM specific USB mode enumeration based on ro.bootmode property" into ics-mr1
* commit '
197fe26940022be75384f4038dd789f446d33122':
Add OEM specific USB mode enumeration based on ro.bootmode property
Wink Saville [Fri, 10 Feb 2012 23:12:19 +0000 (15:12 -0800)]
Merge "Add OEM specific USB mode enumeration based on ro.bootmode property" into ics-mr1
Eric Fischer [Fri, 10 Feb 2012 21:11:46 +0000 (13:11 -0800)]
am
650462bb: Import revised translations. DO NOT MERGE
* commit '
650462bbfd6218c918cd9507ea0a33fa9a936f26':
Import revised translations. DO NOT MERGE
Justin Ho [Fri, 10 Feb 2012 18:10:39 +0000 (10:10 -0800)]
am
744c5b0b: Merge "Import translations. DO NOT MERGE" into ics-mr1
* commit '
744c5b0bdee6a26e2dc7e740a695d53c32104326':
Import translations. DO NOT MERGE
Justin Ho [Fri, 10 Feb 2012 18:07:07 +0000 (10:07 -0800)]
Merge "Import translations. DO NOT MERGE" into ics-mr1
Scott Main [Fri, 10 Feb 2012 00:01:38 +0000 (16:01 -0800)]
am
d9c8bbd5: docs: fix xss issue bug
5125642
* commit '
d9c8bbd56a9c76a111f9441871e79516c521aa75':
docs: fix xss issue bug
5125642
Joe Fernandez [Thu, 9 Feb 2012 21:46:55 +0000 (13:46 -0800)]
am
1c66faab: Merge "docs: OpenGL Tutorials fixed two broken links (Issue
5990696, public android bug: 25132)" into ics-mr1
* commit '
1c66faab73b2ce54bfe362f3c051ce95ed89fb22':
docs: OpenGL Tutorials fixed two broken links (Issue
5990696, public android bug: 25132)
Joe Fernandez [Thu, 9 Feb 2012 21:45:01 +0000 (13:45 -0800)]
Merge "docs: OpenGL Tutorials fixed two broken links (Issue
5990696, public android bug: 25132)" into ics-mr1
Scott Main [Thu, 9 Feb 2012 20:48:18 +0000 (12:48 -0800)]
am
52bfc243: docs: fix misc doc bugs from external issue tracker
* commit '
52bfc243684b2f340da326aaa38e9021e4e3b2e6':
docs: fix misc doc bugs from external issue tracker
Scott Main [Wed, 8 Feb 2012 05:47:38 +0000 (21:47 -0800)]
am
09ff04d7: docs: fix typo in menu TOC
* commit '
09ff04d7893a9f49e478bb732ce1ea1b17662a3b':
docs: fix typo in menu TOC
The Android Open Source Project [Tue, 7 Feb 2012 18:18:32 +0000 (10:18 -0800)]
Reconcile with ics-mr1-release
Change-Id: I628448f7b618988e20f7dfdf58c53133874a3958
John Wang [Tue, 7 Feb 2012 01:03:15 +0000 (17:03 -0800)]
am
48ac0f14: Merge "Don\'t use SNR in the invalid check." into ics-mr1
* commit '
48ac0f14de9be4c91bdce4e601c5eef4fd2c3123':
Don't use SNR in the invalid check.
John Wang [Tue, 7 Feb 2012 01:00:49 +0000 (17:00 -0800)]
Merge "Don't use SNR in the invalid check." into ics-mr1
Xavier Ducrohet [Tue, 7 Feb 2012 00:42:41 +0000 (16:42 -0800)]
am
331bb0c3: Setup ActionBars in layoutlib the same way the platform does it. do not merge.
* commit '
331bb0c393d5e2ea2485102dcddbb8c2d42654d2':
Setup ActionBars in layoutlib the same way the platform does it. do not merge.
Scott Main [Mon, 6 Feb 2012 22:12:39 +0000 (14:12 -0800)]
am
a9d9fa72: Merge "docs: switch from caps to initial-case for device button names" into ics-mr1
* commit '
a9d9fa723a10ae41c047a4e8eba330112d344dc8':
docs: switch from caps to initial-case for device button names
Scott Main [Mon, 6 Feb 2012 22:10:16 +0000 (14:10 -0800)]
Merge "docs: switch from caps to initial-case for device button names" into ics-mr1
Scott Main [Mon, 6 Feb 2012 21:05:28 +0000 (13:05 -0800)]
am
4ba15efc: Merge "docs: add Sony USB VID issue
5967572" into ics-mr1
* commit '
4ba15efc5b9c884a7651d699a20f9edd7ebd7cb5':
docs: add Sony USB VID issue
5967572
Scott Main [Mon, 6 Feb 2012 21:03:16 +0000 (13:03 -0800)]
Merge "docs: add Sony USB VID issue
5967572" into ics-mr1
Xavier Ducrohet [Mon, 6 Feb 2012 19:41:04 +0000 (11:41 -0800)]
am
f8aea993: Make aapt ignore tools-related data.
* commit '
f8aea99385df8373b6edd6d5dd1d15b7b36b525b':
Make aapt ignore tools-related data.
Scott Main [Wed, 1 Feb 2012 23:12:40 +0000 (15:12 -0800)]
am
633de7ba: docs: fix meta description tag for homepage
* commit '
633de7bab9397c4f7591c5514d903305254451b2':
docs: fix meta description tag for homepage
Scott Main [Wed, 1 Feb 2012 23:00:30 +0000 (15:00 -0800)]
am
6aaa27fb: docs: fix broken link
* commit '
6aaa27fb8c4ba500a9b486c2baba5b01bcc34bf2':
docs: fix broken link
Scott Main [Wed, 1 Feb 2012 21:52:21 +0000 (13:52 -0800)]
am
6b3f98b4: Merge "docs: fix action bar style example" into ics-mr1
* commit '
6b3f98b458b9dc7771cce37221d4fe8c4a19bf05':
docs: fix action bar style example
Scott Main [Wed, 1 Feb 2012 21:52:19 +0000 (13:52 -0800)]
am
f47f6791: Merge "docs: dashboard update for feb 1" into ics-mr1
* commit '
f47f6791f897b436530557dea3a57a2ca969afe6':
docs: dashboard update for feb 1
Scott Main [Wed, 1 Feb 2012 21:52:17 +0000 (13:52 -0800)]
am
5e095939: docs: update menu guide with CAB and popup menu, plus many other revisions
* commit '
5e0959393426371dadef2c7905d5c915a1ac2dd4':
docs: update menu guide with CAB and popup menu, plus many other revisions
Xia Wang [Wed, 1 Feb 2012 21:52:13 +0000 (13:52 -0800)]
am
ccc11c4d: Merge "Fix a typo in image processing test" into ics-mr1
* commit '
ccc11c4d3c8357a402b84c546e7b2f889729358c':
Fix a typo in image processing test
Scott Main [Wed, 1 Feb 2012 19:54:57 +0000 (11:54 -0800)]
Merge "docs: fix action bar style example" into ics-mr1
Scott Main [Wed, 1 Feb 2012 19:43:48 +0000 (11:43 -0800)]
Merge "docs: dashboard update for feb 1" into ics-mr1
Xia Wang [Wed, 1 Feb 2012 18:51:43 +0000 (10:51 -0800)]
Merge "Fix a typo in image processing test" into ics-mr1
The Android Open Source Project [Wed, 1 Feb 2012 16:49:49 +0000 (08:49 -0800)]
Reconcile with ics-mr1-release
Change-Id: I79900da9bc339bad1350124768b53026f465a345
Scott Main [Wed, 1 Feb 2012 00:08:09 +0000 (16:08 -0800)]
Merge "docs: change that stated as a few doc fixes and turned into fully documenting the device default themes and fixing many more, including adding API level information for older themes to avoid confusion. Oh and fix an unclosed <em> tag causing a format bug." into ics-mr1
The Android Automerger [Tue, 31 Jan 2012 23:42:17 +0000 (15:42 -0800)]
merge in ics-mr1-release history after reset to ics-mr1
Justin Ho [Tue, 31 Jan 2012 22:00:55 +0000 (14:00 -0800)]
Merge "Use LTE SNR and RSRP to set signal level bar." into ics-mr1
Scott Main [Tue, 31 Jan 2012 16:39:36 +0000 (08:39 -0800)]
Merge "docs: fix locale name; South Africa is local en_ZA external issue 23133" into ics-mr1
Scott Main [Tue, 31 Jan 2012 16:39:03 +0000 (08:39 -0800)]
Merge "docs: fix typo in market doc external issue 22650" into ics-mr1
Scott Main [Tue, 31 Jan 2012 16:37:59 +0000 (08:37 -0800)]
Merge "docs: fix typos and clarify some grammar in summary external issue 21548" into ics-mr1
The Android Automerger [Tue, 31 Jan 2012 07:33:37 +0000 (23:33 -0800)]
merge in ics-mr1-release history after reset to ics-mr1
Scott Main [Tue, 31 Jan 2012 00:13:28 +0000 (16:13 -0800)]
Merge "docs: update sidenav to use <span> instead of <h2> for headings, under suspicion that the h2s are causing poor snippet extraction in search results" into ics-mr1
The Android Automerger [Mon, 30 Jan 2012 21:23:32 +0000 (13:23 -0800)]
merge in ics-mr1-release history after reset to ics-mr1
Dianne Hackborn [Mon, 30 Jan 2012 20:52:11 +0000 (12:52 -0800)]
Merge "Update documentation to reflect the old approach not working." into ics-mr1
John Wang [Mon, 30 Jan 2012 19:20:35 +0000 (11:20 -0800)]
Merge "Adjust the LTE signal bar mapping." into ics-mr1
Scott Main [Mon, 30 Jan 2012 18:03:21 +0000 (10:03 -0800)]
Merge "docs: add G+ page announcement to homepage" into ics-mr1
The Android Automerger [Fri, 27 Jan 2012 02:32:07 +0000 (18:32 -0800)]
merge in ics-mr1-release history after reset to ics-mr1
Roman Nurik [Fri, 27 Jan 2012 00:32:56 +0000 (16:32 -0800)]
Merge "docs: add NOTICE to action bar icon pack and sprinkle download links" into ics-mr1
Roman Nurik [Thu, 26 Jan 2012 23:33:57 +0000 (15:33 -0800)]
Merge "docs: Update designing-navigation training class to link to Android Design" into ics-mr1
Daniel Sandler [Thu, 26 Jan 2012 21:02:32 +0000 (13:02 -0800)]
Merge "Suppress mobile-out-of-service label if wifi connected." into ics-mr1
Scott Main [Thu, 26 Jan 2012 01:58:54 +0000 (17:58 -0800)]
Merge "docs: remove the 1.0 icon template pack" into ics-mr1
Scott Main [Thu, 26 Jan 2012 01:50:20 +0000 (17:50 -0800)]
Merge "docs: remove ADL presentation PDFs to conserve site space" into ics-mr1
Joe Malin [Thu, 26 Jan 2012 01:27:46 +0000 (17:27 -0800)]
am
a2a46f62: DOC CHANGE: New Content Provider topics
* commit '
a2a46f629446af0935e8ebbbd7cdb55e395f79f3':
DOC CHANGE: New Content Provider topics
The Android Automerger [Wed, 25 Jan 2012 20:08:57 +0000 (12:08 -0800)]
merge in ics-mr1-release history after reset to ics-mr1
Robert Greenwalt [Wed, 25 Jan 2012 19:28:30 +0000 (11:28 -0800)]
Merge "Filter our v6 address from tethering dns." into ics-mr1
Roman Nurik [Wed, 25 Jan 2012 02:08:52 +0000 (18:08 -0800)]
Merge "docs: Android Design typo and grammar fixes" into ics-mr1
The Android Automerger [Tue, 24 Jan 2012 21:33:01 +0000 (13:33 -0800)]
merge in ics-mr1-release history after reset to ics-mr1
Daniel Sandler [Tue, 24 Jan 2012 20:54:48 +0000 (12:54 -0800)]
Merge "Stop showing "No internet connection" when there is one." into ics-mr1
Eric Laurent [Tue, 24 Jan 2012 19:49:39 +0000 (11:49 -0800)]
Merge "AudioFlinger: refine mixer sleep time logic" into ics-mr1
Eric Laurent [Tue, 24 Jan 2012 19:49:16 +0000 (11:49 -0800)]
Merge "DO NOT MERGE Revert "Revert "AudioFlinger: mix track only when really ready (2)""" into ics-mr1
Robert Greenwalt [Tue, 24 Jan 2012 19:40:19 +0000 (11:40 -0800)]
Merge "Use the carrier-given dns addrs for tethering." into ics-mr1
Dianne Hackborn [Tue, 24 Jan 2012 19:33:15 +0000 (11:33 -0800)]
Merge "Another attempt at issue #
5823276: home repaints after full-screen app is exited" into ics-mr1
Dianne Hackborn [Tue, 24 Jan 2012 19:33:06 +0000 (11:33 -0800)]
Merge "Fix issue #
5906017: Missing menu entries in portrait when in compatibility mode" into ics-mr1
Daniel Sandler [Tue, 24 Jan 2012 19:32:31 +0000 (11:32 -0800)]
Merge "Detect and repair invalid layouts in the navigation bar." into ics-mr1
Jim Miller [Mon, 23 Jan 2012 23:49:32 +0000 (15:49 -0800)]
Merge "Revert "Fix
5797764: Increase lock screen's thread priority"" into ics-mr1
Justin Ho [Mon, 23 Jan 2012 23:11:00 +0000 (15:11 -0800)]
Merge "DO NOT MERGE Revert "AudioFlinger: mix track only when really ready (2)"" into ics-mr1
Bill Gruber [Mon, 23 Jan 2012 18:21:16 +0000 (10:21 -0800)]
Merge "DevDocs update: Publishing on Market" into ics-mr1
The Android Automerger [Sat, 21 Jan 2012 00:12:47 +0000 (16:12 -0800)]
merge in ics-mr1-release history after reset to ics-mr1
Jim Miller [Fri, 20 Jan 2012 23:24:20 +0000 (15:24 -0800)]
Merge "Fix
5797764: Increase lock screen's thread priority" into ics-mr1
Justin Ho [Fri, 20 Jan 2012 22:48:51 +0000 (14:48 -0800)]
Merge "Update WiMAX assets to match new style Bug:
5724605" into ics-mr1
Justin Ho [Fri, 20 Jan 2012 22:33:07 +0000 (14:33 -0800)]
Merge "New out-of-service RSSI." into ics-mr1
Dianne Hackborn [Fri, 20 Jan 2012 20:01:51 +0000 (12:01 -0800)]
Merge "Fix issue #
5823276 again: home repaints after full-screen app is exited" into ics-mr1
Daniel Sandler [Fri, 20 Jan 2012 19:28:44 +0000 (11:28 -0800)]
Merge "Always show appropriate mobile service label." into ics-mr1
Jeff Brown [Fri, 20 Jan 2012 19:24:13 +0000 (11:24 -0800)]
Merge "Implement a max time bound for rotation. (DO NOT MERGE)" into ics-mr1
Jeff Brown [Fri, 20 Jan 2012 19:24:01 +0000 (11:24 -0800)]
Merge "Fix a few memory leaks in the input dispatcher. (DO NOT MERGE)" into ics-mr1
The Android Automerger [Fri, 20 Jan 2012 00:28:56 +0000 (16:28 -0800)]
merge in ics-mr1-release history after reset to ics-mr1
Justin Ho [Thu, 19 Jan 2012 23:43:19 +0000 (15:43 -0800)]
Merge "DO NOT MERGE Revert "Fix issue #
5823276: home repaints after full-screen app is exited"" into ics-mr1
OSDN Git Service
