OSDN Git Service
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
John Wang [Wed, 11 Jan 2012 22:47:19 +0000 (14:47 -0800)]
Adjust the mapping of LTE signal bars.
bug:
5640958
Change-Id: I91efc5a81b505aae59dac9b1d69314efaffda6b6
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
Selim Gurun [Thu, 8 Dec 2011 02:39:24 +0000 (18:39 -0800)]
Do Not Merge. Move ssl callbacks to webcore thread.
Bug:
4586251
Cherry picking from master for ics-mr1.
Current ssl cert logic makes callbacks to webkit from the
UI thread. This is not right. Move the callbacks to proper thread.
Change-Id: I59affba47eca01b74e2bc33d88ef83a5850d6ce9
Roman Nurik [Wed, 11 Jan 2012 07:59:20 +0000 (23:59 -0800)]
Prevent Android Design sidenav links from opening a new window
Change-Id: I0ec74fb7ae9e348717d0d96603cd03c58c03459d
Scott Main [Wed, 11 Jan 2012 05:10:08 +0000 (21:10 -0800)]
docs: editorial fix to homepage
Change-Id: Iaebcacb6be770435091de181e8ee3f9c81d58139
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
Roman Nurik [Fri, 23 Dec 2011 00:18:19 +0000 (16:18 -0800)]
Android Design
Change-Id: I2692ca03fc4c0d088aec0588a36739203f4cf2d2
Scott Main [Tue, 10 Jan 2012 01:36:46 +0000 (17:36 -0800)]
docs: add links to Android Design from dev docs
Change-Id: Ib2334be0a05d33008d2e4850547ff1c3b7b16764
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
Jim Miller [Sat, 7 Jan 2012 02:24:04 +0000 (18:24 -0800)]
Fix
4560303: Add setting to lock later when power button pressed
This adds a feature to delay locking the device when the power button
is pressed. This fixes a use case where the user wants to turn off
the display (e.g. to save power) but doesn't want to lock the device.
For the case of a secure device (user has a pin/password/pattern),
this will lock the device immediately or not based on the setting.
For the non-secure case, this always "locks" the device to provide easy
access to the camera while preventing unwanted input.
Change-Id: Ie328485c3f7559e26896d761cbf0e69d3f4df4e2
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
Eric Laurent [Mon, 9 Jan 2012 21:47:48 +0000 (13:47 -0800)]
stagefright: limit audio gap for looped playback
The audio gap when looping audio is mostly due to
a delay requested by the audio player when executing
the end of stream message. This is to allow the audio
to be drained out of the pipe before actually stopping the
AudioTrack.
This delay is not needed when looping as the AudioTrack
is not stopped.
The fix consists in ignoring the requested delay when the
looping flag is set in awesome player.
Issue
5800981.
Change-Id: Ib32d2930c53ecebc21ca8440e6e054c7e20db4a5
Elliott Hughes [Tue, 3 May 2011 21:25:06 +0000 (14:25 -0700)]
Fix Music import for Turkish locales.
For non-localized strings like the keywords in SQL statements, we shouldn't use
locale-specific case transformations.
(Cherry pick of
03f8f84c345e7c861a6de889d434b9d82cf04c8d.)
Bug:
4284951
Change-Id: If5b7154f70a7db22837d071d1c57e929729b7d35
Dianne Hackborn [Mon, 9 Jan 2012 20:00:30 +0000 (12:00 -0800)]
Unhide Resources APIs for getting resources at specific densities.
This adds Resources.getDrawableForDensity() and
Resources.getValueForDensity(). These are needed for applications
to correctly retrieve larger icons such as in launcher when
running on a tablet. We had already exposed the APIs to tell the
application which density to use for app icons on the current
device, but didn't unhide these APIs that allowed you to
actually retrieve them.
This is safe to do without introducing a new API level (as long
as we do it soon) because we know these APIs already exist in
Android 4.0, and there is no reason for anyone to be removing
them when building a device.
Change-Id: I5138e5dc908197b66a98d20af73c5374cb5d41d3
Pin Ting [Thu, 5 Jan 2012 07:52:10 +0000 (15:52 +0800)]
Fixes typo.
Change-Id: I79e09594017d1e2decb927bff0d7c8a0fc2873f2
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
Eino-Ville Talvala [Thu, 5 Jan 2012 23:34:53 +0000 (15:34 -0800)]
Switch camera sounds to always use the system enforced audio stream.
Instead of picking between the music stream and the enforced audio
stream, change the camera service to always play sounds through
enforced system stream. Also update the currently-hidden CameraSound
API to match.
Bug:
5778365
Change-Id: I3cc64b1d1ff567dbac8020a665d5b19846197ff3
Wink Saville [Fri, 6 Jan 2012 01:21:46 +0000 (17:21 -0800)]
Fix an RuntimeExcpetion in GsmDCT.onDataSetupComplete
Instead of throwing an exception when the connection between
the DCT and a DC is broken (i.e. its null) it is treated as
an error with a new cause. And thus will be handled as other
typical errors.
Bug:
5798643
Change-Id: I46f1660ae78f118b54ab62504809723ca302b2ef
Teng-Hui Zhu [Thu, 5 Jan 2012 01:15:46 +0000 (17:15 -0800)]
getDuration can be only called after prepared. DO NOT MERGE
bug:
5816130
Change-Id: Ia740a1a4da7f321356f24c35067f9499955289a9
Fabrice Di Meglio [Thu, 5 Jan 2012 22:34:42 +0000 (14:34 -0800)]
Fix bug #
5822825 Paint.measureText (char[] text, int index, int count) cannot handle text more than 32K long - DO NOT MERGE
- do not clear the smart pointer when the cache entry does not fit the cache size
See http://code.google.com/p/android/issues/detail?id=23337
Change-Id: Id4533d9f8a396c310c9215157ec5a4c07f30c7f2
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
Scott Main [Tue, 3 Jan 2012 18:10:21 +0000 (10:10 -0800)]
docs: second set of diagram updates
Change-Id: I1df85b6a954c29344d537737da57683b2c7941fd
Winson Chung [Thu, 5 Jan 2012 00:43:10 +0000 (16:43 -0800)]
Fixing crash when taking screenshot over secure window.
Change-Id: If3d4e458030e37aae3310b23dcad2ff5fe29fa73
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
Scott Main [Wed, 4 Jan 2012 19:47:18 +0000 (11:47 -0800)]
docs: add Teleepoch VID/driver info
and update Huawei url
Change-Id: I4d6720d132f0d4e53bb25aa225327e38ba969881
Kazuhiro Ondo [Thu, 22 Dec 2011 02:54:03 +0000 (20:54 -0600)]
Enhancement on ICS data stall polling logic
Put enhancements on data stall polling logic in ICS so that
stall recovery can kick in earler while screen is on.
Bug:
5767897
Change-Id: I4683fc45c0161f4374749c8e5840261c19a48f77
Ben Murdoch [Fri, 16 Dec 2011 18:08:30 +0000 (18:08 +0000)]
Do not allow file:// access when it is disabled. Do not merge.
Cherry pick of If2793f31cb37e0d3af15cb18e818bfa4058167fd
If WebSettings is configured to disallow access to file://
URLs, then block them.
Bug:
5773763
Change-Id: I0ab84cde90c955d31077329fddebc25978287c64
Scott Main [Thu, 29 Dec 2011 19:28:38 +0000 (11:28 -0800)]
docs: Update lifecycle diagrams to use new omnigraffle designs;
add corresponding graffle files
update discussion of activity state restore for clarification
Change-Id: I7c6a68b627b35d0b648fac071a06960a7e833686
Christopher Tate [Wed, 4 Jan 2012 01:38:51 +0000 (17:38 -0800)]
Merge "Tweak docs on 'adb logcat'" into ics-mr1
Christopher Tate [Tue, 3 Jan 2012 22:03:06 +0000 (14:03 -0800)]
Tweak docs on 'adb logcat'
* Add description of 'threadtime' output format
* Remove description of highly-confusing and never-used 'thread' output format
* Adjust language slightly
Change-Id: I2dcc8b7e5e8c039659697e90d7a4b3746b9135e9
Scott Main [Tue, 3 Jan 2012 19:54:50 +0000 (11:54 -0800)]
docs: dasboard update for 1/3/12
Change-Id: Ie584d9ee238b6d4a37c25dd7e30b0cf493cbfe47
Scott Main [Wed, 28 Dec 2011 00:22:27 +0000 (16:22 -0800)]
docs: fix broken links in .jd docs
Change-Id: Ide8bb1a11a704d6821b52a0128b24a76de2e707f
Wink Saville [Tue, 3 Jan 2012 23:06:15 +0000 (15:06 -0800)]
Add support of dislaying Alpha tag for BIP commands
While BIP data call setup is still handled in RIL/Modem,
this patch is adding support of Alpha tag display on UI.
Alpha tag is optionally included in "OPEN Channel", "Close Channel",
"Send Data" or "Receive Data" command.
"Open channel" will be notified via RIL_UNSOL_STK_PROACTIVE_COMMAND
which requires TERMINAL RESPONSE based on user input.
"Close channel", "Send Data" and "Receive Data" commands
are send via RIL_UNSOL_STK_EVENT_NOTIFY just to display
transient notice.
Bug:
5165510
Change-Id: I873e55274c860886bc816ce6fb07cb882d339214
Winson Chung [Tue, 3 Jan 2012 22:00:08 +0000 (14:00 -0800)]
Updating default image wallpaper for tablet.
Change-Id: Ia4784cf05ccbf819d35adb494cd181850f6b7e11
Dirk Dougherty [Tue, 3 Jan 2012 18:09:29 +0000 (10:09 -0800)]
Doc change: fix link target for "Publish" icon.
Change-Id: Iafc8db7e9ad7c42e5e2a1eaed2fb5b93a53e56f9
Scott Main [Tue, 27 Dec 2011 23:31:54 +0000 (15:31 -0800)]
docs: add links for Galaxy Nexus driver
Change-Id: Iae875f70049f3b4561783e66e264eac802e8ae19
Eric Laurent [Fri, 23 Dec 2011 00:08:41 +0000 (16:08 -0800)]
audioflinger: fix clicks on 48kHz audio.
The calculation done in prepareTracks_l() for the minimum amount
off frames needed to mix one output buffer had 2 issues:
- the additional sample needed for interpolation was not included
- the fact that the resampler does not acknowledge the frames consumed
immediately after each mixing round but only once all frames requested have been used
was not taken into account.
Thus the number of frames available in track buffer could be considered sufficient although
it was not and the resampler would abort producing a short silence perceived as a click.
Issue
5727099.
Change-Id: I7419847a7474c7d9f9170bedd0a636132262142c
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
Joe Fernandez [Tue, 20 Dec 2011 18:38:34 +0000 (10:38 -0800)]
docs: Add developer guide cross-references, Project ACRE, round 4
Change-Id: I1b43414aaec8ea217b39a0d780c80a25409d0991
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
Roman Nurik [Thu, 22 Dec 2011 21:58:53 +0000 (13:58 -0800)]
docs: Update App Widgets dev guide size discussion
This is mainly an update to match the design guidelines.
See also bug
5555264.
Change-Id: I1c83fb33b7dca412905d21b588c5754d1d3c5cfe
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
Kazuhiro Ondo [Tue, 13 Dec 2011 16:34:37 +0000 (10:34 -0600)]
Support suggestedRetryTime in CDMA DCT
Support suggestedRetryTime in SETUP_DATA response in CDMA DCT.
Bug:
5740832
Change-Id: I4abd884bec76f1d9ee29d1ba36c7ea2cac9e0fb3
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
Bill Gruber [Tue, 20 Dec 2011 01:32:47 +0000 (17:32 -0800)]
Doc Fix: Sensors and Cameras
Change-Id: I964a06e5224e59f3098f4d316db4d3b119a05a88
Scott Main [Sun, 18 Dec 2011 22:00:41 +0000 (14:00 -0800)]
docs: fix sidenav typo
Change-Id: Ief250d461294ed99963cc8e9aa24c9f271e72b15
Scott Main [Fri, 16 Dec 2011 20:46:31 +0000 (12:46 -0800)]
docs: add driver info for Hisense
Change-Id: I95c09e7aa905345113112329c98d5f00e145b2bb
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
Roman Nurik [Fri, 16 Dec 2011 19:48:24 +0000 (11:48 -0800)]
docs: Add missing intent flag to Android U nav class
Change-Id: I18eb286a8d8b2c70f7d894d1244d2568ce6ce6c0
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
Scott Main [Fri, 16 Dec 2011 19:29:12 +0000 (11:29 -0800)]
docs: fix whitespace in sidenav
Change-Id: I7d8decaf122de1f632fdbd3ca5a1a34b3d1d91dd
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
Roman Nurik [Fri, 16 Dec 2011 19:15:13 +0000 (11:15 -0800)]
docs: Minor link fix in Android U class
Change-Id: Ifab9c8088ba686a560647883cbacdd34c1c08c80
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
Alexander Lucas [Fri, 16 Dec 2011 19:03:18 +0000 (11:03 -0800)]
Fixed table labelling issues in 'Multiple Dimensions' multiple apk lesson
Change-Id: I05c100d583340456eed8d15d555e1f02a38504a8
Dirk Dougherty [Fri, 16 Dec 2011 18:56:29 +0000 (10:56 -0800)]
Merge "Updated "Designing for Security" documentation" into ics-mr1
Adrian Ludwig [Thu, 15 Dec 2011 23:37:33 +0000 (15:37 -0800)]
Updated "Designing for Security" documentation
Change-Id: I1fe5b353d750695f75370ef31ae1b39e50159164
Signed-off-by: Adrian Ludwig <aludwig@google.com>
Scott Main [Fri, 16 Dec 2011 18:41:54 +0000 (10:41 -0800)]
docs: typos
Change-Id: Iee489eb39029b5d550e37f49b1bd5d4cf30e445c
Dirk Dougherty [Fri, 16 Dec 2011 08:01:52 +0000 (00:01 -0800)]
Doc change: edits to ICS MR1 API Overview.
Change-Id: Idb18e3085b3dd54c9a39e74c37428c3d5b28aa83
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
Joe Fernandez [Fri, 16 Dec 2011 06:33:41 +0000 (22:33 -0800)]
docs: Release Notes v2 for Android 4.0.3, ADT 16.0.1, Support lib r5-r6
Change-Id: I628cd076cd37f6252837de276c4b7a9040c37bc1
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.
Fred Chung [Fri, 16 Dec 2011 06:24:12 +0000 (22:24 -0800)]
Fixed Android U Enterprise lesson pre-requisites and a minor typo.
Change-Id: Ide393a0957f3e797f14d7c349c35337849b15f02
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 06:04:46 +0000 (22:04 -0800)]
docs: update homepage for 4.0.3 announcment
Change-Id: I54d1d447ac224982f4483afede2087ce18937ed0
Jamie Gennis [Fri, 16 Dec 2011 02:14:05 +0000 (18:14 -0800)]
SurfaceMediaSource: use the HW_TEXTURE usage bit
This change makes SurfaceMediaSource request Gralloc buffers with the
HW_TEXTURE usage bit rather than the VIDEO_ENCODER bit. It is a
temporary workaround for what is likely a Gralloc bug.
Bug:
5771063
Change-Id: I9cce615e80fc14a1644fae27ba06970c262dd179
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)
Jamie Gennis [Fri, 16 Dec 2011 02:14:05 +0000 (18:14 -0800)]
SurfaceMediaSource: use the HW_TEXTURE usage bit
This change makes SurfaceMediaSource request Gralloc buffers with the
HW_TEXTURE usage bit rather than the VIDEO_ENCODER bit. It is a
temporary workaround for what is likely a Gralloc bug.
Bug:
5771063
Change-Id: I9cce615e80fc14a1644fae27ba06970c262dd179
Scott Main [Fri, 16 Dec 2011 04:13:20 +0000 (20:13 -0800)]
docs: fix encoding issue or whatever with docs (not showing titles)
Change-Id: Iac9afc3aa36e86d2f8defc8a7252864c23ecc23b
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:52:33 +0000 (19:52 -0800)]
docs: add remembering users class to nav
Change-Id: Iedfd5c6580dd2d23df1eaf4da6cf43d77b5866f8
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
Dirk Dougherty [Thu, 15 Dec 2011 23:34:41 +0000 (15:34 -0800)]
Doc merge from master:Training class on Identifying and Authenticating Users.
Conflicts:
docs/html/training/id-auth/authenticate.jd
docs/html/training/id-auth/custom_auth.jd
docs/html/training/id-auth/identify.jd
docs/html/training/id-auth/index.jd
Change-Id: I73174b2cb923ec5d28b551f27d0512d427616c69
Scott Main [Fri, 16 Dec 2011 03:33:04 +0000 (19:33 -0800)]
docs: typo in training orientation
Change-Id: I9535713d7784146e96df5b347f2be38628ce7d2c
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