OSDN Git Service
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
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
Scott Main [Thu, 15 Dec 2011 19:08:51 +0000 (11:08 -0800)]
am
3d672e1e: Android U Class: Monetization / Ads without Compromising User Experience
* commit '
3d672e1e789e171e913605945efe95a477ab0505':
Android U Class: Monetization / Ads without Compromising User Experience
Scott Main [Thu, 15 Dec 2011 18:41:18 +0000 (10:41 -0800)]
am
aed4ced6: Android U Class: Developing Android Applications for the Enterprise. This class uses a sample app.
* commit '
aed4ced6556383483209f454c9e4872e8ad28ebf':
Android U Class: Developing Android Applications for the Enterprise. This class uses a sample app.
Scott Main [Thu, 15 Dec 2011 18:13:07 +0000 (10:13 -0800)]
am
f9cca66e: Docs: Training class on Identifying and Authenticating Users.
* commit '
f9cca66e8b4acbc8d50713b4ed4b92d8274285c1':
Docs: Training class on Identifying and Authenticating Users.
Dianne Hackborn [Thu, 15 Dec 2011 02:18:29 +0000 (18:18 -0800)]
Merge "Fix some java docs." into ics-mr1
Dirk Dougherty [Thu, 15 Dec 2011 01:21:13 +0000 (17:21 -0800)]
Merge "Doc change: add MR1 API summary and updated highlights." into ics-mr1
Scott Main [Wed, 14 Dec 2011 22:55:44 +0000 (14:55 -0800)]
am
56a3e326: Merge "docs: add Android U class for "Improving Performance of Layouts"" into ics-mr0
* commit '
56a3e326192c7496b67666b29071dc9f38c59da9':
docs: add Android U class for "Improving Performance of Layouts"
Scott Main [Wed, 14 Dec 2011 22:53:40 +0000 (14:53 -0800)]
am
4dc763c7: Merge "doc change: Android U lessons for audio and battery" into ics-mr0
* commit '
4dc763c700f79e33030e96eefabf8e5047cb9cb1':
doc change: Android U lessons for audio and battery
Scott Main [Wed, 14 Dec 2011 22:53:04 +0000 (14:53 -0800)]
Merge "docs: add Android U class for "Improving Performance of Layouts"" into ics-mr0
Scott Main [Wed, 14 Dec 2011 22:51:30 +0000 (14:51 -0800)]
Merge "doc change: Android U lessons for audio and battery" into ics-mr0
Scott Main [Wed, 14 Dec 2011 22:40:19 +0000 (14:40 -0800)]
am
70645e36: Docs: Add class for Sharing Content
* commit '
70645e363e8601550468b726251f4f52f383b9fc':
Docs: Add class for Sharing Content
Dirk Dougherty [Wed, 14 Dec 2011 02:33:04 +0000 (18:33 -0800)]
Merge "Doc change: API diff report for 15." into ics-mr1
Dianne Hackborn [Tue, 13 Dec 2011 23:40:18 +0000 (15:40 -0800)]
Merge "Fix issue #
5756204: Crespo IME briefly appears shortened when..." into ics-mr1
Gilles Debunne [Tue, 13 Dec 2011 23:36:48 +0000 (15:36 -0800)]
Merge "Do not spell check the foreground ExtractEditText." into ics-mr1
Dianne Hackborn [Tue, 13 Dec 2011 21:38:56 +0000 (13:38 -0800)]
Merge "Fix issue #
5755172: Soft menu key disappears when menu is open" into ics-mr1
Gilles Debunne [Tue, 13 Dec 2011 21:37:29 +0000 (13:37 -0800)]
Merge "NPE in GMail / TextLine" into ics-mr1
Scott Main [Tue, 13 Dec 2011 21:10:45 +0000 (13:10 -0800)]
am
fc279e51: Merge "Created Android University lesson for Multiple APKs." into ics-mr0
* commit '
fc279e51c0bca8086b87bd49e95367c400cb61b4':
Created Android University lesson for Multiple APKs.
Scott Main [Tue, 13 Dec 2011 21:10:42 +0000 (13:10 -0800)]
am
801fda54: AndroidU lesson on designing for multiple screens.
* commit '
801fda548c719a8618e7f4cd64cad8404b0970b9':
AndroidU lesson on designing for multiple screens.
Scott Main [Tue, 13 Dec 2011 20:25:38 +0000 (12:25 -0800)]
Merge "Created Android University lesson for Multiple APKs." into ics-mr0
Andreas Huber [Tue, 13 Dec 2011 19:59:50 +0000 (11:59 -0800)]
Merge "DO NOT MERGE: Support for parsing of "folded" RTSP header values" into ics-mr1
Jeff Sharkey [Tue, 13 Dec 2011 04:19:27 +0000 (20:19 -0800)]
Merge "Avoid NPE when missing network stats." into ics-mr1
Mike Cleron [Tue, 13 Dec 2011 02:15:59 +0000 (18:15 -0800)]
Merge "Update VIBRATE_ON to a supported value when upgrading from GB." into ics-mr1
Dianne Hackborn [Tue, 13 Dec 2011 00:09:54 +0000 (16:09 -0800)]
Merge "SDK only: now that support lib is in SDK, we can link to it." into ics-mr1
Gilles Debunne [Mon, 12 Dec 2011 23:53:25 +0000 (15:53 -0800)]
Merge "Prevent a memory leak in TextLine." into ics-mr1
Gilles Debunne [Mon, 12 Dec 2011 23:52:39 +0000 (15:52 -0800)]
Merge "Text blinking cursor hard to see." into ics-mr1
Adam Powell [Mon, 12 Dec 2011 23:40:00 +0000 (15:40 -0800)]
Merge "Bug
5727679 - CTS test ViewGroupTest#testGetChildVisibleRect" into ics-mr1
Jamie Gennis [Mon, 12 Dec 2011 22:10:04 +0000 (14:10 -0800)]
Merge "SurfaceTexture: fix a verbose-log compile error" into ics-mr1
Raphael [Mon, 12 Dec 2011 21:14:12 +0000 (13:14 -0800)]
Merge "Merge "AAPT fix printf %zd crash on Windows". Do not merge." into ics-mr1
Matthew Xie [Mon, 12 Dec 2011 20:07:39 +0000 (12:07 -0800)]
Merge "Move broadcastState STATE_TURNING_ON before persistSwitchSetting" into ics-mr1
Eric Fischer [Mon, 12 Dec 2011 19:04:39 +0000 (11:04 -0800)]
Merge "Import revised translations. DO NOT MERGE" into ics-mr1
Justin Ho [Fri, 9 Dec 2011 23:42:10 +0000 (15:42 -0800)]
Merge "Quick settings icons updated to match ics style on tablet" into ics-mr1
Jamie Gennis [Fri, 9 Dec 2011 23:07:44 +0000 (15:07 -0800)]
SurfaceTexture: fix a verbose-log compile error
Change-Id: I045231207e068d950bb0cb5085717af5d9454ed1
Jeff Tinker [Fri, 9 Dec 2011 19:11:56 +0000 (11:11 -0800)]
Merge "Fix drm flag setting missed in false drm recognition fix." into ics-mr1
Joe Fernandez [Fri, 9 Dec 2011 18:45:44 +0000 (10:45 -0800)]
am
89c3bc38: Merge "docs: Android 4.0.2 (SDK Tools r16) Release Notes - RC6" into ics-mr0
* commit '
89c3bc38421a3f01b39f0246e53884bdf8b14415':
docs: Android 4.0.2 (SDK Tools r16) Release Notes - RC6
Joe Fernandez [Fri, 9 Dec 2011 18:43:32 +0000 (10:43 -0800)]
Merge "docs: Android 4.0.2 (SDK Tools r16) Release Notes - RC6" into ics-mr0
Gilles Debunne [Fri, 9 Dec 2011 17:34:04 +0000 (09:34 -0800)]
Merge "Blinking cursor in Talk" into ics-mr1
Gilles Debunne [Fri, 9 Dec 2011 02:18:25 +0000 (18:18 -0800)]
Merge "Fixed SpellCheckerSessions leak in TextView" into ics-mr1
Gilles Debunne [Fri, 9 Dec 2011 01:58:24 +0000 (17:58 -0800)]
Merge "Re-use SpanSets in TextLine" into ics-mr1
Joe Malin [Fri, 9 Dec 2011 01:44:34 +0000 (17:44 -0800)]
am
0a9005ed: Merge "DOC CHANGE: Package text and Formatter javadoc" into ics-mr0
* commit '
0a9005ed58d3a6173e8fffbd72933f7646c6fdba':
DOC CHANGE: Package text and Formatter javadoc
Joe Malin [Fri, 9 Dec 2011 01:42:36 +0000 (17:42 -0800)]
Merge "DOC CHANGE: Package text and Formatter javadoc" into ics-mr0
Chia-chi Yeh [Fri, 9 Dec 2011 01:22:16 +0000 (17:22 -0800)]
Merge "VPN: delete the "abort" file before starting VPN daemons." into ics-mr1
Irfan Sheriff [Thu, 8 Dec 2011 23:59:26 +0000 (15:59 -0800)]
Merge "Fix wifi bring up at boot up" into ics-mr1
Jake Hamby [Thu, 8 Dec 2011 23:51:33 +0000 (15:51 -0800)]
Merge "Swap OK and Cancel buttons in SIM PIN unlock screen to match ICS guidelines." into ics-mr1
Andreas Huber [Thu, 8 Dec 2011 21:33:16 +0000 (13:33 -0800)]
Merge "Don't perform RTSP seeks right away but queue them for 200ms" into ics-mr1
Andreas Huber [Thu, 8 Dec 2011 21:33:06 +0000 (13:33 -0800)]
Merge "Fix Bitreader "putBits" implementation, make sure we emulate timestamps" into ics-mr1
Svetoslav Ganov [Thu, 8 Dec 2011 20:28:11 +0000 (12:28 -0800)]
Merge "NumberPicker getting stuck if scroll wheel not wrapable." into ics-mr1
Irfan Sheriff [Thu, 8 Dec 2011 20:21:20 +0000 (12:21 -0800)]
Merge "Handle emergency call back mode correctly" into ics-mr1
Gilles Debunne [Thu, 8 Dec 2011 19:57:06 +0000 (11:57 -0800)]
Merge "Make the Next key navigate between TextViews" into ics-mr1
Gilles Debunne [Thu, 8 Dec 2011 19:56:28 +0000 (11:56 -0800)]
Merge "Limit created string size in Spell Checker" into ics-mr1
Eric Fischer [Thu, 8 Dec 2011 19:09:11 +0000 (11:09 -0800)]
Merge "Import revised translations. DO NOT MERGE" into ics-mr1
The Android Open Source Project [Thu, 8 Dec 2011 18:26:33 +0000 (10:26 -0800)]
Reconcile with ics-mr0-release
Change-Id: I2b2afc572c36ef210d81af16bd2e52cecdd94079
Gilles Debunne [Thu, 8 Dec 2011 17:59:44 +0000 (09:59 -0800)]
Merge "IOOB is Suggestions" into ics-mr1
Gilles Debunne [Thu, 8 Dec 2011 17:59:29 +0000 (09:59 -0800)]
Merge "Prevent NPE in SuggestionSpan" into ics-mr1
Jeff Tinker [Thu, 8 Dec 2011 08:13:43 +0000 (00:13 -0800)]
Merge "Fix ANRs due to Widevine DRM plugin sniff taking too long." into ics-mr1
Jeff Brown [Thu, 8 Dec 2011 07:29:52 +0000 (23:29 -0800)]
Merge "Shortcut keys should be handled on down, not up." into ics-mr1
Jeff Brown [Thu, 8 Dec 2011 07:29:45 +0000 (23:29 -0800)]
Merge "Fix system hotkey handling." into ics-mr1
Dave Burke [Thu, 8 Dec 2011 04:40:10 +0000 (20:40 -0800)]
Merge "Remove dangerous and useless optimization Bug #
5525888" into ics-mr1
Wink Saville [Thu, 8 Dec 2011 04:15:45 +0000 (20:15 -0800)]
Merge "When the SIM_READY set current preferred network type." into ics-mr1
Jaikumar Ganesh [Thu, 8 Dec 2011 03:50:03 +0000 (19:50 -0800)]
Merge "Reduce likelihood of crash in state machine." into ics-mr1
John Wang [Thu, 8 Dec 2011 02:49:28 +0000 (18:49 -0800)]
Merge "Correct the dialing number of structured MMI." into ics-mr1
Gilles Debunne [Thu, 8 Dec 2011 02:41:04 +0000 (18:41 -0800)]
Merge "Insert into user dict with the correct locale" into ics-mr1
Adam Powell [Thu, 8 Dec 2011 01:55:35 +0000 (17:55 -0800)]
Merge "Raise touch slop value from previous experiment" into ics-mr1
Daniel Sandler [Thu, 8 Dec 2011 01:40:07 +0000 (17:40 -0800)]
Merge "Improve handling of small largeIcons in tablet ticker." into ics-mr1
Joe Malin [Thu, 8 Dec 2011 01:11:59 +0000 (17:11 -0800)]
am
3937e055: Merge "DOC CHANGE: Add text for android.os.storage" into ics-mr0
* commit '
3937e055708a8618f184feab204fed4bb41f3f6e':
DOC CHANGE: Add text for android.os.storage
Dianne Hackborn [Thu, 8 Dec 2011 01:11:57 +0000 (17:11 -0800)]
am
b32785c6: Merge "More fixing for issue #
5366535: Lockscreen has wrong layout..." into ics-mr0
* commit '
b32785c6e893743956e28b285b8e6f6fc7aa8edb':
More fixing for issue #
5366535: Lockscreen has wrong layout...
Dianne Hackborn [Thu, 8 Dec 2011 01:10:34 +0000 (17:10 -0800)]
Merge "Merge commit '
eee12419' into manualmerge" into ics-mr1
Robert Greenwalt [Thu, 8 Dec 2011 01:09:05 +0000 (17:09 -0800)]
Merge "Fix NPE in trimV4AddrZeros." into ics-mr1
Amith Yamasani [Thu, 8 Dec 2011 00:54:31 +0000 (16:54 -0800)]
Merge "Make new ringer toggles on power menu accessible and navigable with keyboard." into ics-mr1
Daniel Sandler [Thu, 8 Dec 2011 00:33:31 +0000 (16:33 -0800)]
Merge "Invalidate the whole status bar after layout transitions." into ics-mr1
Dianne Hackborn [Thu, 8 Dec 2011 00:33:15 +0000 (16:33 -0800)]
Merge commit '
eee12419' into manualmerge
Russell Brenner [Thu, 8 Dec 2011 00:20:15 +0000 (16:20 -0800)]
Merge "Update Armenian and Georgian fonts" into ics-mr1
Joe Malin [Thu, 8 Dec 2011 00:07:49 +0000 (16:07 -0800)]
Merge "DOC CHANGE: Add text for android.os.storage" into ics-mr0
Dianne Hackborn [Wed, 7 Dec 2011 23:22:21 +0000 (15:22 -0800)]
Merge "More fixing for issue #
5366535: Lockscreen has wrong layout..." into ics-mr0
Jeff Brown [Wed, 7 Dec 2011 23:04:39 +0000 (15:04 -0800)]
Merge "Make the dock orientation override the HDMI orientation." into ics-mr1
Dianne Hackborn [Wed, 7 Dec 2011 23:01:55 +0000 (15:01 -0800)]
Merge "Fix issue #
5144065: Tap on Music icon from Home screen..." into ics-mr1
Dianne Hackborn [Wed, 7 Dec 2011 23:00:05 +0000 (15:00 -0800)]
Merge "DO NOT MERGE. Integrate from MR 1 to fix issue #
5366535: Lockscreen..." into ics-mr0
Winson Chung [Wed, 7 Dec 2011 22:33:31 +0000 (14:33 -0800)]
Merge "Workaround for issue where the notifyDatasetChanged call chain is broken when Launcher is killed. (Bug
5703782)" into ics-mr1
Dave Burke [Wed, 7 Dec 2011 22:05:41 +0000 (14:05 -0800)]
Merge "Fetch at least 192KB to avoid our mp3 sniffer from blocking on data." into ics-mr1
Robert Greenwalt [Wed, 7 Dec 2011 20:29:14 +0000 (12:29 -0800)]
Merge "Trim leading zeros from ipv4 addrs." into ics-mr1
OSDN Git Service
