OSDN Git Service
Anish Athalye [Mon, 28 Jul 2014 19:53:26 +0000 (19:53 +0000)]
am
1a408a34: DO NOT MERGE Fix extraneous allocation and copying
* commit '
1a408a344c7921d7c943826bea3ce0cdd822583d':
DO NOT MERGE Fix extraneous allocation and copying
Alan Lau [Mon, 28 Jul 2014 19:10:29 +0000 (19:10 +0000)]
am
97170e0c: Merge "DO NOT MERGE Implement line breaking using ICU break iterator" into klp-modular-dev
* commit '
97170e0c48bbff21ef6773110d950621131cf9dd':
DO NOT MERGE Implement line breaking using ICU break iterator
Anish Athalye [Mon, 28 Jul 2014 19:10:19 +0000 (19:10 +0000)]
am
a28e4764: DO NOT MERGE Fix line breaking for clusters in narrow views
* commit '
a28e4764994283c3595dd41f12e425cf7dc0d985':
DO NOT MERGE Fix line breaking for clusters in narrow views
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)
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)
Craig Mautner [Fri, 25 Jul 2014 02:19:53 +0000 (02:19 +0000)]
am
a0bb44ef: Merge "Finish crashed activities immediately" into klp-modular-dev
* commit '
a0bb44efe96ca70635b64dac8922b225d1a19407':
Finish crashed activities immediately
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 18:06:03 +0000 (18:06 +0000)]
am
b4dcc64f: Merge "Revert "Remove circular mask"" into klp-modular-dev
* commit '
b4dcc64fe6314b139ac17aa296419bbf153df2f6':
Revert "Remove circular mask"
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:12:15 +0000 (23:12 +0000)]
am
472e234d: am
7af4e812: docs: Fixed RecyclerView example. Bug:
16483811
* commit '
472e234d807df490124263c1e28c66e1918787c9':
docs: Fixed RecyclerView example. Bug:
16483811
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:06:47 +0000 (21:06 +0000)]
am
1903bbb8: am
22bdcd2f: Merge "cherrypick from klp-docs docs: formatting for html Change-Id: I1451615c09cc003a03d7585176036c4d695408f1" into klp-modular-docs
* commit '
1903bbb88d8e2e1921b0441911cb73966d3bca4a':
cherrypick from klp-docs docs: formatting for html Change-Id: I1451615c09cc003a03d7585176036c4d695408f1
Scott Rowe [Wed, 23 Jul 2014 21:06:36 +0000 (21:06 +0000)]
am
3bb44fec: am
72c80d30: cherrypick from klp-docs docs: b/
14387628 - Testing Localized Applications, menu not found Change-Id: I5e2977e3820d79588f73f171a32b0d7c7d6307d1
* commit '
3bb44fecbb9643e68a52d19b9c90809c77367b3e':
cherrypick from klp-docs docs: b/
14387628 - Testing Localized Applications, menu not found Change-Id: I5e2977e3820d79588f73f171a32b0d7c7d6307d1
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:53:20 +0000 (20:53 +0000)]
am
ff428e08: am
c57c0829: Merge "Doc change: add reminder for developers on using ad id." into klp-modular-docs
* commit '
ff428e08a5350153c5f9476551930b0eefdfcd06':
Doc change: add reminder for developers on using ad id.
David Friedman [Tue, 22 Jul 2014 20:49:09 +0000 (20:49 +0000)]
am
af001f94: 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 '
af001f9410bf0a45282b2f0ab7c4c3bf77645697':
Added an "In This Document" nav list at top-right of page, and deleted corresponding text from body.
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:08:02 +0000 (20:08 +0000)]
am
2a922cb4: am
40b5d8a0: Merge "cherrypick from klp-docs docs: b/
14524668 remove ANDROID_ID Change-Id: I83d4389bb8322c2dbca10042e666fc9b75ea8a12" into klp-modular-docs
* commit '
2a922cb45a0cb33ef575e39ac8ca4dc8500e03ba':
cherrypick from klp-docs docs: b/
14524668 remove ANDROID_ID Change-Id: I83d4389bb8322c2dbca10042e666fc9b75ea8a12
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:08:45 +0000 (19:08 +0000)]
am
3968ae0f: am
eb69126c: (-s ours) Merge "DO NOT MERGE" into klp-modular-docs
* commit '
3968ae0f70b01592c40c3e0cd31ca5ead953faa0':
DO NOT MERGE
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:47:26 +0000 (18:47 +0000)]
am
a2beba70: am
170556f8: Merge "docs: Removed reference to a sample notepad app." into klp-modular-docs
* commit '
a2beba70b947a948c2a12513c8bdda4d403c2fd6':
docs: Removed reference to a sample notepad app.
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:18:52 +0000 (17:18 +0000)]
am
fb8e254a: am
1c723ea8: Merge "docs: update links and add new wear design materials" into klp-modular-docs
* commit '
fb8e254a1a66fc707a1c52d4cced699339f15685':
docs: update links and add new wear design materials
Robert Ly [Tue, 22 Jul 2014 17:18:47 +0000 (17:18 +0000)]
am
c9cf4521: am
0b5f9c2f: docs: remove android translation plugin doc
* commit '
c9cf452179ed6c413712607fd60ba2eaa910d95b':
docs: remove android translation plugin doc
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 [Tue, 22 Jul 2014 16:48:12 +0000 (16:48 +0000)]
am
43f783fd: (-s ours) Import translations. DO NOT MERGE
* commit '
43f783fd7efd3b3d985a58bc3aa3e6136f976a14':
Import translations. DO NOT MERGE
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
Justin Koh [Tue, 22 Jul 2014 16:31:06 +0000 (16:31 +0000)]
am
a63272b4: Merge "Revert "Wait for all windows to draw before turning screen on"" into klp-modular-dev
* commit '
a63272b4b5eff16f4d6fae4730b8a7087563181c':
Revert "Wait for all windows to draw before turning screen on"
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
Robert Ly [Tue, 22 Jul 2014 14:34:06 +0000 (14:34 +0000)]
am
4f67e66e: am
f3be7864: Merge "docs: fix speech code for bug
16461337" into klp-modular-docs
* commit '
4f67e66e3e6efd5805c54ef6ca0979c9b1f64d96':
docs: fix speech code for bug
16461337
Robert Ly [Tue, 22 Jul 2014 14:30:13 +0000 (14:30 +0000)]
am
f3be7864: Merge "docs: fix speech code for bug
16461337" into klp-modular-docs
* commit '
f3be7864a6cf1b98107de1eadf25587b53a90fca':
docs: fix speech code for bug
16461337
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
Deepanshu Gupta [Tue, 22 Jul 2014 01:04:00 +0000 (01:04 +0000)]
am
9a61270d: Merge "LayoutLib: Fix EditText rendering [DO NOT MERGE]" into klp-modular-dev
* commit '
9a61270d67f654f3558b29f6b3e78c0b2fbe0178':
LayoutLib: Fix EditText rendering [DO NOT MERGE]
Deepanshu Gupta [Tue, 22 Jul 2014 01:03:55 +0000 (01:03 +0000)]
am
0ca0853c: Merge "Update layoutlib create README [DO NOT MERGE]" into klp-modular-dev
* commit '
0ca0853c52a81b317996b2997373f5882b369c80':
Update layoutlib create README [DO NOT MERGE]
Dirk Dougherty [Tue, 22 Jul 2014 00:58:13 +0000 (00:58 +0000)]
am
d1929c50: am
f3659284: Doc change: add reminder for developers on using ad id.
* commit '
d1929c505a66afc13d661beac9868f2886cbd1e8':
Doc change: add reminder for developers on using ad id.
Dirk Dougherty [Tue, 22 Jul 2014 00:54:01 +0000 (00:54 +0000)]
am
f3659284: Doc change: add reminder for developers on using ad id.
* commit '
f365928406ef0a80d3aecc2d025642f9efb80a05':
Doc change: add reminder for developers on using ad id.
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
Andrew Solovay [Mon, 21 Jul 2014 17:47:13 +0000 (17:47 +0000)]
am
643fa8d1: Merge "docs: Noted how singleTop affects "up" navigation." into klp-modular-dev
* commit '
643fa8d1ecf5d2a485b7b30d43a47d090b5e3dcc':
docs: Noted how singleTop affects "up" navigation.
Ricardo Cervera [Mon, 21 Jul 2014 17:11:42 +0000 (17:11 +0000)]
am
d73eb7f9: am
940ae930: Merge "docs: Added note suggesting use of Android Studio over ADT" into klp-modular-docs
* commit '
d73eb7f9c96c2211ab12a09c319978915cf593bf':
docs: Added note suggesting use of Android Studio over ADT
Ricardo Cervera [Mon, 21 Jul 2014 17:07:00 +0000 (17:07 +0000)]
am
940ae930: Merge "docs: Added note suggesting use of Android Studio over ADT" into klp-modular-docs
* commit '
940ae93043a7d36d89ab777cbc691893590d326c':
docs: Added note suggesting use of Android Studio over ADT
Robert Ly [Mon, 21 Jul 2014 16:17:39 +0000 (16:17 +0000)]
am
efca30d0: am
62c81ab5: docs: change copy for edu video
* commit '
efca30d0fafefb9f59668ee9d918cd7cc6098e6c':
docs: change copy for edu video
Robert Ly [Mon, 21 Jul 2014 16:11:39 +0000 (16:11 +0000)]
am
62c81ab5: docs: change copy for edu video
* commit '
62c81ab580ec39635fc8b52f552872675c87a816':
docs: change copy for edu video
Robert Ly [Mon, 21 Jul 2014 16:06:50 +0000 (09:06 -0700)]
docs: change copy for edu video
Change-Id: I88e5ae8e9c0f899f0e4dfc5087de9ea18153894d
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
Deepanshu Gupta [Tue, 22 Jul 2014 00:58:56 +0000 (00:58 +0000)]
Merge "Update layoutlib create README [DO NOT MERGE]" into klp-modular-dev
Deepanshu Gupta [Tue, 8 Apr 2014 23:16:43 +0000 (16:16 -0700)]
Update layoutlib create README [DO NOT MERGE]
Update the doc to reflect the current state of the tool and use a
consistent 100 char column limit.
Change-Id: I64fb58cc46abbc2f3759cb1f99d42b5090c1409f
(cherry picked from commit
88585f404cb493129847e4487b628062674a4ede)
Robert Ly [Tue, 22 Jul 2014 14:25:20 +0000 (14:25 +0000)]
Merge "docs: fix speech code for bug
16461337" into klp-modular-docs
Robert Ly [Mon, 21 Jul 2014 23:27:57 +0000 (16:27 -0700)]
docs: fix speech code for bug
16461337
Change-Id: Id2ab7852a7dbe9b91697e1ffd0ca1ba62144f875
Andrew Solovay [Mon, 21 Jul 2014 17:44:26 +0000 (17:44 +0000)]
Merge "docs: Noted how singleTop affects "up" navigation." into klp-modular-dev
David Friedman [Sun, 20 Jul 2014 12:43:19 +0000 (12:43 +0000)]
am
0d5af3f6: am
5d59d371: Merge "Minor typos, consistency things, one grammatical error." into klp-modular-docs
* commit '
0d5af3f67bdd3734304a19dad45d995e93b6e957':
Minor typos, consistency things, one grammatical error.
David Friedman [Sun, 20 Jul 2014 07:59:05 +0000 (07:59 +0000)]
am
5d59d371: Merge "Minor typos, consistency things, one grammatical error." into klp-modular-docs
* commit '
5d59d371f27008214f29febb0595b602edddcc67':
Minor typos, consistency things, one grammatical error.
Deepanshu Gupta [Tue, 22 Jul 2014 00:59:13 +0000 (00:59 +0000)]
Merge "LayoutLib: Fix EditText rendering [DO NOT MERGE]" into klp-modular-dev
Deepanshu Gupta [Tue, 10 Jun 2014 01:57:18 +0000 (18:57 -0700)]
LayoutLib: Fix EditText rendering [DO NOT MERGE]
Framework has overloaded java.lang.System.arraycopy() for char[]. The
method is not present on the Desktop VMs. This change replaces the calls
to this method by its more general alternative - the one using Objects.
TODO: Make it more configurable and flexible to allow rewrite of any
such methods in the future.
Change-Id: I6823b13e52b1c555eb257d02b79707d84e73236f
(cherry picked from commit
fc3e93300733b4a161adb9cceebea6cda353d085)
Quddus Chong [Fri, 18 Jul 2014 23:08:59 +0000 (23:08 +0000)]
am
f0804df1: am
349e5760: docs: Fixed bugs in Game Controller training doc. bug:
16375247,
14671463
* commit '
f0804df14263bd4f4f3a8bd1f21edd1f741dd8da':
docs: Fixed bugs in Game Controller training doc. bug:
16375247,
14671463
Quddus Chong [Fri, 18 Jul 2014 23:04:21 +0000 (23:04 +0000)]
am
349e5760: docs: Fixed bugs in Game Controller training doc. bug:
16375247,
14671463
* commit '
349e5760e701750babdc0f776e51ff2672f7ed2d':
docs: Fixed bugs in Game Controller training doc. bug:
16375247,
14671463
Deepanshu Gupta [Fri, 18 Jul 2014 22:39:22 +0000 (22:39 +0000)]
am
f4989910: am
d32dd294: am
b86675f1: am
f2c5a9ee: (-s ours) am
b9efa1e5: am
14a4e69c: am
c7351974: (-s ours) am
a3966c66: am
62743940: am
8c71ff29: am
87234e85: am
9c48ab82: am
ccf7b2aa: am
5af7324a: Fix style resolution for styles with \'.\' [DO NOT MERGE]
* commit '
f498991062d86e4cbf1c9880346a7feb8c428912':
Fix style resolution for styles with '.' [DO NOT MERGE]
Deepanshu Gupta [Fri, 18 Jul 2014 22:35:37 +0000 (22:35 +0000)]
am
d32dd294: am
b86675f1: am
f2c5a9ee: (-s ours) am
b9efa1e5: am
14a4e69c: am
c7351974: (-s ours) am
a3966c66: am
62743940: am
8c71ff29: am
87234e85: am
9c48ab82: am
ccf7b2aa: am
5af7324a: Fix style resolution for styles with \'.\' [DO NOT MERGE]
* commit '
d32dd2948d95a01e6b581ffbc357cf759bae0242':
Fix style resolution for styles with '.' [DO NOT MERGE]
Deepanshu Gupta [Fri, 18 Jul 2014 22:31:17 +0000 (22:31 +0000)]
am
b86675f1: am
f2c5a9ee: (-s ours) am
b9efa1e5: am
14a4e69c: am
c7351974: (-s ours) am
a3966c66: am
62743940: am
8c71ff29: am
87234e85: am
9c48ab82: am
ccf7b2aa: am
5af7324a: Fix style resolution for styles with \'.\' [DO NOT MERGE]
* commit '
b86675f14bea0c833f0ac3f0ec4d3e5f46784569':
Fix style resolution for styles with '.' [DO NOT MERGE]
Deepanshu Gupta [Fri, 18 Jul 2014 22:26:45 +0000 (22:26 +0000)]
am
f2c5a9ee: (-s ours) am
b9efa1e5: am
14a4e69c: am
c7351974: (-s ours) am
a3966c66: am
62743940: am
8c71ff29: am
87234e85: am
9c48ab82: am
ccf7b2aa: am
5af7324a: Fix style resolution for styles with \'.\' [DO NOT MERGE]
* commit '
f2c5a9ee4944b5ca995d0c6b11ccaddecf6432e1':
Fix style resolution for styles with '.' [DO NOT MERGE]
Deepanshu Gupta [Fri, 18 Jul 2014 22:22:24 +0000 (22:22 +0000)]
am
b9efa1e5: am
14a4e69c: am
c7351974: (-s ours) am
a3966c66: am
62743940: am
8c71ff29: am
87234e85: am
9c48ab82: am
ccf7b2aa: am
5af7324a: Fix style resolution for styles with \'.\' [DO NOT MERGE]
* commit '
b9efa1e5a11d1542d0bab9c945ce1e920b819764':
Fix style resolution for styles with '.' [DO NOT MERGE]
Deepanshu Gupta [Fri, 18 Jul 2014 22:17:36 +0000 (22:17 +0000)]
am
ad3ccc74: am
3f51ab0d: am
3c92b932: am
62b81acb: (-s ours) am
2df48bed: am
1bdfeadb: am
610341b3: (-s ours) am
95bbeb96: am
b8e4e8e1: am
d3ac01ff: Merge "Fix style resolution for styles with \'.\' [DO NOT MERGE]" into jb-mr1.1-dev
* commit '
ad3ccc741b867c4344e4c6c2338e02052244ae60':
Fix style resolution for styles with '.' [DO NOT MERGE]
Quddus Chong [Fri, 18 Jul 2014 21:38:38 +0000 (14:38 -0700)]
docs: Fixed bugs in Game Controller training doc.
bug:
16375247,
14671463
Change-Id: I51f595065435c3990a979a66b402acc2b6867a1a
Deepanshu Gupta [Fri, 18 Jul 2014 22:17:00 +0000 (22:17 +0000)]
am
14a4e69c: am
c7351974: (-s ours) am
a3966c66: am
62743940: am
8c71ff29: am
87234e85: am
9c48ab82: am
ccf7b2aa: am
5af7324a: Fix style resolution for styles with \'.\' [DO NOT MERGE]
* commit '
14a4e69cc656b60c705d2f05229aed2a7049693c':
Fix style resolution for styles with '.' [DO NOT MERGE]
Andrew Solovay [Tue, 22 Jul 2014 18:59:27 +0000 (18:59 +0000)]
Merge "DO NOT MERGE" into klp-modular-docs
Andrew Solovay [Thu, 10 Jul 2014 20:23:45 +0000 (13:23 -0700)]
DO NOT MERGE
cherrypick from klp-modular-dev docs: Noted how singleTop affects "up" navigation. Change-Id:
4d06d970526b58ddaf8db89858615217fa88772b
Docs are staged to:
http://asolovay.mtv:9411/training/implementing-navigation/ancestral.html#NavigateUp
http://asolovay.mtv:9411/guide/topics/manifest/activity-element.html#lmode
bug:
14527411
Change-Id: Ia414f2206339fc33739c8244f14140dd2e5d1607
(cherry picked from commit
4d06d970526b58ddaf8db89858615217fa88772b)
Andrew Solovay [Tue, 22 Jul 2014 18:38:39 +0000 (18:38 +0000)]
Merge "docs: Removed reference to a sample notepad app." into klp-modular-docs
Andrew Solovay [Sat, 19 Jul 2014 00:00:42 +0000 (17:00 -0700)]
docs: Removed reference to a sample notepad app.
The first section incorrectly said that there was a full Notepad
sample app in the "samples" directory; removed that reference.
Also changed the description in "Other Resources and Further Learning"
to point to the sample in "samples/legacy/NotePad".
Doc is staged to: http://asolovay.mtv:9249/training/notepad/
bug:
15612249
Change-Id: I6c17565fd7708fb50915e8cdd73043964cc2878a
Deepanshu Gupta [Fri, 18 Jul 2014 22:12:11 +0000 (22:12 +0000)]
am
98b24366: am
c35afdfd: am
cee55fc1: am
99286edc: (-s ours) am
aa0c1c75: am
e83fa180: am
696eb4da: (-s ours) am
c39916f7: am
37f54f4c: am
357ebfc5: Fix default level flags for bidi. [DO NOT MERGE]
* commit '
98b243660c56129a0e2962e2faeeef1b65409210':
Fix default level flags for bidi. [DO NOT MERGE]
Deepanshu Gupta [Fri, 18 Jul 2014 22:12:10 +0000 (22:12 +0000)]
am
3f51ab0d: am
3c92b932: am
62b81acb: (-s ours) am
2df48bed: am
1bdfeadb: am
610341b3: (-s ours) am
95bbeb96: am
b8e4e8e1: am
d3ac01ff: Merge "Fix style resolution for styles with \'.\' [DO NOT MERGE]" into jb-mr1.1-dev
* commit '
3f51ab0d81b3f24a0246f3bfe28ea5b364b48210':
Fix style resolution for styles with '.' [DO NOT MERGE]
Deepanshu Gupta [Fri, 18 Jul 2014 22:12:02 +0000 (22:12 +0000)]
am
c7351974: (-s ours) am
a3966c66: am
62743940: am
8c71ff29: am
87234e85: am
9c48ab82: am
ccf7b2aa: am
5af7324a: Fix style resolution for styles with \'.\' [DO NOT MERGE]
* commit '
c735197420948ffff757dbe6d00028a87ed09c15':
Fix style resolution for styles with '.' [DO NOT MERGE]
Deepanshu Gupta [Fri, 18 Jul 2014 22:07:47 +0000 (22:07 +0000)]
am
08840806: am
7f98066d: am
4c312f20: am
a3d2c7e7: (-s ours) am
85c7b209: am
5efee91e: Merge "Fix style resolution for styles with \'.\' [DO NOT MERGE]" into jb-mr2-dev
* commit '
08840806b8dbc6c81ec69f409e38ca07f64da528':
Fix style resolution for styles with '.' [DO NOT MERGE]
Deepanshu Gupta [Fri, 18 Jul 2014 22:07:40 +0000 (22:07 +0000)]
am
a3966c66: am
62743940: am
8c71ff29: am
87234e85: am
9c48ab82: am
ccf7b2aa: am
5af7324a: Fix style resolution for styles with \'.\' [DO NOT MERGE]
* commit '
a3966c66ee24109ca4b71f591f0d740ee37987de':
Fix style resolution for styles with '.' [DO NOT MERGE]
Deepanshu Gupta [Fri, 18 Jul 2014 22:07:31 +0000 (22:07 +0000)]
am
3c92b932: am
62b81acb: (-s ours) am
2df48bed: am
1bdfeadb: am
610341b3: (-s ours) am
95bbeb96: am
b8e4e8e1: am
d3ac01ff: Merge "Fix style resolution for styles with \'.\' [DO NOT MERGE]" into jb-mr1.1-dev
* commit '
3c92b93226195523ff857763901a33847165ee9e':
Fix style resolution for styles with '.' [DO NOT MERGE]
Deepanshu Gupta [Fri, 18 Jul 2014 22:06:44 +0000 (22:06 +0000)]
am
c35afdfd: am
cee55fc1: am
99286edc: (-s ours) am
aa0c1c75: am
e83fa180: am
696eb4da: (-s ours) am
c39916f7: am
37f54f4c: am
357ebfc5: Fix default level flags for bidi. [DO NOT MERGE]
* commit '
c35afdfd4c40e55e235791341c515bd012d77146':
Fix default level flags for bidi. [DO NOT MERGE]
Deepanshu Gupta [Fri, 18 Jul 2014 22:02:28 +0000 (22:02 +0000)]
am
7f98066d: am
4c312f20: am
a3d2c7e7: (-s ours) am
85c7b209: am
5efee91e: Merge "Fix style resolution for styles with \'.\' [DO NOT MERGE]" into jb-mr2-dev
* commit '
7f98066dd1a2a05d53ba39108dd4d44430e89c71':
Fix style resolution for styles with '.' [DO NOT MERGE]
Deepanshu Gupta [Fri, 18 Jul 2014 22:02:14 +0000 (22:02 +0000)]
am
62b81acb: (-s ours) am
2df48bed: am
1bdfeadb: am
610341b3: (-s ours) am
95bbeb96: am
b8e4e8e1: am
d3ac01ff: Merge "Fix style resolution for styles with \'.\' [DO NOT MERGE]" into jb-mr1.1-dev
* commit '
62b81acbcad6ceaa269c7f788068bdf32f403040':
Fix style resolution for styles with '.' [DO NOT MERGE]
Deepanshu Gupta [Fri, 18 Jul 2014 22:02:07 +0000 (22:02 +0000)]
am
cee55fc1: am
99286edc: (-s ours) am
aa0c1c75: am
e83fa180: am
696eb4da: (-s ours) am
c39916f7: am
37f54f4c: am
357ebfc5: Fix default level flags for bidi. [DO NOT MERGE]
* commit '
cee55fc19bc9542d17081568ba082b56b5e5d04d':
Fix default level flags for bidi. [DO NOT MERGE]
Deepanshu Gupta [Fri, 18 Jul 2014 22:01:45 +0000 (22:01 +0000)]
am
62743940: am
8c71ff29: am
87234e85: am
9c48ab82: am
ccf7b2aa: am
5af7324a: Fix style resolution for styles with \'.\' [DO NOT MERGE]
* commit '
627439401ec86a083eefdc61728d6aa75ce9a4e5':
Fix style resolution for styles with '.' [DO NOT MERGE]
Deepanshu Gupta [Fri, 18 Jul 2014 22:00:01 +0000 (22:00 +0000)]
am
8613f826: am
efd29681: am
964591a6: am
c3a7763b: (-s ours) am
918ca12f: am
10395cbb: Fix default level flags for bidi. [DO NOT MERGE]
* commit '
8613f826289d627df07971f074a2852012fc98b7':
Fix default level flags for bidi. [DO NOT MERGE]
Deepanshu Gupta [Fri, 18 Jul 2014 21:58:42 +0000 (21:58 +0000)]
am
8c71ff29: am
87234e85: am
9c48ab82: am
ccf7b2aa: am
5af7324a: Fix style resolution for styles with \'.\' [DO NOT MERGE]
* commit '
8c71ff298b10ebdd3e5dec6f69f70176161b7e0a':
Fix style resolution for styles with '.' [DO NOT MERGE]
Deepanshu Gupta [Fri, 18 Jul 2014 21:57:44 +0000 (21:57 +0000)]
am
4c312f20: am
a3d2c7e7: (-s ours) am
85c7b209: am
5efee91e: Merge "Fix style resolution for styles with \'.\' [DO NOT MERGE]" into jb-mr2-dev
* commit '
4c312f20cafc3160e04224f18cacd8d35a7f9e3c':
Fix style resolution for styles with '.' [DO NOT MERGE]
Deepanshu Gupta [Fri, 18 Jul 2014 21:57:16 +0000 (21:57 +0000)]
am
2df48bed: am
1bdfeadb: am
610341b3: (-s ours) am
95bbeb96: am
b8e4e8e1: am
d3ac01ff: Merge "Fix style resolution for styles with \'.\' [DO NOT MERGE]" into jb-mr1.1-dev
* commit '
2df48bed6afed4958835b8bdc2c8b44db32919fc':
Fix style resolution for styles with '.' [DO NOT MERGE]
OSDN Git Service
