OSDN Git Service

android-x86/frameworks-base.git
11 years agoMerge "Fix typos in LinearLayout comments" into jb-mr1-dev
Fabrice Di Meglio [Sat, 1 Dec 2012 01:14:11 +0000 (17:14 -0800)]
Merge "Fix typos in LinearLayout comments" into jb-mr1-dev

11 years agoMerge "docs: gcm navtree" into jb-mr1-dev
Scott Main [Sat, 1 Dec 2012 01:04:31 +0000 (17:04 -0800)]
Merge "docs: gcm navtree" into jb-mr1-dev

11 years agodocs: gcm navtree
Robert Ly [Sat, 1 Dec 2012 01:02:22 +0000 (17:02 -0800)]
docs: gcm navtree

Change-Id: Ie20a0cc7caf8e0b5ff2a6f56ddc3932f25768fa3

11 years agoMerge "docs: Fixed typo in android tool syntax." into jb-mr1-dev
Quddus Chong [Sat, 1 Dec 2012 00:38:50 +0000 (16:38 -0800)]
Merge "docs: Fixed typo in android tool syntax." into jb-mr1-dev

11 years agoMerge "docs: update javadocs with gcm @value stuff" into jb-mr1-dev
Robert Ly [Sat, 1 Dec 2012 00:33:51 +0000 (16:33 -0800)]
Merge "docs: update javadocs with gcm @value stuff" into jb-mr1-dev

11 years agodocs: Fixed typo in android tool syntax.
Quddus Chong [Sat, 1 Dec 2012 00:26:35 +0000 (16:26 -0800)]
docs: Fixed typo in android tool syntax.

Change-Id: Ic40f10e3f6b7c052dc40cb723f40956a750544e8

11 years agodocs: update javadocs with gcm @value stuff
Robert Ly [Sat, 1 Dec 2012 00:15:46 +0000 (16:15 -0800)]
docs: update javadocs with gcm @value stuff

Change-Id: I837a1734e00d61f74cf8faac78f75258d66b6d05

11 years agoMerge "Doc change: add SMP Primer for Android. Support a new "article" toc style...
Dirk Dougherty [Fri, 30 Nov 2012 23:35:47 +0000 (15:35 -0800)]
Merge "Doc change: add SMP Primer for Android. Support a new "article" toc style in training." into jb-mr1-dev

11 years agoDoc change: add SMP Primer for Android. Support a new "article" toc style in training.
Dirk Dougherty [Thu, 29 Nov 2012 02:53:10 +0000 (18:53 -0800)]
Doc change: add SMP Primer for Android. Support a new "article" toc style in training.

Change-Id: I75826e12bb255e1fe85822b8c51e750ada01dfc5

11 years agoMerge "Fix some typos and missing @param in android.os.Bundle" into jb-mr1-dev
Nicolas Klein [Fri, 30 Nov 2012 22:50:37 +0000 (14:50 -0800)]
Merge "Fix some typos and missing @param in android.os.Bundle" into jb-mr1-dev

11 years agoFix some typos and missing @param in android.os.Bundle
Nicolas Klein [Fri, 30 Nov 2012 22:41:46 +0000 (14:41 -0800)]
Fix some typos and missing @param in android.os.Bundle

getChar(String) and getChar(String, char) had wrong description in their
javadoc.
Also most of the get methods with default value were missing the corresponding
@param tag for the default value parameter.

Change-Id: I0f38b3caacf9cabd70e0c1ada36af3662f5566d0

11 years agoMerge "docs: gms fixes" into jb-mr1-dev
Robert Ly [Fri, 30 Nov 2012 22:31:42 +0000 (14:31 -0800)]
Merge "docs: gms fixes" into jb-mr1-dev

11 years agoMerge "docs: add correct toc for google reference" into jb-mr1-dev
Robert Ly [Fri, 30 Nov 2012 20:12:32 +0000 (12:12 -0800)]
Merge "docs: add correct toc for google reference" into jb-mr1-dev

11 years agodocs: add correct toc for google reference
Robert Ly [Fri, 30 Nov 2012 19:58:19 +0000 (11:58 -0800)]
docs: add correct toc for google reference

Change-Id: I594794b8d7ed5c52acdc37d5a4eddd2fdd229bcd

11 years agoMerge "Revert "docs: gms javadocs"" into jb-mr1-dev
Robert Ly [Fri, 30 Nov 2012 19:52:43 +0000 (11:52 -0800)]
Merge "Revert "docs: gms javadocs"" into jb-mr1-dev

11 years agoMerge "Cannot move edit text cursor to first position using character granularity...
Svetoslav Ganov [Fri, 30 Nov 2012 19:43:54 +0000 (11:43 -0800)]
Merge "Cannot move edit text cursor to first position using character granularity." into jb-mr1-dev

11 years agoresolved conflicts for merge of 011132a7 to jb-mr1-dev
Nick Kralevich [Fri, 30 Nov 2012 18:23:56 +0000 (10:23 -0800)]
resolved conflicts for merge of 011132a7 to jb-mr1-dev

Change-Id: I304ef91eef99526dec348a59b12c0934173bcfcb

11 years agoam b8da0376: Secure a handful of framework broadcasts
Robert Greenwalt [Fri, 30 Nov 2012 18:05:33 +0000 (10:05 -0800)]
am b8da0376: Secure a handful of framework broadcasts

* commit 'b8da0376f2d50fdb2ee58deacc6d2041689e36d1':
  Secure a handful of framework broadcasts

11 years agoMerge "docs: gms and gcm javadocs" into jb-mr1-dev
Scott Main [Fri, 30 Nov 2012 17:56:48 +0000 (09:56 -0800)]
Merge "docs: gms and gcm javadocs" into jb-mr1-dev

11 years agodocs: revise doc titles
Scott Main [Fri, 30 Nov 2012 05:13:30 +0000 (21:13 -0800)]
docs: revise doc titles

Change-Id: I7a11aabd90df758a5118730fe2d1b6c4f4e6ecfd

11 years agodocs: gms and gcm javadocs
Robert Ly [Fri, 30 Nov 2012 12:02:04 +0000 (04:02 -0800)]
docs: gms and gcm javadocs

Change-Id: I93fe06983e42cb21d05d020e84cafe31792a9c8e

11 years agodocs: gms fixes
Robert Ly [Fri, 30 Nov 2012 11:07:11 +0000 (03:07 -0800)]
docs: gms fixes

Change-Id: I197678e85ea2d11f35ccecdd7abc9564035acad4

11 years agoRevert "docs: gms javadocs"
Robert Ly [Fri, 30 Nov 2012 08:18:20 +0000 (00:18 -0800)]
Revert "docs: gms javadocs"

This reverts commit 830b23b76676542cbcb5ef3c60c869460d4c5466

Change-Id: I75a9d4f6aa424ed4439b4415d575716a40b75343

11 years agoMerge "Doc change: cleanup filtering sidebars and api level table. Changes links...
Dirk Dougherty [Fri, 30 Nov 2012 05:11:24 +0000 (21:11 -0800)]
Merge "Doc change: cleanup filtering sidebars and api level table. Changes links pointing to billing and other play docs that have moved." into jb-mr1-dev

11 years agoDoc change: cleanup filtering sidebars and api level table. Changes links pointing...
Dirk Dougherty [Fri, 30 Nov 2012 01:25:09 +0000 (17:25 -0800)]
Doc change: cleanup filtering sidebars and api level table. Changes links pointing to billing and other play docs that have moved.

Change-Id: I5528e82a6f97eb25f2ec2db5dfe1e178d9580f3c

11 years agoMerge "Import translations. DO NOT MERGE" into jb-mr1-dev
Baligh Uddin [Fri, 30 Nov 2012 05:02:54 +0000 (21:02 -0800)]
Merge "Import translations. DO NOT MERGE" into jb-mr1-dev

11 years agodocs: add maps v2 announcement
Scott Main [Thu, 29 Nov 2012 22:28:44 +0000 (14:28 -0800)]
docs: add maps v2 announcement

Change-Id: Ibf9b7ac02ffc8f70b48bcede4df929ec089108c5

11 years agodocs: gms javadocs
Robert Ly [Thu, 29 Nov 2012 21:40:49 +0000 (13:40 -0800)]
docs: gms javadocs

Change-Id: Ibcae03cab861c90a589f39a860889a3f4e6a55ad

11 years agodocs: update gms toc and landing pages
Robert Ly [Wed, 28 Nov 2012 22:04:29 +0000 (14:04 -0800)]
docs: update gms toc and landing pages

Change-Id: I2d55026d492356b70de2071c96786b6dadb5938a

11 years agoSecure a handful of framework broadcasts
Robert Greenwalt [Thu, 29 Nov 2012 00:42:32 +0000 (16:42 -0800)]
Secure a handful of framework broadcasts

At least one of these was getting spoofed in the wild.
We don't want to go too far this late in the game, but this is a good start.

bug:7622253
(cherry picked from commit 47918ae3b4e7ebb54711884e9ff9d0300591ab8b)

Conflicts:

core/res/AndroidManifest.xml

Change-Id: I118b31489fe7add5b8d69289cab9f4e8ab269495

11 years agoMerge "docs: fix bug 7628699" into jb-mr1-dev
Robert Ly [Thu, 29 Nov 2012 21:01:59 +0000 (13:01 -0800)]
Merge "docs: fix bug 7628699" into jb-mr1-dev

11 years agoMerge "docs: update landing page for Google Services" into jb-mr1-dev
Scott Main [Thu, 29 Nov 2012 19:28:05 +0000 (11:28 -0800)]
Merge "docs: update landing page for Google Services" into jb-mr1-dev

11 years agodocs: update landing page for Google Services
Scott Main [Thu, 29 Nov 2012 03:23:17 +0000 (19:23 -0800)]
docs: update landing page for Google Services

Change-Id: I7d7543282158474b8e722a9833ddf15a1e4e03f8

11 years agoImport translations. DO NOT MERGE
Baligh Uddin [Thu, 29 Nov 2012 16:59:36 +0000 (08:59 -0800)]
Import translations. DO NOT MERGE

Change-Id: I5ba3917c7ad5b6ec719f22aa79ce6132aea74b39
Auto-generated-cl: translation import

11 years agoCache resource ID lookups in aapt
Christopher Tate [Fri, 16 Nov 2012 23:58:08 +0000 (15:58 -0800)]
Cache resource ID lookups in aapt

This speeds up certain workloads considerably, particularly
those involved in buildling apps via the SDK.  Windows-based
use should particularly benefit from the change.

(cherry picked from commit d8dde13a63565dcd72bcf03a5088407b737ba793)

Change-Id: I33835bc64ade77688d41e8bfcd371b0a5f59d8fd

11 years agoMerge "docs: revisions to gps landing pages" into jb-mr1-dev
Scott Main [Wed, 28 Nov 2012 21:14:45 +0000 (13:14 -0800)]
Merge "docs: revisions to gps landing pages" into jb-mr1-dev

11 years agoMerge " Doc change - cherry pick from dac-dev: Clean up stray image source files...
Dirk Dougherty [Wed, 28 Nov 2012 21:14:03 +0000 (13:14 -0800)]
Merge " Doc change - cherry pick from dac-dev: Clean up stray image source files and adjust links etc." into jb-mr1-dev

11 years agodocs: revisions to gps landing pages
Scott Main [Wed, 28 Nov 2012 19:01:37 +0000 (11:01 -0800)]
docs: revisions to gps landing pages

Change-Id: Ie9f2cf526a3ea328ce22dfb208e7eb95add56d0b

11 years agodocs: fix bug 7628699
Robert Ly [Wed, 28 Nov 2012 18:11:22 +0000 (10:11 -0800)]
docs: fix bug 7628699

Change-Id: I7e8ca29910345559993cf415c2a89a21f50e4e17

11 years agoMerge "docs: update dreamservice description" into jb-mr1-dev
Scott Main [Wed, 28 Nov 2012 18:05:30 +0000 (10:05 -0800)]
Merge "docs: update dreamservice description" into jb-mr1-dev

11 years agoam d60ea46f: am a880436f: am b7863a3c: Merge "Doc update: new Notify User AU class...
kmccormick@google.com [Wed, 28 Nov 2012 00:56:03 +0000 (16:56 -0800)]
am d60ea46f: am a880436f: am b7863a3c: Merge "Doc update: new Notify User AU class" into jb-dev-docs

* commit 'd60ea46fe7a9856ca592ff7dea79aa8ce80f5e66':
  Doc update: new Notify User AU class

11 years agoam a880436f: am b7863a3c: Merge "Doc update: new Notify User AU class" into jb-dev...
kmccormick@google.com [Wed, 28 Nov 2012 00:54:01 +0000 (16:54 -0800)]
am a880436f: am b7863a3c: Merge "Doc update: new Notify User AU class" into jb-dev-docs

* commit 'a880436f4416168d256822a23bd23f936136706d':
  Doc update: new Notify User AU class

11 years agoam b7863a3c: Merge "Doc update: new Notify User AU class" into jb-dev-docs
kmccormick@google.com [Wed, 28 Nov 2012 00:52:00 +0000 (16:52 -0800)]
am b7863a3c: Merge "Doc update: new Notify User AU class" into jb-dev-docs

* commit 'b7863a3ce4db964322783ff7e84acc5713e04d1d':
  Doc update: new Notify User AU class

11 years agoMerge "Doc update: new Notify User AU class" into jb-dev-docs
&& repo sync -j8 [Wed, 28 Nov 2012 00:49:36 +0000 (16:49 -0800)]
Merge "Doc update: new Notify User AU class" into jb-dev-docs

11 years agoDoc update: new Notify User AU class
&& repo sync -j8 [Thu, 4 Oct 2012 23:34:23 +0000 (16:34 -0700)]
Doc update: new Notify User AU class

Change-Id: Idcda9535c5aa2602cf4f0aecb3ab4b1518ab966b

11 years agoMerge "docs: add new GMS landing and reference" into jb-mr1-dev
Robert Ly [Wed, 28 Nov 2012 00:32:04 +0000 (16:32 -0800)]
Merge "docs: add new GMS landing and reference" into jb-mr1-dev

11 years ago Doc change - cherry pick from dac-dev: Clean up stray image source files and adjust...
Dirk Dougherty [Sun, 14 Oct 2012 00:15:20 +0000 (17:15 -0700)]
 Doc change - cherry pick from dac-dev: Clean up stray image source files and adjust links etc.

Change-Id: I45de360c45426ab6d2e04ef6a9e5fa920ff63c57

11 years agodocs: add new GMS landing and reference
Robert Ly [Wed, 14 Nov 2012 21:26:28 +0000 (13:26 -0800)]
docs: add new GMS landing and reference

Change-Id: I48c75dd5924bdf297b5368887084d148efcd66ba

11 years agoMerge "Doc change: fix typo in jb docs." into jb-mr1-dev
Dirk Dougherty [Wed, 28 Nov 2012 00:06:10 +0000 (16:06 -0800)]
Merge "Doc change: fix typo in jb docs." into jb-mr1-dev

11 years agoDoc change: fix typo in jb docs.
Dirk Dougherty [Tue, 27 Nov 2012 23:59:37 +0000 (15:59 -0800)]
Doc change: fix typo in jb docs.

Change-Id: I1e9820685eb8f1aa5580643215f5a7edd0c99c07
Bug:  7621378

11 years agoImport translations. DO NOT MERGE
Baligh Uddin [Tue, 27 Nov 2012 20:45:19 +0000 (12:45 -0800)]
Import translations. DO NOT MERGE

Change-Id: I1079e1b66c125f8b6044f3502961e11cc7858ba3
Auto-generated-cl: translation import

11 years agoCannot move edit text cursor to first position using character granularity.
Svetoslav Ganov [Tue, 27 Nov 2012 01:32:17 +0000 (17:32 -0800)]
Cannot move edit text cursor to first position using character granularity.

Navigating over text backwards by character does not allow the cursor to get
at the beginning of the text and it stops one position before the start. Now
the cursor can get to index zero which is before the first character.

bug:7307336

Change-Id: I109b579835cc080907b20b01e0cf07811e962c6c

11 years agoUpdate the content shell command's usage instructions.
Svetoslav Ganov [Thu, 22 Nov 2012 00:13:38 +0000 (16:13 -0800)]
Update the content shell command's usage instructions.

The usage instructions of the content shell command were missing some
excape charecters which caused the examples not to work. As a result
of the incorrect instructions users are prone to constructing incorrect
commands.

bug:7526252

Change-Id: I2fcc4dd1fd05806fe951245651b97e40a4786d24

11 years agoImport translations. DO NOT MERGE
Baligh Uddin [Fri, 23 Nov 2012 05:52:46 +0000 (21:52 -0800)]
Import translations. DO NOT MERGE

Change-Id: I9f2a464733eb765385c3f8f83bbcd1a1e33b0e26
Auto-generated-cl: translation import

11 years agoImport translations. DO NOT MERGE
Baligh Uddin [Wed, 21 Nov 2012 06:35:34 +0000 (22:35 -0800)]
Import translations. DO NOT MERGE

Change-Id: Ia01f5cbaa9a00034cf6bd277cb483bf0465d12e6
Auto-generated-cl: translation import

11 years agoam 7112cd46: am 2f9947e9: am ddf10d44: Merge "Doc Update: Removed "no guaranteed...
kmccormick@google.com [Tue, 20 Nov 2012 00:58:10 +0000 (16:58 -0800)]
am 7112cd46: am 2f9947e9: am ddf10d44: Merge "Doc Update: Removed "no guaranteed delivery" line." into jb-dev-docs

* commit '7112cd4687687203b35013f197089cb66508a14e':
  Doc Update: Removed "no guaranteed delivery" line.

11 years agoam 2f9947e9: am ddf10d44: Merge "Doc Update: Removed "no guaranteed delivery" line...
kmccormick@google.com [Tue, 20 Nov 2012 00:54:48 +0000 (16:54 -0800)]
am 2f9947e9: am ddf10d44: Merge "Doc Update: Removed "no guaranteed delivery" line." into jb-dev-docs

* commit '2f9947e9aa2b795dbc7db282a99a09410f1fadf2':
  Doc Update: Removed "no guaranteed delivery" line.

11 years agoam ddf10d44: Merge "Doc Update: Removed "no guaranteed delivery" line." into jb-dev...
kmccormick@google.com [Tue, 20 Nov 2012 00:53:11 +0000 (16:53 -0800)]
am ddf10d44: Merge "Doc Update: Removed "no guaranteed delivery" line." into jb-dev-docs

* commit 'ddf10d44c12fbd8ffb115c847913296b455f412d':
  Doc Update: Removed "no guaranteed delivery" line.

11 years agoMerge "Doc Update: Removed "no guaranteed delivery" line." into jb-dev-docs
&& repo sync -j8 [Tue, 20 Nov 2012 00:51:08 +0000 (16:51 -0800)]
Merge "Doc Update: Removed "no guaranteed delivery" line." into jb-dev-docs

11 years agoMerge "Revert "NumberPicker should adjust min and max when displayed values are set...
Svetoslav Ganov [Mon, 19 Nov 2012 23:50:19 +0000 (15:50 -0800)]
Merge "Revert "NumberPicker should adjust min and max when displayed values are set." (a.k.a. Santa is back)" into jb-mr1-dev

11 years agoRevert "NumberPicker should adjust min and max when displayed values are set." (a...
Svetoslav Ganov [Mon, 19 Nov 2012 20:33:41 +0000 (12:33 -0800)]
Revert "NumberPicker should adjust min and max when displayed values are set." (a.k.a. Santa is back)

This reverted change was adjusting the min and max values for the NumberPicker
which is not desirable since it changes behavior and it will be possible for
an app that works on the current platform to crash on an older one. Also the
adjustment was not implemented correctly.

Updated the documentation to clarify the reltionship between the min value,
max value, and the displayed values array.

Bug:7518172

This reverts commit a1410e6789ce72bc423793315a51aea8b6bad6c7

Change-Id: I109f1b1f54c1e609941243cabab9241871b6b12b

11 years agoNotification vibration improvements: [DO NOT MERGE]
Daniel Sandler [Wed, 14 Nov 2012 04:49:47 +0000 (20:49 -0800)]
Notification vibration improvements: [DO NOT MERGE]

 - When notifications vibrate as a fallback (that is,
   because they want to play a sound but the device is in
   vibrate mode), this no longer requires the VIBRATE
   permission.
 - As a bonus, if your notifications use DEFAULT_VIBRATE,
   you don't need the VIBRATE permission either.
 - If you specify a custom vibration pattern, you'll still
   need the VIBRATE permission for that.
 - Notifications vibrating in fallback mode use same
   vibration pattern but can be changed easily in future.
 - The DEFAULT_VIBRATE and fallback vibrate patterns are now
   specified in config.xml.

Bug: 7531442
Change-Id: I7a2d8413d1becc53b9d31f0d1abbc2acc3f650c6

11 years agodocs: update dreamservice description
Scott Main [Mon, 19 Nov 2012 19:58:59 +0000 (11:58 -0800)]
docs: update dreamservice description

Change-Id: I7e7295a3d67ca1760ba52b3958bf91540692e542

11 years agoMerge "cherrypick from Change-Id: I70cb9111ff5f5a156cecb433b3baf7925a6be1a8 Fix typo...
Scott Main [Mon, 19 Nov 2012 19:44:58 +0000 (11:44 -0800)]
Merge "cherrypick from Change-Id: I70cb9111ff5f5a156cecb433b3baf7925a6be1a8 Fix typo" into jb-mr1-dev

11 years agocherrypick from Change-Id: I70cb9111ff5f5a156cecb433b3baf7925a6be1a8
Jaewan Kim [Fri, 16 Nov 2012 06:59:55 +0000 (15:59 +0900)]
cherrypick from Change-Id: I70cb9111ff5f5a156cecb433b3baf7925a6be1a8
Fix typo

Change-Id: Idd09f7fea890dbc290589b1ebe4a1a139f98c740

11 years agoMerge "Import translations. DO NOT MERGE" into jb-mr1-dev
Baligh Uddin [Sat, 17 Nov 2012 01:43:42 +0000 (17:43 -0800)]
Merge "Import translations. DO NOT MERGE" into jb-mr1-dev

11 years agoImport translations. DO NOT MERGE
Baligh Uddin [Fri, 16 Nov 2012 22:10:37 +0000 (14:10 -0800)]
Import translations. DO NOT MERGE

Change-Id: I8b0789aa1a67fba819a5f2b87373e9ab5fa3f59d
Auto-generated-cl: translation import

11 years agoImport translations. DO NOT MERGE
Baligh Uddin [Fri, 16 Nov 2012 21:49:29 +0000 (13:49 -0800)]
Import translations. DO NOT MERGE

Change-Id: I90b5f538f6faf18d571907acaa96372894619c87
Auto-generated-cl: translation import

11 years agodocs: move articles into group directory
Scott Main [Fri, 16 Nov 2012 16:54:27 +0000 (08:54 -0800)]
docs: move articles into group directory

Change-Id: If90f5ac284d8df16b830d5744fbd684e5b1b34e3

11 years agodocs: revise getting started intro
Scott Main [Fri, 16 Nov 2012 02:27:32 +0000 (18:27 -0800)]
docs: revise getting started intro

Change-Id: I7561da6ae2f21e31370f5dbbd121f2c6084523c1

11 years agodocs: update checksums/sizes for new adt bundles
Scott Main [Fri, 16 Nov 2012 01:09:19 +0000 (17:09 -0800)]
docs: update checksums/sizes for new adt bundles

Change-Id: Id1245a9f1ce7cf4854e8f39a9938b00aa18e4cca

11 years agoMerge "docs: update sdk install to handle both 32 and 64-bit bundles" into jb-mr1-dev
Scott Main [Thu, 15 Nov 2012 23:19:11 +0000 (15:19 -0800)]
Merge "docs: update sdk install to handle both 32 and 64-bit bundles" into jb-mr1-dev

11 years agodocs: update sdk install to handle both 32 and 64-bit bundles
Scott Main [Thu, 15 Nov 2012 22:56:52 +0000 (14:56 -0800)]
docs: update sdk install to handle both 32 and 64-bit bundles

Change-Id: I171f28a332c4d31600865f6ad8f6a95fb4f0c3aa

11 years agoMerge "docs: fix ndk tos layout for small screens" into jb-mr1-dev
Scott Main [Thu, 15 Nov 2012 19:04:38 +0000 (11:04 -0800)]
Merge "docs: fix ndk tos layout for small screens" into jb-mr1-dev

11 years agodocs: fix ndk tos layout for small screens
Scott Main [Thu, 15 Nov 2012 19:03:46 +0000 (11:03 -0800)]
docs: fix ndk tos layout for small screens

Change-Id: I95e11481cdfe759416b4a661580ee9e6b0dd24d2

11 years agodocs: fix broken youtube playlists
Scott Main [Thu, 15 Nov 2012 18:26:40 +0000 (10:26 -0800)]
docs: fix broken youtube playlists

Change-Id: I07a1e9af2c8104a56c9a5e6d1060de7578cbd1ae

11 years agoam 596d0e38: am f53c5f36: am d1ae2721: Merge "Doc Update: Fixing images" into jb...
kmccormick@google.com [Thu, 15 Nov 2012 17:51:56 +0000 (09:51 -0800)]
am 596d0e38: am f53c5f36: am d1ae2721: Merge "Doc Update: Fixing images" into jb-dev-docs

* commit '596d0e3881782096f7a6ea9959e8dc5f07004623':
  Doc Update: Fixing images

11 years agoam f53c5f36: am d1ae2721: Merge "Doc Update: Fixing images" into jb-dev-docs
kmccormick@google.com [Thu, 15 Nov 2012 17:49:21 +0000 (09:49 -0800)]
am f53c5f36: am d1ae2721: Merge "Doc Update: Fixing images" into jb-dev-docs

* commit 'f53c5f3683b71d232a78e04ea06649dd5e4bfee1':
  Doc Update: Fixing images

11 years agoam d1ae2721: Merge "Doc Update: Fixing images" into jb-dev-docs
kmccormick@google.com [Thu, 15 Nov 2012 17:45:46 +0000 (09:45 -0800)]
am d1ae2721: Merge "Doc Update: Fixing images" into jb-dev-docs

* commit 'd1ae2721fa7b350b979e75319812636ea31bb56b':
  Doc Update: Fixing images

11 years agoMerge "Doc Update: Fixing images" into jb-dev-docs
&& repo sync -j8 [Thu, 15 Nov 2012 17:43:17 +0000 (09:43 -0800)]
Merge "Doc Update: Fixing images" into jb-dev-docs

11 years agoMerge "Import translations. DO NOT MERGE" into jb-mr1-dev
Baligh Uddin [Thu, 15 Nov 2012 16:13:48 +0000 (08:13 -0800)]
Merge "Import translations. DO NOT MERGE" into jb-mr1-dev

11 years agoMerge "Import translations. DO NOT MERGE" into jb-mr1-dev
Baligh Uddin [Thu, 15 Nov 2012 16:02:07 +0000 (08:02 -0800)]
Merge "Import translations. DO NOT MERGE" into jb-mr1-dev

11 years agoresolved conflicts for merge of 783e115b to jb-mr1-dev
Scott Main [Thu, 15 Nov 2012 03:10:18 +0000 (19:10 -0800)]
resolved conflicts for merge of 783e115b to jb-mr1-dev

Change-Id: Ibfd3023a845fb6cc549f05bcff2d6e4abc7e5a07

11 years agoresolved conflicts for merge of e907a390 to jb-dev-plus-aosp
Scott Main [Thu, 15 Nov 2012 03:04:05 +0000 (19:04 -0800)]
resolved conflicts for merge of e907a390 to jb-dev-plus-aosp

Change-Id: I4e216b81f33b4b7c238f74f1c475bc84df3f79ef

11 years agoDoc Update: Fixing images
&& repo sync -j8 [Thu, 15 Nov 2012 02:26:07 +0000 (18:26 -0800)]
Doc Update: Fixing images

Bug: 7542170
Change-Id: I18e5d360e21af9d30864456ae429b804314e1edb

11 years agoDoc Update: Removed "no guaranteed delivery" line.
&& repo sync -j8 [Thu, 15 Nov 2012 02:15:53 +0000 (18:15 -0800)]
Doc Update: Removed "no guaranteed delivery" line.

Change-Id: I6f5b80d263069752b7d47b5825ff024b1858e41e

11 years agoam 22cc2764: implement new organization for Training classes This also moves a few...
Scott Main [Thu, 15 Nov 2012 01:38:15 +0000 (17:38 -0800)]
am 22cc2764: implement new organization for Training classes This also moves a few of the documents from API Guides > Best Practices into the new courses for best practices. This is also dependent on CL Ieac8a97a8d6fda41a3682241901150cfe16afc4d which generates the lis

* commit '22cc2764cc74e52888b043e0c6371594305bb5e9':
  implement new organization for Training classes This also moves a few of the documents from API Guides > Best Practices into the new courses for best practices. This is also dependent on CL Ieac8a97a8d6fda41a3682241901150cfe16afc4d which generates the list of classes/lessons on each course landing page.

11 years agoimplement new organization for Training classes
Scott Main [Thu, 8 Nov 2012 00:35:16 +0000 (16:35 -0800)]
implement new organization for Training classes
This also moves a few of the documents from API Guides > Best Practices
into the new courses for best practices.
This is also dependent on CL Ieac8a97a8d6fda41a3682241901150cfe16afc4d
which generates the list of classes/lessons on each course landing page.

Change-Id: I8132f72f78d844c3b035c7aa269ad3b88a25d02a

11 years agoMerge "docs: Added note on MIPS system image additions" into jb-mr1-dev
Joe Fernandez [Thu, 15 Nov 2012 00:57:30 +0000 (16:57 -0800)]
Merge "docs: Added note on MIPS system image additions" into jb-mr1-dev

11 years agoMerge "docs: add warning for adt bundle on 32-bit os" into jb-mr1-dev
Scott Main [Wed, 14 Nov 2012 23:10:18 +0000 (15:10 -0800)]
Merge "docs: add warning for adt bundle on 32-bit os" into jb-mr1-dev

11 years agodocs: add warning for adt bundle on 32-bit os
Scott Main [Wed, 14 Nov 2012 22:13:21 +0000 (14:13 -0800)]
docs: add warning for adt bundle on 32-bit os

Change-Id: I0a2a62f66e64290006d67b9509b4223588d654b7

11 years agoMerge "docs: Updated uiautomator API docs to reflect correct API level. bug: 7538348...
Quddus Chong [Wed, 14 Nov 2012 21:08:20 +0000 (13:08 -0800)]
Merge "docs: Updated uiautomator API docs to reflect correct API level. bug: 7538348" into jb-mr1-dev

11 years agodocs: Updated uiautomator API docs to reflect correct API level.
Quddus Chong [Wed, 14 Nov 2012 19:24:10 +0000 (11:24 -0800)]
docs: Updated uiautomator API docs to reflect correct API level.
bug: 7538348

Change-Id: I03cdc53096a87e79ed8d4584dd0f726e8337c2a2

11 years agodocs: Added note on MIPS system image additions
Joe Fernandez [Wed, 14 Nov 2012 18:37:46 +0000 (10:37 -0800)]
docs: Added note on MIPS system image additions

Change-Id: I21e79563ea92358f274c90d3495439182aa4450e

11 years agoMerge "docs: Update Nexus 10 device frames for darker, more accurate bezel rendering...
Roman Nurik [Wed, 14 Nov 2012 19:34:02 +0000 (11:34 -0800)]
Merge "docs: Update Nexus 10 device frames for darker, more accurate bezel rendering." into jb-mr1-dev

11 years agodocs: Update Nexus 10 device frames for darker, more accurate bezel rendering.
Roman Nurik [Wed, 14 Nov 2012 18:49:08 +0000 (10:49 -0800)]
docs: Update Nexus 10 device frames for darker, more accurate bezel rendering.

Change-Id: Id0a17f187c4ca3c24295257b0c5ca653d1c8cd4d

11 years agoImport translations. DO NOT MERGE
Baligh Uddin [Wed, 14 Nov 2012 18:39:26 +0000 (10:39 -0800)]
Import translations. DO NOT MERGE

Change-Id: I28291cc43ab74267b771dacf7dc570447a4a3dcf
Auto-generated-cl: translation import

11 years agoImport translations. DO NOT MERGE
Baligh Uddin [Wed, 14 Nov 2012 18:11:28 +0000 (10:11 -0800)]
Import translations. DO NOT MERGE

Change-Id: I44ee12f2a6399347b884f91259117be4774b964b
Auto-generated-cl: translation import

11 years agoam ce37f1da: am 4979a0b5: am 5f32d337: Merge "Notification.java javadoc: addAction...
Joe Malin [Tue, 13 Nov 2012 22:25:09 +0000 (14:25 -0800)]
am ce37f1da: am 4979a0b5: am 5f32d337: Merge "Notification.java javadoc: addAction" into jb-dev-docs

* commit 'ce37f1da3619dcb4e53ca014cf4a17885cc3af0f':
  Notification.java javadoc: addAction

11 years agoam 4979a0b5: am 5f32d337: Merge "Notification.java javadoc: addAction" into jb-dev...
Joe Malin [Tue, 13 Nov 2012 22:22:58 +0000 (14:22 -0800)]
am 4979a0b5: am 5f32d337: Merge "Notification.java javadoc: addAction" into jb-dev-docs

* commit '4979a0b59486d737a4d9267af9b38f237705e26f':
  Notification.java javadoc: addAction