OSDN Git Service
Prashant Malani [Thu, 7 Aug 2014 22:07:09 +0000 (22:07 +0000)]
Merge "Move wakelock release to handleMessage" into klp-modular-dev
Robert Ly [Thu, 7 Aug 2014 21:59:43 +0000 (21:59 +0000)]
am
6f273458: Merge "docs: remove "developer preview" and point to Android-specific doc" into klp-modular-docs
* commit '
6f273458fb9de10e07f5876e85f9f80592bf52b2':
docs: remove "developer preview" and point to Android-specific doc
Ricardo Cervera [Thu, 7 Aug 2014 16:03:27 +0000 (16:03 +0000)]
am
edcf7c51: Merge "docs: Simplify and update the Signing page. Bug:
16296405" into klp-modular-docs
* commit '
edcf7c51676e3b4d0481dcdc9c2e128f7f4f2e5d':
docs: Simplify and update the Signing page. Bug:
16296405
Robert Ly [Thu, 7 Aug 2014 15:55:10 +0000 (15:55 +0000)]
am
8e115e64: Merge "docs: Documenting fix for CVE-2014-0224 (SSL vulnerability)." into klp-modular-docs
* commit '
8e115e6460f5bfe5e682dda6e816b9d8c84bc525':
docs: Documenting fix for CVE-2014-0224 (SSL vulnerability).
Robert Ly [Thu, 7 Aug 2014 15:50:25 +0000 (15:50 +0000)]
Merge "docs: Documenting fix for CVE-2014-0224 (SSL vulnerability)." into klp-modular-docs
Prashant Malani [Wed, 6 Aug 2014 23:49:53 +0000 (16:49 -0700)]
Move wakelock release to handleMessage
There were certain code paths in handleDockStateChange() that were
exiting without releasing the wakelock. So we move the release to the
calling function to prevent stray held wakelocks.
Bug:
16841895
Change-Id: I8ae4d2ab8f775c42a893d3bcdef34321c5f631a6
Signed-off-by: Prashant Malani <pmalani@google.com>
Ricardo Cervera [Thu, 7 Aug 2014 16:00:13 +0000 (16:00 +0000)]
Merge "docs: Simplify and update the Signing page. Bug:
16296405" into klp-modular-docs
Robert Ly [Thu, 7 Aug 2014 21:55:43 +0000 (21:55 +0000)]
Merge "docs: remove "developer preview" and point to Android-specific doc" into klp-modular-docs
Deepanshu Gupta [Wed, 6 Aug 2014 22:51:47 +0000 (22:51 +0000)]
am
904d7711: am
7b561be3: am
09c3c2ed: am
ba31d628: am
db94ea9e: am
f970d2c2: am
79c3f678: am
206c691b: am
72cf03a2: am
3a544a81: resolved conflicts for merge of
a232a68d to jb-mr1.1-docs
* commit '
904d77118bab63139174470ef728ca9a53e75a15':
Fix SystemProperties in LayoutLib.
Deepanshu Gupta [Wed, 6 Aug 2014 22:45:23 +0000 (22:45 +0000)]
am
7b561be3: am
09c3c2ed: am
ba31d628: am
db94ea9e: am
f970d2c2: am
79c3f678: am
206c691b: am
72cf03a2: am
3a544a81: resolved conflicts for merge of
a232a68d to jb-mr1.1-docs
* commit '
7b561be3a6fedebfce412cecd8c36d6686f6576c':
Fix SystemProperties in LayoutLib.
Deepanshu Gupta [Wed, 6 Aug 2014 22:37:10 +0000 (22:37 +0000)]
am
09c3c2ed: am
ba31d628: am
db94ea9e: am
f970d2c2: am
79c3f678: am
206c691b: am
72cf03a2: am
3a544a81: resolved conflicts for merge of
a232a68d to jb-mr1.1-docs
* commit '
09c3c2edb2391d3ffed9a07ec360b9f75b9f7637':
Fix SystemProperties in LayoutLib.
Deepanshu Gupta [Wed, 6 Aug 2014 22:30:06 +0000 (22:30 +0000)]
am
ba31d628: am
db94ea9e: am
f970d2c2: am
79c3f678: am
206c691b: am
72cf03a2: am
3a544a81: resolved conflicts for merge of
a232a68d to jb-mr1.1-docs
* commit '
ba31d628621f3d49195d141dabff30a7665f3b50':
Fix SystemProperties in LayoutLib.
Deepanshu Gupta [Wed, 6 Aug 2014 22:25:50 +0000 (22:25 +0000)]
am
db94ea9e: am
f970d2c2: am
79c3f678: am
206c691b: am
72cf03a2: am
3a544a81: resolved conflicts for merge of
a232a68d to jb-mr1.1-docs
* commit '
db94ea9ed03dbaa0ca075a433a986d7e414e8f8d':
Fix SystemProperties in LayoutLib.
Deepanshu Gupta [Wed, 6 Aug 2014 22:21:54 +0000 (22:21 +0000)]
am
f970d2c2: am
79c3f678: am
206c691b: am
72cf03a2: am
3a544a81: resolved conflicts for merge of
a232a68d to jb-mr1.1-docs
* commit '
f970d2c201649843b8d51d094b865f16b15bc0bc':
Fix SystemProperties in LayoutLib.
Deepanshu Gupta [Wed, 6 Aug 2014 22:18:04 +0000 (22:18 +0000)]
am
79c3f678: am
206c691b: am
72cf03a2: am
3a544a81: resolved conflicts for merge of
a232a68d to jb-mr1.1-docs
* commit '
79c3f678d21f6b3c058623217cbe5dd57a553fe8':
Fix SystemProperties in LayoutLib.
Deepanshu Gupta [Wed, 6 Aug 2014 22:13:18 +0000 (22:13 +0000)]
am
206c691b: am
72cf03a2: am
3a544a81: resolved conflicts for merge of
a232a68d to jb-mr1.1-docs
* commit '
206c691bfdb3a6b78d35c7481365980dd387b8c9':
Fix SystemProperties in LayoutLib.
Deepanshu Gupta [Wed, 6 Aug 2014 22:09:13 +0000 (22:09 +0000)]
am
72cf03a2: am
3a544a81: resolved conflicts for merge of
a232a68d to jb-mr1.1-docs
* commit '
72cf03a27a73e91d4a3eabf74e0384b310f4a5b2':
Fix SystemProperties in LayoutLib.
Deepanshu Gupta [Wed, 6 Aug 2014 22:05:38 +0000 (22:05 +0000)]
am
3a544a81: resolved conflicts for merge of
a232a68d to jb-mr1.1-docs
* commit '
3a544a81b3d2d529b2995f4b5db2077760d440b5':
Fix SystemProperties in LayoutLib.
Deepanshu Gupta [Wed, 6 Aug 2014 22:00:14 +0000 (15:00 -0700)]
resolved conflicts for merge of
a232a68d to jb-mr1.1-docs
Change-Id: I1ea220e3e0a81880db68abab87beab56dc4a336c
Deepanshu Gupta [Wed, 6 Aug 2014 21:41:02 +0000 (14:41 -0700)]
resolved conflicts for merge of
5476cfee to jb-mr1-dev
Change-Id: I5197271e6fdd36fed9ca9f9b7221d9a99141a4b4
Deepanshu Gupta [Wed, 6 Aug 2014 21:28:24 +0000 (21:28 +0000)]
am
505c675c: Fix SystemProperties in LayoutLib.
* commit '
505c675c3a536ac7c6ad264eb62542537532119c':
Fix SystemProperties in LayoutLib.
Deepanshu Gupta [Wed, 6 Aug 2014 00:33:35 +0000 (17:33 -0700)]
Fix SystemProperties in LayoutLib.
Not all System Properties were used via Build class. Also, properties
like SDK_INT which called SystemProperties directly were not initialized
properly.
This change is essentially cherry picking of the relevant parts from the
following commits:
984749bf75c9ce9d3401b8410ea7d6276544b6ee
167bc25bceea9280bbe4858db4cb8233f86ce325
Bug: http://b.android.com/73046
Change-Id: Ia0fb467ee6d5fdedda500d57d02be20006f115df
Andrew Flynn [Fri, 1 Aug 2014 18:29:27 +0000 (18:29 +0000)]
am
ea12f0fd: Fix some sync adapter docs typos.
* commit '
ea12f0fd7ed236fa38f73cfff5be5fa36f016690':
Fix some sync adapter docs typos.
Andrew Flynn [Fri, 1 Aug 2014 18:19:48 +0000 (14:19 -0400)]
Fix some sync adapter docs typos.
Change-Id: Icb108bcfd7835049ff7d50660d1f8084ebc3c8e9
Joe Fernandez [Thu, 31 Jul 2014 18:35:02 +0000 (18:35 +0000)]
am
69ed58ac: Merge "docs: Adding TIF one-pager to TV docs in L-Preview" into klp-modular-docs
* commit '
69ed58aced0e884d7758d84067134b04fbcee9c0':
docs: Adding TIF one-pager to TV docs in L-Preview
Andrew Solovay [Wed, 30 Jul 2014 22:00:55 +0000 (15:00 -0700)]
docs: Documenting fix for CVE-2014-0224 (SSL vulnerability).
Wrote a training page on how to use Google Play services to update a
device's security provider, which (int. al.) installs a fix against
the recently-discovered SSL CCS injection vulnerability.
Doc is staged to:
http://asolovay.mtv:9338/training/articles/security-gms-provider.html
bug:
16296338
Change-Id: I5b0dd052113998d585a46262b216ef0c1b432362
Ricardo Cervera [Tue, 29 Jul 2014 23:22:52 +0000 (16:22 -0700)]
docs: Simplify and update the Signing page. Bug:
16296405
Change-Id: Id74525b00efdbb21e41895a4e0351b2450125a90
Scott Rowe [Wed, 30 Jul 2014 18:16:24 +0000 (11:16 -0700)]
docs: remove "developer preview" and point to Android-specific doc
Change-Id: I0b9816c75e3ad98d7c9b4b5d887a4d079d618981
Joe Fernandez [Wed, 30 Jul 2014 18:09:27 +0000 (18:09 +0000)]
am
b83127f0: Merge "docs: Add adb over TCP/IP connection instructions to ADT-1 FAQ" into klp-modular-docs
* commit '
b83127f0cf35a2d95684293818ca25171f6643e1':
docs: Add adb over TCP/IP connection instructions to ADT-1 FAQ
Joe Fernandez [Wed, 30 Jul 2014 18:07:11 +0000 (18:07 +0000)]
Merge "docs: Add adb over TCP/IP connection instructions to ADT-1 FAQ" into klp-modular-docs
Joe Fernandez [Tue, 29 Jul 2014 21:44:28 +0000 (14:44 -0700)]
docs: Add adb over TCP/IP connection instructions to ADT-1 FAQ
Change-Id: Ifa8831e1594470ecf65761efea472de79aaf5ece
Alan Lau [Wed, 30 Jul 2014 17:39:37 +0000 (17:39 +0000)]
Merge "Revert "Revert "DO NOT MERGE Fix line breaking for clusters in narrow views""" into klp-modular-dev
Alan Lau [Wed, 30 Jul 2014 17:35:20 +0000 (17:35 +0000)]
Revert "Revert "DO NOT MERGE Fix line breaking for clusters in narrow views""
This reverts commit
cbeef01cce314e3a3977b042d8ec0744816c0df4.
Change-Id: I170ccb2264941e8a8b090b3bb553970414f0c4eb
Alan Lau [Wed, 30 Jul 2014 17:39:28 +0000 (17:39 +0000)]
Merge "Revert "Revert "DO NOT MERGE Fix extraneous allocation and copying""" into klp-modular-dev
Alan Lau [Wed, 30 Jul 2014 17:35:29 +0000 (17:35 +0000)]
Revert "Revert "DO NOT MERGE Fix extraneous allocation and copying""
This reverts commit
af60e56b39582ea90ccd7601cd06350a50bf6500.
Change-Id: I1aa698608773b9e540457831e11218f371c71268
Andrew Solovay [Wed, 30 Jul 2014 17:34:20 +0000 (17:34 +0000)]
am
81364215: Merge "docs: Revised page to include info about new Publisher API." into klp-modular-docs
* commit '
813642158979aca52b9d3913e52dda877d74a992':
docs: Revised page to include info about new Publisher API.
Alan Lau [Wed, 30 Jul 2014 17:32:03 +0000 (17:32 +0000)]
Merge "Revert "Revert "DO NOT MERGE Implement line breaking using ICU break iterator""" into klp-modular-dev
Alan Lau [Wed, 30 Jul 2014 17:30:15 +0000 (17:30 +0000)]
Revert "Revert "DO NOT MERGE Implement line breaking using ICU break iterator""
This reverts commit
77d6f36bbc76dbed51bea17d1ffcd3c1d6ffd30f.
Change-Id: I10b6d9e3d82b0f2b6dc154465a4b2f1db8eed058
Ricardo Cervera [Wed, 30 Jul 2014 16:46:07 +0000 (16:46 +0000)]
am
a7898781: Merge "docs: Added system requirements for Studio. Bug:
16566355" into klp-modular-docs
* commit '
a7898781d6182b5c73a0a3899b71162f92582f66':
docs: Added system requirements for Studio. Bug:
16566355
Ricardo Cervera [Wed, 30 Jul 2014 16:42:48 +0000 (16:42 +0000)]
Merge "docs: Added system requirements for Studio. Bug:
16566355" into klp-modular-docs
Andrew Solovay [Wed, 30 Jul 2014 17:30:05 +0000 (17:30 +0000)]
Merge "docs: Revised page to include info about new Publisher API." into klp-modular-docs
Dirk Dougherty [Tue, 29 Jul 2014 21:03:25 +0000 (21:03 +0000)]
am
fa3d1b2a: Doc change: add notice for admob sdk upgrade.
* commit '
fa3d1b2a27448b82ec1aa6f75c95ed17c4f46748':
Doc change: add notice for admob sdk upgrade.
Andrew Solovay [Fri, 25 Jul 2014 23:27:44 +0000 (16:27 -0700)]
docs: Revised page to include info about new Publisher API.
Also moved the blurb to the "Google Play Distribution" cover page, and
adjusted the TOC accordingly. Per DDoughterty@ 's request, moved the
"Purchase Verification Strategies" section to billing_subscriptions.jd
Page is staged to:
http://asolovay.mtv:9543/google/play/billing/gp-purchase-status-api.html
http://asolovay.mtv:9543/google/play/billing/billing_subscriptions.html#strategies
Change-Id: I884e2f3f25c76fcb055e663058d1a4f4642fb558
Dirk Dougherty [Tue, 29 Jul 2014 01:19:46 +0000 (18:19 -0700)]
Doc change: add notice for admob sdk upgrade.
Change-Id: I9281b17e4ff277ef99ae57ce0360e05f4231e7ff
Ricardo Cervera [Fri, 25 Jul 2014 16:42:28 +0000 (09:42 -0700)]
docs: Added system requirements for Studio. Bug:
16566355
Change-Id: I1d3d80ce718d64e01fd939aa177c950d56065555
Robert Ly [Tue, 29 Jul 2014 16:30:07 +0000 (16:30 +0000)]
am
1c977b37: Merge "docs: fix typo bug
16623189" into klp-modular-docs
* commit '
1c977b3744dbe916edde2e256a39c30e5888ef4f':
docs: fix typo bug
16623189
Robert Ly [Tue, 29 Jul 2014 15:38:02 +0000 (15:38 +0000)]
am
9613b433: Merge "docs: fix typo" into klp-modular-docs
* commit '
9613b433f47162d008f034afbb16deac16532662':
docs: fix typo
Ricardo Cervera [Tue, 29 Jul 2014 15:29:00 +0000 (15:29 +0000)]
am
652e5c7e: Merge "docs: Describe the alloc tracker in Android Studio" into klp-modular-docs
* commit '
652e5c7ef1f8176dc680f7c4ba782164269b03b0':
docs: Describe the alloc tracker in Android Studio
Ricardo Cervera [Tue, 29 Jul 2014 15:01:11 +0000 (15:01 +0000)]
am
321e0302: docs: Fix Wear docs issues.
* commit '
321e030202cb74cad0dd8a4950cffe361a5072c8':
docs: Fix Wear docs issues.
Robert Ly [Tue, 29 Jul 2014 16:26:51 +0000 (16:26 +0000)]
Merge "docs: fix typo bug
16623189" into klp-modular-docs
Robert Ly [Tue, 29 Jul 2014 16:25:45 +0000 (09:25 -0700)]
docs: fix typo bug
16623189
Change-Id: Ia790587cf60cbf4e9f699605a5ad6a7dc5a06799
Robert Ly [Tue, 29 Jul 2014 15:33:17 +0000 (08:33 -0700)]
docs: fix typo
Change-Id: I4d76d625dc508e7279162d1d3ace9c32625e1358
Alan Lau [Mon, 28 Jul 2014 19:50:14 +0000 (19:50 +0000)]
Revert "DO NOT MERGE Implement line breaking using ICU break iterator"
This reverts commit
0c87dfd25d5a305fb67eb328d114aada87055dd7.
Change-Id: Ibc300bb945776594099b69965cabe7220d10de2f
Alan Lau [Mon, 28 Jul 2014 19:52:11 +0000 (19:52 +0000)]
Revert "DO NOT MERGE Fix line breaking for clusters in narrow views"
This reverts commit
a28e4764994283c3595dd41f12e425cf7dc0d985.
Change-Id: I73fe7b3e6bdba327e55a58afd36a7f58f49945d0
Alan Lau [Mon, 28 Jul 2014 19:51:01 +0000 (19:51 +0000)]
Revert "DO NOT MERGE Fix extraneous allocation and copying"
This reverts commit
1a408a344c7921d7c943826bea3ce0cdd822583d.
Change-Id: If5a19a4cc54e76aeddac0923e28bbf310e78feb4
Anish Athalye [Tue, 8 Jul 2014 20:27:14 +0000 (13:27 -0700)]
DO NOT MERGE Fix extraneous allocation and copying
With breaks being allocated the way it was, there were 16 ints with
value 0 being stored in the beginning of the vector. Because of the way
the rest of the code is structured, this did not result in incorrect
operation, but it still wasted time and memory.
Change-Id: Ic0df3e5484417da51f2465ec2d72222fefffc18a
(cherry picked from commit
733b3c0f8b77fefcd234c94170faa4e7bd76074c)
Anish Athalye [Fri, 27 Jun 2014 21:37:53 +0000 (14:37 -0700)]
DO NOT MERGE Fix line breaking for clusters in narrow views
Clusters were broken incorrectly when in narrow views (when the width of
the cluster was greater than the width of a view). Also, out() calls
were modifying fm, so clusters that were too wide were not positioned
correctly.
Change-Id: I521f8dc6338f5f1de6858af3f0c0bd320aa46bc0
(cherry picked from commit
162713dd0b72af79c1b2286985f7e79f043cd915)
Ricardo Cervera [Tue, 29 Jul 2014 15:26:56 +0000 (15:26 +0000)]
Merge "docs: Describe the alloc tracker in Android Studio" into klp-modular-docs
Ricardo Cervera [Mon, 28 Jul 2014 17:50:32 +0000 (10:50 -0700)]
docs: Fix Wear docs issues.
Bug:
16624918
Bug:
16626217
Bug:
16626415
Bug:
16624384
Bug:
16623147
Change-Id: I774f19aded22562b891f9d2ccc35f0befb50f21c
Filip Gruszczynski [Mon, 28 Jul 2014 23:34:59 +0000 (23:34 +0000)]
Merge "Fix double chin issue, where bottom inset is applied twice." into klp-modular-dev
Craig Mautner [Mon, 28 Jul 2014 23:25:55 +0000 (23:25 +0000)]
Merge "Remove PendingActivityLaunches based on stack." into klp-modular-dev
Craig Mautner [Mon, 28 Jul 2014 21:00:35 +0000 (14:00 -0700)]
Remove PendingActivityLaunches based on stack.
Was previously removing by trying to match activities, but the
activity being matched would not have been in the stack yet. Since
it doesn't get added to the stack when it goes into the list
of pending activities. By removing all pending activities associated
with the stack we clean up all such pending activities.
Fixes bug
16045752.
Change-Id: I6b5981ffcce674139837b06362e573299bbc9e52
Alan Lau [Mon, 28 Jul 2014 19:53:43 +0000 (19:53 +0000)]
Merge "Revert "DO NOT MERGE Fix line breaking for clusters in narrow views"" into klp-modular-dev
Alan Lau [Mon, 28 Jul 2014 19:05:45 +0000 (19:05 +0000)]
Merge "DO NOT MERGE Implement line breaking using ICU break iterator" into klp-modular-dev
Anish Athalye [Tue, 24 Jun 2014 21:39:43 +0000 (14:39 -0700)]
DO NOT MERGE Implement line breaking using ICU break iterator
Change-Id: I4ad98757aa2eab5dbc2ae44c0391e900ef20c4d0
(cherry picked from commit
f8133ae5896926aaf70f12bc0dd1f36a6704c0f5)
Joe Fernandez [Thu, 31 Jul 2014 18:30:42 +0000 (18:30 +0000)]
Merge "docs: Adding TIF one-pager to TV docs in L-Preview" into klp-modular-docs
Joe Fernandez [Tue, 29 Jul 2014 04:31:16 +0000 (21:31 -0700)]
docs: Adding TIF one-pager to TV docs in L-Preview
Change-Id: I89960cb9c2c8af0ccb010b91ee42d6cffab42f95
Filip Gruszczynski [Fri, 25 Jul 2014 21:25:16 +0000 (14:25 -0700)]
Fix double chin issue, where bottom inset is applied twice.
This changes how windowOutsetBottom is applied. Instead of being added to
whatever inset is already set, it overwrites it.
Bug:
16567038
Change-Id: Idedae93b790652e9de0519764ea7a03841f9e8fd
Robert Ly [Tue, 29 Jul 2014 15:34:47 +0000 (15:34 +0000)]
Merge "docs: fix typo" into klp-modular-docs
Ricardo Cervera [Thu, 24 Jul 2014 17:15:09 +0000 (10:15 -0700)]
docs: Describe the alloc tracker in Android Studio
Change-Id: Ic3cfc94950029104ec75ab04a9fac51ba64dd9a9
Craig Mautner [Fri, 25 Jul 2014 01:30:51 +0000 (01:30 +0000)]
Merge "Finish crashed activities immediately" into klp-modular-dev
Craig Mautner [Thu, 24 Jul 2014 20:32:37 +0000 (13:32 -0700)]
Finish crashed activities immediately
By finishing crashed activities right away the VirtualDisplays
associated with ActivityView are removed immediately rather than
being deferred. Also there is no waiting for Pause (0.5 sec) and
Destroy (10 sec) timeouts to expire.
Fixes bug
15092354.
Change-Id: Ie4941cb19dcc6f6fc61b2475162ea2794c9558a2
Prashant Malani [Thu, 24 Jul 2014 17:42:06 +0000 (17:42 +0000)]
Merge "Revert "Remove circular mask"" into klp-modular-dev
Prashant Malani [Sat, 19 Jul 2014 00:27:56 +0000 (17:27 -0700)]
Revert "Remove circular mask"
This reverts commit
2e8b27e898af3af1165a79e7c5f8b59f63f20a2f.
It also makes the circularMask option configurable via overlay.
It is set to false by default.
An offset dimension entry is also provided, for displays which have
a "chin". This is set to 0 by default.
Bug:
16380982
Change-Id: I16ec3e8d8882a6683c9155055944e5c2f5cd781e
Ricardo Cervera [Wed, 23 Jul 2014 23:08:10 +0000 (23:08 +0000)]
am
7af4e812: docs: Fixed RecyclerView example. Bug:
16483811
* commit '
7af4e812d06d7174e9eb677a508c6af0f3ba3608':
docs: Fixed RecyclerView example. Bug:
16483811
Ricardo Cervera [Tue, 22 Jul 2014 19:58:24 +0000 (12:58 -0700)]
docs: Fixed RecyclerView example. Bug:
16483811
Change-Id: I1c501c97026dfaaac88d7398160ff192fee4fb05
Robert Ly [Wed, 23 Jul 2014 21:02:12 +0000 (21:02 +0000)]
am
22bdcd2f: Merge "cherrypick from klp-docs docs: formatting for html Change-Id: I1451615c09cc003a03d7585176036c4d695408f1" into klp-modular-docs
* commit '
22bdcd2f829dd9226978c9ec4405fd89d4562d73':
cherrypick from klp-docs docs: formatting for html Change-Id: I1451615c09cc003a03d7585176036c4d695408f1
Scott Rowe [Wed, 23 Jul 2014 21:02:09 +0000 (21:02 +0000)]
am
72c80d30: cherrypick from klp-docs docs: b/
14387628 - Testing Localized Applications, menu not found Change-Id: I5e2977e3820d79588f73f171a32b0d7c7d6307d1
* commit '
72c80d308a88d59347f13dd813f2885bc4f45acc':
cherrypick from klp-docs docs: b/
14387628 - Testing Localized Applications, menu not found Change-Id: I5e2977e3820d79588f73f171a32b0d7c7d6307d1
Scott Rowe [Wed, 4 Jun 2014 17:15:17 +0000 (10:15 -0700)]
cherrypick from klp-docs docs: b/
14387628 - Testing Localized Applications, menu not found Change-Id: I5e2977e3820d79588f73f171a32b0d7c7d6307d1
Change-Id: I245d8351d82b29131783df71f78fcd7bc3c1d89e
Robert Ly [Wed, 23 Jul 2014 20:59:29 +0000 (20:59 +0000)]
Merge "cherrypick from klp-docs docs: formatting for html Change-Id: I1451615c09cc003a03d7585176036c4d695408f1" into klp-modular-docs
Scott Rowe [Wed, 18 Jun 2014 21:18:25 +0000 (14:18 -0700)]
cherrypick from klp-docs docs: formatting for html Change-Id: I1451615c09cc003a03d7585176036c4d695408f1
Change-Id: I21424c1407b44554ac135248dabc2328bc70aef9
Robert Ly [Tue, 22 Jul 2014 20:49:05 +0000 (20:49 +0000)]
am
c57c0829: Merge "Doc change: add reminder for developers on using ad id." into klp-modular-docs
* commit '
c57c08298364e93ca4399d184bdba2657f72b11c':
Doc change: add reminder for developers on using ad id.
David Friedman [Tue, 22 Jul 2014 20:45:11 +0000 (20:45 +0000)]
am
170b0953: Merge "Added an "In This Document" nav list at top-right of page, and deleted corresponding text from body." into klp-modular-docs
* commit '
170b09535d21c7c50051e391b8f7a61678872c2b':
Added an "In This Document" nav list at top-right of page, and deleted corresponding text from body.
Scott Rowe [Tue, 22 Jul 2014 20:03:19 +0000 (20:03 +0000)]
am
40b5d8a0: Merge "cherrypick from klp-docs docs: b/
14524668 remove ANDROID_ID Change-Id: I83d4389bb8322c2dbca10042e666fc9b75ea8a12" into klp-modular-docs
* commit '
40b5d8a0e5aad92c07420541fd186f9f96495845':
cherrypick from klp-docs docs: b/
14524668 remove ANDROID_ID Change-Id: I83d4389bb8322c2dbca10042e666fc9b75ea8a12
Andrew Solovay [Tue, 22 Jul 2014 19:02:58 +0000 (19:02 +0000)]
am
eb69126c: (-s ours) Merge "DO NOT MERGE" into klp-modular-docs
* commit '
eb69126c613dfd476fa516df6ae1c2d78e445f0b':
DO NOT MERGE
Andrew Solovay [Tue, 22 Jul 2014 18:41:21 +0000 (18:41 +0000)]
am
170556f8: Merge "docs: Removed reference to a sample notepad app." into klp-modular-docs
* commit '
170556f82bd009cf5a74a53d7ba61221d74d36e9':
docs: Removed reference to a sample notepad app.
Robert Ly [Tue, 22 Jul 2014 17:12:14 +0000 (17:12 +0000)]
am
1c723ea8: Merge "docs: update links and add new wear design materials" into klp-modular-docs
* commit '
1c723ea84ee4299fa07687cb2881e3695bd14d3c':
docs: update links and add new wear design materials
Robert Ly [Tue, 22 Jul 2014 17:12:10 +0000 (17:12 +0000)]
am
0b5f9c2f: docs: remove android translation plugin doc
* commit '
0b5f9c2f6890ed8aa16d1cb630aa415bf7c908c0':
docs: remove android translation plugin doc
Robert Ly [Tue, 22 Jul 2014 15:05:33 +0000 (08:05 -0700)]
docs: remove android translation plugin doc
Change-Id: Ia21049e3250e98a419f5249693b218c1d5e58fd1
Baligh Uddin [Mon, 21 Jul 2014 17:05:50 +0000 (10:05 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ief6127337c9c4fdbbf15a6214a463822dc39b92c
Auto-generated-cl: translation import
Robert Ly [Tue, 22 Jul 2014 17:07:51 +0000 (17:07 +0000)]
Merge "docs: update links and add new wear design materials" into klp-modular-docs
Robert Ly [Tue, 22 Jul 2014 17:06:17 +0000 (10:06 -0700)]
docs: update links and add new wear design materials
Change-Id: Idca24bcb64167b29c235380d0778d62cb1be6477
Robert Ly [Tue, 22 Jul 2014 20:46:22 +0000 (20:46 +0000)]
Merge "Doc change: add reminder for developers on using ad id." into klp-modular-docs
Dirk Dougherty [Sun, 22 Jun 2014 20:10:47 +0000 (13:10 -0700)]
Doc change: add reminder for developers on using ad id.
Change-Id: I6de92d091c469a4e81ec29c95ce65204f708fd97
David Friedman [Tue, 22 Jul 2014 20:42:05 +0000 (20:42 +0000)]
Merge "Added an "In This Document" nav list at top-right of page, and deleted corresponding text from body." into klp-modular-docs
David Friedman [Tue, 22 Jul 2014 07:22:00 +0000 (00:22 -0700)]
Added an "In This Document" nav list at top-right of page, and deleted corresponding text from body.
Change-Id: I8d9077793dbe1dd345afd7152328018d818b07ce
Dirk Dougherty [Sun, 22 Jun 2014 20:10:47 +0000 (13:10 -0700)]
Doc change: add reminder for developers on using ad id.
Change-Id: I2a6109bd1b97e4432e36c6a5055aee6e2b1c3edd
Ricardo Cervera [Mon, 21 Jul 2014 17:04:09 +0000 (17:04 +0000)]
Merge "docs: Added note suggesting use of Android Studio over ADT" into klp-modular-docs
Ricardo Cervera [Wed, 16 Jul 2014 16:33:39 +0000 (09:33 -0700)]
docs: Added note suggesting use of Android Studio over ADT
Change-Id: Id921c06ea75c70e1ad4741c743f1d15958686b16
Robert Ly [Mon, 21 Jul 2014 16:06:50 +0000 (09:06 -0700)]
docs: change copy for edu video
Change-Id: I88e5ae8e9c0f899f0e4dfc5087de9ea18153894d
OSDN Git Service
