OSDN Git Service
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
Robert Ly [Thu, 19 Jan 2012 21:25:07 +0000 (13:25 -0800)]
resolved conflicts for merge of
b078d942 to ics-mr1
Change-Id: I831c06f2c198cc8825788a05770397457e8d511c
Robert Ly [Thu, 19 Jan 2012 18:41:28 +0000 (10:41 -0800)]
am
9575a1ab: Merge "docs: wifi direct" into ics-mr0
* commit '
9575a1ab5d033248284d59b2a2ae6eda80f79762':
docs: wifi direct
Robert Ly [Thu, 19 Jan 2012 18:38:51 +0000 (10:38 -0800)]
Merge "docs: wifi direct" into ics-mr0
The Android Automerger [Thu, 19 Jan 2012 05:17:55 +0000 (21:17 -0800)]
merge in ics-mr1-release history after reset to ics-mr1
Jim Miller [Thu, 19 Jan 2012 00:44:52 +0000 (16:44 -0800)]
Merge "Fix
5863053: Add method to lock screen immediately." into ics-mr1
Eric Laurent [Thu, 19 Jan 2012 00:05:31 +0000 (16:05 -0800)]
Merge "AudioFlinger: mix track only when really ready (2)" into ics-mr1
Wink Saville [Thu, 19 Jan 2012 00:03:24 +0000 (16:03 -0800)]
Merge "Use new preferredAPN URI avoiding onApnChanged() call with self-change" into ics-mr1
Adam Powell [Wed, 18 Jan 2012 22:47:20 +0000 (14:47 -0800)]
Merge "Fix DeviceDefault theme/style bugs where parent styles were incorrectly specified." into ics-mr1
Robert Ly [Wed, 18 Jan 2012 21:18:11 +0000 (13:18 -0800)]
Merge "docs: adding rs api docs" into ics-mr1
Robert Ly [Wed, 18 Jan 2012 21:17:51 +0000 (13:17 -0800)]
Merge "update overview page for rs api docs to open iframe links in parent" into ics-mr1
Joe Fernandez [Wed, 18 Jan 2012 20:33:45 +0000 (12:33 -0800)]
Merge "docs: Android API 15 SDK r2 Release Notes" into ics-mr1
Scott Main [Sat, 14 Jan 2012 02:23:40 +0000 (18:23 -0800)]
Merge "docs: emphasize qualifier order and mention implicit version qualifer" into ics-mr1
Scott Main [Sat, 14 Jan 2012 02:21:42 +0000 (18:21 -0800)]
Merge "docs: mention x86 as a native platform filter" into ics-mr1
Dianne Hackborn [Sat, 14 Jan 2012 00:36:05 +0000 (16:36 -0800)]
Merge "Update notification documentation to follow current guidelines." into ics-mr1
The Android Automerger [Sat, 14 Jan 2012 00:18:17 +0000 (16:18 -0800)]
merge in ics-mr1-release history after reset to ics-mr1
Kenny Root [Fri, 13 Jan 2012 21:11:02 +0000 (13:11 -0800)]
Merge "Fix issue with selecting proper JNI libraries" into ics-mr1
Dianne Hackborn [Fri, 13 Jan 2012 20:56:40 +0000 (12:56 -0800)]
Merge "Fix issue #
5823276: home repaints after full-screen app is exited" into ics-mr1
Bart Sears [Fri, 13 Jan 2012 20:32:43 +0000 (12:32 -0800)]
Merge "Update to latest version of Roboto" into ics-mr1
Christopher Tate [Fri, 13 Jan 2012 19:49:20 +0000 (11:49 -0800)]
Merge "Streamline package-installed handling by the Backup Manager" into ics-mr1
John Huang [Fri, 13 Jan 2012 19:37:15 +0000 (11:37 -0800)]
Merge "Fix teardown of secondary connections on CDMA" into ics-mr1
Robert Ly [Fri, 13 Jan 2012 18:13:14 +0000 (10:13 -0800)]
Merge "cherrypick from master - add overview description for RS API reference Change-Id: Id5554c607ad4c435f92bfa939e4ce4833a638f62" into ics-mr1
Scott Main [Thu, 12 Jan 2012 23:44:53 +0000 (15:44 -0800)]
Merge "docs: make AD logo clickable on home page" into ics-mr1
Chia-chi Yeh [Thu, 12 Jan 2012 22:24:30 +0000 (14:24 -0800)]
Merge "VPN: silence VPN notifications." into ics-mr1
The Android Automerger [Thu, 12 Jan 2012 22:01:29 +0000 (14:01 -0800)]
merge in ics-mr1-release history after reset to ics-mr1
Roman Nurik [Thu, 12 Jan 2012 20:45:00 +0000 (12:45 -0800)]
Merge "docs: minor Design Principles fixes for Android Design" into ics-mr1
Jim Miller [Thu, 12 Jan 2012 20:28:59 +0000 (12:28 -0800)]
Merge "Fix
5620754: don't show pattern screen after SIM PUK unlock" into ics-mr1
Daniel Sandler [Thu, 12 Jan 2012 19:38:39 +0000 (11:38 -0800)]
Merge "Clean up wifi/mobile indicators in the expanded panel." into ics-mr1
Matthew Xie [Thu, 12 Jan 2012 19:24:06 +0000 (11:24 -0800)]
Merge "Set Bluetooth adapter to PowerOff mode when turnoff with airplane on" into ics-mr1
Scott Main [Thu, 12 Jan 2012 19:22:24 +0000 (11:22 -0800)]
Merge "docs: update text and image for "let me make it mine" prinicple in design guide bug:
5853519" into ics-mr1
Scott Main [Thu, 12 Jan 2012 19:19:08 +0000 (11:19 -0800)]
Merge "docs: further clarify the behavior of targetSdkVersion bug:
5854083" into ics-mr1
Robert Greenwalt [Thu, 12 Jan 2012 17:24:45 +0000 (09:24 -0800)]
Merge "Disable wimax when mobile data is in Settings" into ics-mr1
Danielle Millett [Thu, 12 Jan 2012 15:28:24 +0000 (07:28 -0800)]
Merge "DO NOT MERGE - Cherry picking from master to MR1" into ics-mr1
Brian Colonna [Thu, 12 Jan 2012 14:33:49 +0000 (06:33 -0800)]
Merge "DO NOT MERGE cherry-picked FU framework tablet commits" into ics-mr1
Xia Wang [Thu, 12 Jan 2012 01:52:06 +0000 (17:52 -0800)]
Merge "Remove sleep from test acitivity to avoid ANR when key event is injected bug#:
5737922" into ics-mr1
Xia Wang [Thu, 12 Jan 2012 01:51:48 +0000 (17:51 -0800)]
Merge "Get average value for image processing test bug#:
5566079" into ics-mr1
Katie McCormick [Thu, 12 Jan 2012 00:40:37 +0000 (16:40 -0800)]
Merge "Doc change: Adding Bluetooth HDP info." into ics-mr1
The Android Automerger [Thu, 12 Jan 2012 00:29:04 +0000 (16:29 -0800)]
merge in ics-mr1-release history after reset to ics-mr1
Selim Gurun [Wed, 11 Jan 2012 22:18:14 +0000 (14:18 -0800)]
Merge "Do Not Merge. Move ssl callbacks to webcore thread." into ics-mr1
Eric Laurent [Wed, 11 Jan 2012 19:10:38 +0000 (11:10 -0800)]
Merge "stagefright: limit audio gap for looped playback" into ics-mr1
Scott Main [Wed, 11 Jan 2012 01:08:19 +0000 (17:08 -0800)]
Merge "docs: add links to Android Design from dev docs" into ics-mr1
Roman Nurik [Wed, 11 Jan 2012 01:01:45 +0000 (17:01 -0800)]
Merge "Android Design" into ics-mr1
Scott Main [Tue, 10 Jan 2012 20:53:42 +0000 (12:53 -0800)]
Merge "docs: fix broken links in .jd docs" into ics-mr1
Jim Miller [Tue, 10 Jan 2012 18:28:21 +0000 (10:28 -0800)]
Merge "Fix
4560303: Add setting to lock later when power button pressed" into ics-mr1
Pin Ting [Tue, 10 Jan 2012 02:58:13 +0000 (18:58 -0800)]
Merge "Fixes typo." into ics-mr1
Dianne Hackborn [Tue, 10 Jan 2012 00:47:35 +0000 (16:47 -0800)]
Merge "Unhide Resources APIs for getting resources at specific densities." into ics-mr1
The Android Automerger [Sat, 7 Jan 2012 00:32:11 +0000 (16:32 -0800)]
merge in ics-mr1-release history after reset to ics-mr1
Eino-Ville Talvala [Fri, 6 Jan 2012 23:46:36 +0000 (15:46 -0800)]
Merge "Switch camera sounds to always use the system enforced audio stream." into ics-mr1
Bart Sears [Fri, 6 Jan 2012 23:45:13 +0000 (15:45 -0800)]
Merge "getDuration can be only called after prepared. DO NOT MERGE" into ics-mr1
Wink Saville [Fri, 6 Jan 2012 22:27:56 +0000 (14:27 -0800)]
Merge "Fix an RuntimeExcpetion in GsmDCT.onDataSetupComplete" into ics-mr1
Fabrice Di Meglio [Fri, 6 Jan 2012 22:19:20 +0000 (14:19 -0800)]
Merge "Fix bug #
5822825 Paint.measureText (char[] text, int index, int count) cannot handle text more than 32K long - DO NOT MERGE" into ics-mr1
Justin Ho [Fri, 6 Jan 2012 22:07:51 +0000 (14:07 -0800)]
Merge "Fixing crash when taking screenshot over secure window." into ics-mr1
Justin Ho [Fri, 6 Jan 2012 22:07:37 +0000 (14:07 -0800)]
Merge "Updating default image wallpaper for tablet." into ics-mr1
Scott Main [Thu, 5 Jan 2012 17:42:52 +0000 (09:42 -0800)]
Merge changes I1df85b6a,I7c6a68b6 into ics-mr1
* changes:
docs: second set of diagram updates
docs: Update lifecycle diagrams to use new omnigraffle designs; add corresponding graffle files update discussion of activity state restore for clarification
The Android Automerger [Thu, 5 Jan 2012 00:42:23 +0000 (16:42 -0800)]
merge in ics-mr1-release history after reset to ics-mr1
Wink Saville [Wed, 4 Jan 2012 21:53:25 +0000 (13:53 -0800)]
Merge "Enhancement on ICS data stall polling logic" into ics-mr1
Wink Saville [Wed, 4 Jan 2012 21:50:04 +0000 (13:50 -0800)]
Merge "Add support of dislaying Alpha tag for BIP commands" into ics-mr1
Wink Saville [Wed, 4 Jan 2012 21:47:55 +0000 (13:47 -0800)]
Merge "Support suggestedRetryTime in CDMA DCT" into ics-mr1
Bart Sears [Wed, 4 Jan 2012 21:47:09 +0000 (13:47 -0800)]
Merge "Do not allow file:// access when it is disabled. Do not merge." into ics-mr1
Eric Laurent [Wed, 4 Jan 2012 20:58:17 +0000 (12:58 -0800)]
Merge "audioflinger: fix clicks on 48kHz audio." into ics-mr1
Christopher Tate [Wed, 4 Jan 2012 01:38:51 +0000 (17:38 -0800)]
Merge "Tweak docs on 'adb logcat'" into ics-mr1
Joe Fernandez [Thu, 22 Dec 2011 23:55:00 +0000 (15:55 -0800)]
Merge "docs: Add developer guide cross-references, Project ACRE, round 4" into ics-mr1
Roman Nurik [Thu, 22 Dec 2011 22:27:55 +0000 (14:27 -0800)]
Merge "docs: Update App Widgets dev guide size discussion" into ics-mr1
The Android Automerger [Wed, 21 Dec 2011 01:27:07 +0000 (17:27 -0800)]
merge in ics-mr1-release history after reset to ics-mr1
John Wang [Tue, 20 Dec 2011 18:41:08 +0000 (10:41 -0800)]
Merge "Hide emergency call text if not support it." into ics-mr1
Roman Nurik [Fri, 16 Dec 2011 20:05:32 +0000 (12:05 -0800)]
am
00697a90: docs: Add missing intent flag to Android U nav class
* commit '
00697a90bec4e0536cfa0873602b64bb6785022e':
docs: Add missing intent flag to Android U nav class
The Android Automerger [Fri, 16 Dec 2011 20:01:35 +0000 (12:01 -0800)]
merge in ics-mr1-release history after reset to ics-mr1
Justin Ho [Fri, 16 Dec 2011 19:52:08 +0000 (11:52 -0800)]
Merge "Cherry-picking Id45abeba and Ia065dec6 for MR1" into ics-mr1
Alexander Lucas [Fri, 16 Dec 2011 19:38:05 +0000 (11:38 -0800)]
Merge "Fixed table labelling issues in 'Multiple Dimensions' multiple apk lesson" into ics-mr1
Scott Main [Fri, 16 Dec 2011 19:30:00 +0000 (11:30 -0800)]
Merge "docs: fix whitespace in sidenav" into ics-mr1
Roman Nurik [Fri, 16 Dec 2011 19:23:27 +0000 (11:23 -0800)]
am
eb946fbd: Merge "docs: Minor link fix in Android U class" into ics-mr0
* commit '
eb946fbdc800d56e1cbac515a1c73de806e74711':
docs: Minor link fix in Android U class
Roman Nurik [Fri, 16 Dec 2011 19:21:59 +0000 (11:21 -0800)]
Merge "docs: Minor link fix in Android U class" into ics-mr0
Bill Gruber [Fri, 16 Dec 2011 19:13:13 +0000 (11:13 -0800)]
am
97aafdf4: Merge "Dev guide for sensors" into ics-mr0
* commit '
97aafdf46e5007fa7b3f6eae4e54d692877ad824':
Dev guide for sensors
Bill Gruber [Fri, 16 Dec 2011 19:11:46 +0000 (11:11 -0800)]
Merge "Dev guide for sensors" into ics-mr0
Dirk Dougherty [Fri, 16 Dec 2011 18:56:29 +0000 (10:56 -0800)]
Merge "Updated "Designing for Security" documentation" into ics-mr1
Joe Fernandez [Fri, 16 Dec 2011 07:11:26 +0000 (23:11 -0800)]
Merge "docs: Release Notes v2 for Android 4.0.3, ADT 16.0.1, Support lib r5-r6" into ics-mr1
Fred Chung [Fri, 16 Dec 2011 06:33:31 +0000 (22:33 -0800)]
am
48e0617b: Fixed Android U Enterprise lesson pre-requisites and a minor typo.
* commit '
48e0617b9e7d06da803c572d6584d68898733d37':
Fixed Android U Enterprise lesson pre-requisites and a minor typo.
Scott Main [Fri, 16 Dec 2011 06:12:53 +0000 (22:12 -0800)]
Merge "docs: Release Notes for Android 4.0.3, ADT 16.0.1, Support lib r5-r6" into ics-mr1
The Android Automerger [Fri, 16 Dec 2011 04:50:02 +0000 (20:50 -0800)]
merge in ics-mr1-release history after reset to ics-mr1
Scott Main [Fri, 16 Dec 2011 04:19:55 +0000 (20:19 -0800)]
am
98af5edc: docs: fix encoding issue or whatever with docs (not showing titles)
* commit '
98af5edc70b0b418366f5197b9aeef30f135d40e':
docs: fix encoding issue or whatever with docs (not showing titles)
Scott Main [Fri, 16 Dec 2011 03:56:47 +0000 (19:56 -0800)]
am
d9bc2d21: Merge "docs: add remembering users class to nav" into ics-mr0
* commit '
d9bc2d21c55e58f83e4209749cc51f0da9869b54':
docs: add remembering users class to nav
Scott Main [Fri, 16 Dec 2011 03:55:25 +0000 (19:55 -0800)]
Merge "docs: add remembering users class to nav" into ics-mr0
Scott Main [Fri, 16 Dec 2011 03:52:50 +0000 (19:52 -0800)]
am
5dac1976: Merge "Doc merge from master:Training class on Identifying and Authenticating Users." into ics-mr0
* commit '
5dac1976198e5fa553749cd145c7484f3ff45c6b':
Doc merge from master:Training class on Identifying and Authenticating Users.
Scott Main [Fri, 16 Dec 2011 03:51:48 +0000 (19:51 -0800)]
Merge "Doc merge from master:Training class on Identifying and Authenticating Users." into ics-mr0
Scott Main [Fri, 16 Dec 2011 03:47:47 +0000 (19:47 -0800)]
am
abfcbd16: docs: typo in training orientation
* commit '
abfcbd162ff0f3baf45436614a1ea7ce6c032df1':
docs: typo in training orientation
Roman Nurik [Fri, 16 Dec 2011 03:25:25 +0000 (19:25 -0800)]
am
408f94b1: Merge "docs: Minor bugfix to Android U navigation design class" into ics-mr0
* commit '
408f94b1478c62f953faf29b02c3af5d8d3c5e05':
docs: Minor bugfix to Android U navigation design class
Dave Burke [Fri, 16 Dec 2011 03:23:26 +0000 (19:23 -0800)]
Merge "SurfaceMediaSource: use the HW_TEXTURE usage bit" into ics-mr1
Roman Nurik [Fri, 16 Dec 2011 03:23:00 +0000 (19:23 -0800)]
Merge "docs: Minor bugfix to Android U navigation design class" into ics-mr0
Scott Main [Fri, 16 Dec 2011 01:39:35 +0000 (17:39 -0800)]
am
6fbddffc: Merge "Minor tweaks to Sharing class, updated some typos, wording and a screenshot." into ics-mr0
* commit '
6fbddffc83312b825e888fcdb8b6e52dade05b3e':
Minor tweaks to Sharing class, updated some typos, wording and a screenshot.
Scott Main [Fri, 16 Dec 2011 01:37:36 +0000 (17:37 -0800)]
am
580f0146: docs: add camera and design, remove users update title names for many lessons
* commit '
580f0146535e7daed83aef721f505270f7b040e1':
docs: add camera and design, remove users update title names for many lessons
Scott Main [Fri, 16 Dec 2011 01:36:58 +0000 (17:36 -0800)]
Merge "Minor tweaks to Sharing class, updated some typos, wording and a screenshot." into ics-mr0
Sparky Rhode [Fri, 16 Dec 2011 01:23:11 +0000 (17:23 -0800)]
am
fc3f8e69: Merge "Remove references to sample application" into ics-mr0
* commit '
fc3f8e69546ff2ea672b2c66e861424a8cf2348f':
Remove references to sample application
Sparky Rhode [Fri, 16 Dec 2011 01:21:51 +0000 (17:21 -0800)]
Merge "Remove references to sample application" into ics-mr0
Roman Nurik [Fri, 16 Dec 2011 00:48:25 +0000 (16:48 -0800)]
am
d37e2b35: Merge "Android U Class: Designing Effective and Intuitive App Navigation" into ics-mr0
* commit '
d37e2b35b4ad80352eca9e77b59d78f1bcf65b8c':
Android U Class: Designing Effective and Intuitive App Navigation
Roman Nurik [Fri, 16 Dec 2011 00:45:55 +0000 (16:45 -0800)]
Merge "Android U Class: Designing Effective and Intuitive App Navigation" into ics-mr0
Scott Main [Fri, 16 Dec 2011 00:29:42 +0000 (16:29 -0800)]
am
2cbcdc76: Merge "docs: Add training homepage, side nav, and title changes" into ics-mr0
* commit '
2cbcdc760cfe2af622ccb9ef41514954dab537f0':
docs: Add training homepage, side nav, and title changes
Scott Main [Fri, 16 Dec 2011 00:28:19 +0000 (16:28 -0800)]
Merge "docs: Add training homepage, side nav, and title changes" into ics-mr0
Scott Main [Fri, 16 Dec 2011 00:10:10 +0000 (16:10 -0800)]
am
564e8aa4: docs: Android University - Camera class
* commit '
564e8aa41c29ebd10cb691851d4ecc347f8eee71':
docs: Android University - Camera class
Scott Main [Thu, 15 Dec 2011 23:55:31 +0000 (15:55 -0800)]
am
d25ad2fd: cherrypick from ics-mr1 to avoid pending merge conflicts: Change-Id: If1341cdc456ace9037bd2175479d89454e084e22 docs: remove some "new" tags from side navs
* commit '
d25ad2fdbb4cf86e2a05dbc6b8afb50760c0fe1b':
cherrypick from ics-mr1 to avoid pending merge conflicts: Change-Id: If1341cdc456ace9037bd2175479d89454e084e22 docs: remove some "new" tags from side navs