OSDN Git Service

android-x86/frameworks-base.git
8 years agoam 8a6295e8: am e481e713: Include Shapes in LayoutLib. [DO NOT MERGE]
Deepanshu Gupta [Wed, 26 Aug 2015 20:19:13 +0000 (20:19 +0000)]
am 8a6295e8: am e481e713: Include Shapes in LayoutLib. [DO NOT MERGE]

* commit '8a6295e82a2aed91eb26fa15479bf295c2bd79d7':
  Include Shapes in LayoutLib. [DO NOT MERGE]

8 years agoam 66d5f24d: am ba5a02c5: LayoutLib: Support getting resource arrays. [DO NOT MERGE]
Deepanshu Gupta [Wed, 26 Aug 2015 20:19:05 +0000 (20:19 +0000)]
am 66d5f24d: am ba5a02c5: LayoutLib: Support getting resource arrays. [DO NOT MERGE]

* commit '66d5f24df0c3627028812ee23da8d4f08cc83e5c':
  LayoutLib: Support getting resource arrays. [DO NOT MERGE]

8 years agoam b32e44ff: am a5ffed0b: LayoutLib: Change nullity annotations. [DO NOT MERGE]
Deepanshu Gupta [Wed, 26 Aug 2015 20:18:54 +0000 (20:18 +0000)]
am b32e44ff: am a5ffed0b: LayoutLib: Change nullity annotations. [DO NOT MERGE]

* commit 'b32e44ff0c5fd410720bb28c87bc9cea83556edf':
  LayoutLib: Change nullity annotations. [DO NOT MERGE]

8 years agoam 1754824c: am c96ef952: Add documentation about hack in commit: f8ea750455 [DO...
Deepanshu Gupta [Wed, 26 Aug 2015 20:18:47 +0000 (20:18 +0000)]
am 1754824c: am c96ef952: Add documentation about hack in commit: f8ea750455 [DO NOT MERGE]

* commit '1754824c2835d6f3a17c4a2c0ab668991797fcf9':
  Add documentation about hack in commit: f8ea750455 [DO NOT MERGE]

8 years agoam 678f0ea2: am b318ff54: Make DatePicker rendering not fail (style search fix)....
Deepanshu Gupta [Wed, 26 Aug 2015 20:18:34 +0000 (20:18 +0000)]
am 678f0ea2: am b318ff54: Make DatePicker rendering not fail (style search fix). [DO NOT MERGE]

* commit '678f0ea2ba47f06387670e9f75b13637a6446899':
  Make DatePicker rendering not fail (style search fix). [DO NOT MERGE]

8 years agoam 2e57c1e2: am cc5e69e4: Inject anonymous inner classes of injected classes [DO...
Deepanshu Gupta [Wed, 26 Aug 2015 20:18:27 +0000 (20:18 +0000)]
am 2e57c1e2: am cc5e69e4: Inject anonymous inner classes of injected classes [DO NOT MERGE]

* commit '2e57c1e23f43bb0ede6280720559ccc1e866024b':
  Inject anonymous inner classes of injected classes [DO NOT MERGE]

8 years agoam 899daf75: am d7e89906: Update platformDir search in tests. [DO NOT MERGE]
Deepanshu Gupta [Wed, 26 Aug 2015 20:18:15 +0000 (20:18 +0000)]
am 899daf75: am d7e89906: Update platformDir search in tests. [DO NOT MERGE]

* commit '899daf759e02bef0de14dc1a14b96b4d71f0b9fc':
  Update platformDir search in tests. [DO NOT MERGE]

8 years agoam 2f50403f: am afedbc47: Make Context.getClassLoader() work. [DO NOT MERGE]
Deepanshu Gupta [Wed, 26 Aug 2015 20:18:09 +0000 (20:18 +0000)]
am 2f50403f: am afedbc47: Make Context.getClassLoader() work. [DO NOT MERGE]

* commit '2f50403fe0a8a035757b047af00c7520fadb9015':
  Make Context.getClassLoader() work. [DO NOT MERGE]

8 years agoam de3ac8f9: am 92480a9a: Fix include tag rendering. [DO NOT MERGE]
Deepanshu Gupta [Wed, 26 Aug 2015 20:18:04 +0000 (20:18 +0000)]
am de3ac8f9: am 92480a9a: Fix include tag rendering. [DO NOT MERGE]

* commit 'de3ac8f9fc5987ac1f1223da02b4275fdbae3d56':
  Fix include tag rendering. [DO NOT MERGE]

8 years agoam 50e1406a: am f6b08547: Show better error message for color attr not found. [DO...
Deepanshu Gupta [Wed, 26 Aug 2015 20:17:51 +0000 (20:17 +0000)]
am 50e1406a: am f6b08547: Show better error message for color attr not found. [DO NOT MERGE]

* commit '50e1406a4ad668179a9a3d28c58d68c0eee44237':
  Show better error message for color attr not found. [DO NOT MERGE]

8 years agoam 81990c3f: am b1370c26: Fix build: udpate parser factory method [DO NOT MERGE]
Deepanshu Gupta [Wed, 26 Aug 2015 20:17:46 +0000 (20:17 +0000)]
am 81990c3f: am b1370c26: Fix build: udpate parser factory method [DO NOT MERGE]

* commit '81990c3f988369c755590288b93508e30024c56c':
  Fix build: udpate parser factory method [DO NOT MERGE]

8 years agoam 0a07bb95: am aa729889: Don\'t keep LayoutlibCallback reference. [DO NOT MERGE]
Deepanshu Gupta [Wed, 26 Aug 2015 20:17:40 +0000 (20:17 +0000)]
am 0a07bb95: am aa729889: Don\'t keep LayoutlibCallback reference. [DO NOT MERGE]

* commit '0a07bb95a1dd94c3457860a934d3ee546919cff2':
  Don't keep LayoutlibCallback reference. [DO NOT MERGE]

8 years agoam bbbdc2ad: am 5c90c4f4: Remove kxml dependency [DO NOT MERGE]
Deepanshu Gupta [Wed, 26 Aug 2015 20:17:34 +0000 (20:17 +0000)]
am bbbdc2ad: am 5c90c4f4: Remove kxml dependency [DO NOT MERGE]

* commit 'bbbdc2ad8939c28828a8441c0b24812c53a9eb66':
  Remove kxml dependency [DO NOT MERGE]

8 years agoam e481e713: Include Shapes in LayoutLib. [DO NOT MERGE]
Deepanshu Gupta [Wed, 26 Aug 2015 05:55:33 +0000 (05:55 +0000)]
am e481e713: Include Shapes in LayoutLib. [DO NOT MERGE]

* commit 'e481e713f24c83a3347fd83580d07252d589ec3b':
  Include Shapes in LayoutLib. [DO NOT MERGE]

8 years agoam ba5a02c5: LayoutLib: Support getting resource arrays. [DO NOT MERGE]
Deepanshu Gupta [Wed, 26 Aug 2015 05:55:26 +0000 (05:55 +0000)]
am ba5a02c5: LayoutLib: Support getting resource arrays. [DO NOT MERGE]

* commit 'ba5a02c5aa3c9850cdd72e592e9fa8a8d92db7ef':
  LayoutLib: Support getting resource arrays. [DO NOT MERGE]

8 years agoam a5ffed0b: LayoutLib: Change nullity annotations. [DO NOT MERGE]
Deepanshu Gupta [Wed, 26 Aug 2015 05:55:19 +0000 (05:55 +0000)]
am a5ffed0b: LayoutLib: Change nullity annotations. [DO NOT MERGE]

* commit 'a5ffed0b69ac41d65aacc6ee586688a22226f64b':
  LayoutLib: Change nullity annotations. [DO NOT MERGE]

8 years agoam c96ef952: Add documentation about hack in commit: f8ea750455 [DO NOT MERGE]
Deepanshu Gupta [Wed, 26 Aug 2015 05:55:14 +0000 (05:55 +0000)]
am c96ef952: Add documentation about hack in commit: f8ea750455 [DO NOT MERGE]

* commit 'c96ef95285e935034377dee30f3b8a0329f6c3a2':
  Add documentation about hack in commit: f8ea750455 [DO NOT MERGE]

8 years agoam b318ff54: Make DatePicker rendering not fail (style search fix). [DO NOT MERGE]
Deepanshu Gupta [Wed, 26 Aug 2015 05:55:07 +0000 (05:55 +0000)]
am b318ff54: Make DatePicker rendering not fail (style search fix). [DO NOT MERGE]

* commit 'b318ff54fcd17e7aadd1b0251c34cba348898704':
  Make DatePicker rendering not fail (style search fix). [DO NOT MERGE]

8 years agoam cc5e69e4: Inject anonymous inner classes of injected classes [DO NOT MERGE]
Deepanshu Gupta [Wed, 26 Aug 2015 05:55:02 +0000 (05:55 +0000)]
am cc5e69e4: Inject anonymous inner classes of injected classes [DO NOT MERGE]

* commit 'cc5e69e4fed8bb797dc3f83c1de32eaf4a52f324':
  Inject anonymous inner classes of injected classes [DO NOT MERGE]

8 years agoam d7e89906: Update platformDir search in tests. [DO NOT MERGE]
Deepanshu Gupta [Wed, 26 Aug 2015 05:54:58 +0000 (05:54 +0000)]
am d7e89906: Update platformDir search in tests. [DO NOT MERGE]

* commit 'd7e89906a453a562a8fef303fc6c4068dfa5c0d0':
  Update platformDir search in tests. [DO NOT MERGE]

8 years agoam afedbc47: Make Context.getClassLoader() work. [DO NOT MERGE]
Deepanshu Gupta [Wed, 26 Aug 2015 05:54:52 +0000 (05:54 +0000)]
am afedbc47: Make Context.getClassLoader() work. [DO NOT MERGE]

* commit 'afedbc47b3c8f3fa9955496e6ceb7f5702dd90a3':
  Make Context.getClassLoader() work. [DO NOT MERGE]

8 years agoam 92480a9a: Fix include tag rendering. [DO NOT MERGE]
Deepanshu Gupta [Wed, 26 Aug 2015 05:54:44 +0000 (05:54 +0000)]
am 92480a9a: Fix include tag rendering. [DO NOT MERGE]

* commit '92480a9ad89a813bdf36185fa8c4d227d8415b4c':
  Fix include tag rendering. [DO NOT MERGE]

8 years agoam f6b08547: Show better error message for color attr not found. [DO NOT MERGE]
Deepanshu Gupta [Wed, 26 Aug 2015 05:54:39 +0000 (05:54 +0000)]
am f6b08547: Show better error message for color attr not found. [DO NOT MERGE]

* commit 'f6b08547458b9219da1717a79363f778bfc57dd0':
  Show better error message for color attr not found. [DO NOT MERGE]

8 years agoam b1370c26: Fix build: udpate parser factory method [DO NOT MERGE]
Deepanshu Gupta [Wed, 26 Aug 2015 05:54:33 +0000 (05:54 +0000)]
am b1370c26: Fix build: udpate parser factory method [DO NOT MERGE]

* commit 'b1370c2687f4b03f7b9b36f89bb636b5b65f9531':
  Fix build: udpate parser factory method [DO NOT MERGE]

8 years agoam aa729889: Don\'t keep LayoutlibCallback reference. [DO NOT MERGE]
Deepanshu Gupta [Wed, 26 Aug 2015 05:54:28 +0000 (05:54 +0000)]
am aa729889: Don\'t keep LayoutlibCallback reference. [DO NOT MERGE]

* commit 'aa72988955789be6e790c344daba3ef17abfcd98':
  Don't keep LayoutlibCallback reference. [DO NOT MERGE]

8 years agoam 5c90c4f4: Remove kxml dependency [DO NOT MERGE]
Deepanshu Gupta [Wed, 26 Aug 2015 05:54:23 +0000 (05:54 +0000)]
am 5c90c4f4: Remove kxml dependency [DO NOT MERGE]

* commit '5c90c4f459c2a7213a197f7ee98ad71e85af31bc':
  Remove kxml dependency [DO NOT MERGE]

8 years agoInclude Shapes in LayoutLib. [DO NOT MERGE]
Deepanshu Gupta [Tue, 26 May 2015 16:24:48 +0000 (09:24 -0700)]
Include Shapes in LayoutLib. [DO NOT MERGE]

Change-Id: Ifb32882c478f8d407ad904e224b67fe2bd65dc08
(cherry picked from commit 59164ec0551aa49f497acca81222f304cf4f344b)

8 years agoLayoutLib: Support getting resource arrays. [DO NOT MERGE]
Deepanshu Gupta [Fri, 22 May 2015 22:47:16 +0000 (15:47 -0700)]
LayoutLib: Support getting resource arrays. [DO NOT MERGE]

- Don't crash when Resources.get<Type>Array() is called.
- If the IDE supports it, actually return the value.
- Add tests for getArray.
- Update test app to latest gradle plugin version.
- Switch to using AppTheme for tests, since the tests depend on some
  custom theme attributes. The AppTheme now inherits from
  Material.Light.DarkActionBar, so other tests should be unaffected.

Depends on a newer version of sdk-common, which fixes the parsing of
array resource in value files.

Bug: 12372031
Change-Id: I313b61511e98ac1402d75056ebfdeeb005ebb96d
(cherry picked from commit 642cff50f8f7a67eed09eac1e56d7133b26a192c)

8 years agoLayoutLib: Change nullity annotations. [DO NOT MERGE]
Deepanshu Gupta [Fri, 22 May 2015 21:11:22 +0000 (14:11 -0700)]
LayoutLib: Change nullity annotations. [DO NOT MERGE]

Switch from using tools nullity annotations (com.android.annotations)
to android framework annotations (android.annotation).

A new sdk-common prebuilt is required for LayoutLib tests. The new
sdk-common requires an updated tools-common. The updated tools-common
doesn't have nullity annotations. So, instead of adding the annotation
dependency, just reuse the platform ones. This also paves the way to
include other platform annotations like IdRes etc.

Change-Id: I87b8f767d3681d914abe7d1329e26a87f49f50a7
(cherry picked from commit 476e582d2ffdf25102d4c55f8c242baa3d21d37f)

8 years agoAdd documentation about hack in commit: f8ea750455 [DO NOT MERGE]
Deepanshu Gupta [Thu, 21 May 2015 18:47:36 +0000 (11:47 -0700)]
Add documentation about hack in commit: f8ea750455 [DO NOT MERGE]

Change-Id: I9ce871a67fb67e02e0c4df1eb5c3261ea52a914b
(cherry picked from commit 6330971ed293a2777bbdab09288f90ea4b2d0255)

8 years agoMake DatePicker rendering not fail (style search fix). [DO NOT MERGE]
Deepanshu Gupta [Mon, 24 Aug 2015 20:50:18 +0000 (13:50 -0700)]
Make DatePicker rendering not fail (style search fix). [DO NOT MERGE]

Only cherry picked for the style not found fix.

Change-Id: Ied2b71de5b32bcb640bf4ec445e8a39509f800e9
(cherry picked from commit d5b82845450beac2d3c7db9cd80e9fc34d43a297)

8 years agoInject anonymous inner classes of injected classes [DO NOT MERGE]
Deepanshu Gupta [Wed, 20 May 2015 21:51:37 +0000 (14:51 -0700)]
Inject anonymous inner classes of injected classes [DO NOT MERGE]

When injecting classes in LayoutLib (eg. CreateInfo), so that LayoutLib
can refer back to the changes, also inject the anonymous inner classes.
Without this, the injected classes are not loadable. Although, LayoutLib
itself doesn't load these classes, but some tests do.

Change-Id: Ib5f6b779ef4d79dec8d614d3dbb26eeac88a1064
(cherry picked from commit bfc9c3bcbe3b7056d3330f754811c1506f181b88)

8 years agoUpdate platformDir search in tests. [DO NOT MERGE]
Deepanshu Gupta [Wed, 20 May 2015 18:28:50 +0000 (11:28 -0700)]
Update platformDir search in tests. [DO NOT MERGE]

When trying to find the SDK Platform Dir for LayoutLib tests, also
test if the dir from which the tests are run is module dir.

Change-Id: Id5c6038d07ebbb122e38f907ad488ed1f2bcde32
(cherry picked from commit 612a05e7e15184b21437731b9aa5db2d1d4fc54c)

8 years agoMake Context.getClassLoader() work. [DO NOT MERGE]
Deepanshu Gupta [Tue, 19 May 2015 01:47:07 +0000 (18:47 -0700)]
Make Context.getClassLoader() work. [DO NOT MERGE]

Context.getClassLoader() is used by the LayoutInflater and can be used
by custom views. However, when called from the LayoutInflater, this
needs to return only the Framework classes. This is so that the IDE gets
a chance to instantiate the custom views, which helps in better error
reporting and better fallback in case of exceptions, like MockView.

To workaround this need of the same method returning different results
based on where it's called from, the method call in LayoutInflater is
renamed to getFrameworkClassLoader() and the new method is injected in
Context. The implementation of getFrameworkClassLoader() maintains the
existing behaviour of getClassLoader().

Context.getClassLoader() is now modified to return classes from both
Framework and the app namespace.

Also, update the list of packages to search for Framework views.

Change-Id: I1a6be4aa1fc5c1c5520b5440a348a52f10b6eb3b
(cherry picked from commit f8ea750455eec81e4e6d877b3e18e29a86d4ec95)

8 years agoFix include tag rendering. [DO NOT MERGE]
Deepanshu Gupta [Tue, 19 May 2015 18:55:15 +0000 (11:55 -0700)]
Fix include tag rendering. [DO NOT MERGE]

A missing catch clause caused rendering to be failed when there is an
include tag that doesn't specify layout_width and layout_height. Also
improve the error messages to make debugging easier next time.

Change-Id: I617762636973a010b34da167c7b5fcd328b7d178
(cherry picked from commit 21b564573327b1ed2f7e06146b8a01c47ede3089)

8 years agoShow better error message for color attr not found. [DO NOT MERGE]
Deepanshu Gupta [Mon, 18 May 2015 21:39:03 +0000 (14:39 -0700)]
Show better error message for color attr not found. [DO NOT MERGE]

Change-Id: I1ca32989522d30fec336eb607ee81f9e5cb5f48f
(cherry picked from commit 5f1bf496948fb6383ae17e5467a26a00489d7564)

8 years agoFix build: udpate parser factory method [DO NOT MERGE]
Deepanshu Gupta [Fri, 15 May 2015 00:00:50 +0000 (17:00 -0700)]
Fix build: udpate parser factory method [DO NOT MERGE]

Change-Id: I78ad55bc924427b44451ec32fbd1032d6cd77544
(cherry picked from commit 3dc19883c571a829c36aa603c04a55c91b00dd57)

8 years agoDon't keep LayoutlibCallback reference. [DO NOT MERGE]
Deepanshu Gupta [Thu, 14 May 2015 22:37:29 +0000 (15:37 -0700)]
Don't keep LayoutlibCallback reference. [DO NOT MERGE]

Switch to the newer API that enables keeping a reference only to the
ParserFactory which is a much leaner object as compared to
LayoutlibCallback.

 Conflicts:
tools/layoutlib/bridge/tests/src/com/android/layoutlib/bridge/android/BridgeXmlBlockParserTest.java

Change-Id: I9b7afd93226db23786a00b2951cbf5ae5b8f3e5f
(cherry picked from commit f2d408b51debadca830eefbf8131185ac55ce699)

8 years agoRemove kxml dependency [DO NOT MERGE]
Deepanshu Gupta [Sat, 9 May 2015 20:09:22 +0000 (13:09 -0700)]
Remove kxml dependency [DO NOT MERGE]

Create XmlPullParser using callback provided by the client. This enables
clients to choose which XmlPullParser implementation they want.

Change-Id: I9ad97a4777820cdbe5c8fc3716f74ddec9065c70
(cherry picked from commit 78af25584633462e4ab8cf9bafe10f43e7cb2d83)

8 years agoam dc35d48f: Merge "docs: changed red to yellow in code snippet" into mnc-preview...
Cheryl Potter [Fri, 21 Aug 2015 23:01:17 +0000 (23:01 +0000)]
am dc35d48f: Merge "docs: changed red to yellow in code snippet" into mnc-preview-docs

* commit 'dc35d48f4fdc2016f900207ebc934e5a57bd9265':
  docs: changed red to yellow in code snippet

8 years agoMerge "docs: changed red to yellow in code snippet" into mnc-preview-docs
Cheryl Potter [Fri, 21 Aug 2015 22:51:30 +0000 (22:51 +0000)]
Merge "docs: changed red to yellow in code snippet" into mnc-preview-docs

8 years agoam b63e291d: am 88556ac2: am 599dc2bd: am 50af68e7: am 55f86b18: (-s ours) am 9e7a0dd...
Sebastien Hertz [Fri, 21 Aug 2015 11:02:27 +0000 (11:02 +0000)]
am b63e291d: am 88556ac2: am 599dc2bd: am 50af68e7: am 55f86b18: (-s ours) am 9e7a0ddb: am 18089ceb: Allow debugging only for apps forked from zygote DO NOT MERGE

* commit 'b63e291d05aa9522b2ef9b399936c52079820c3f':
  Allow debugging only for apps forked from zygote DO NOT MERGE

8 years agoam 88556ac2: am 599dc2bd: am 50af68e7: am 55f86b18: (-s ours) am 9e7a0ddb: am 18089ce...
Sebastien Hertz [Fri, 21 Aug 2015 10:53:07 +0000 (10:53 +0000)]
am 88556ac2: am 599dc2bd: am 50af68e7: am 55f86b18: (-s ours) am 9e7a0ddb: am 18089ceb: Allow debugging only for apps forked from zygote DO NOT MERGE

* commit '88556ac22157ddfe154be6ee7c8853e0a81dc83c':
  Allow debugging only for apps forked from zygote DO NOT MERGE

8 years agoam 599dc2bd: am 50af68e7: am 55f86b18: (-s ours) am 9e7a0ddb: am 18089ceb: Allow...
Sebastien Hertz [Fri, 21 Aug 2015 10:37:46 +0000 (10:37 +0000)]
am 599dc2bd: am 50af68e7: am 55f86b18: (-s ours) am 9e7a0ddb: am 18089ceb: Allow debugging only for apps forked from zygote DO NOT MERGE

* commit '599dc2bd1c809ae5a413fc3800fc3fbb71432de6':
  Allow debugging only for apps forked from zygote DO NOT MERGE

8 years agoam 50af68e7: am 55f86b18: (-s ours) am 9e7a0ddb: am 18089ceb: Allow debugging only...
Sebastien Hertz [Fri, 21 Aug 2015 10:29:30 +0000 (10:29 +0000)]
am 50af68e7: am 55f86b18: (-s ours) am 9e7a0ddb: am 18089ceb: Allow debugging only for apps forked from zygote DO NOT MERGE

* commit '50af68e74a756d0fc81eda2a3580dbcf70362d42':
  Allow debugging only for apps forked from zygote DO NOT MERGE

8 years agoam 55f86b18: (-s ours) am 9e7a0ddb: am 18089ceb: Allow debugging only for apps forked...
Sebastien Hertz [Fri, 21 Aug 2015 10:18:38 +0000 (10:18 +0000)]
am 55f86b18: (-s ours) am 9e7a0ddb: am 18089ceb: Allow debugging only for apps forked from zygote DO NOT MERGE

* commit '55f86b1811f0411a5d685d6c97772b846a706e19':
  Allow debugging only for apps forked from zygote DO NOT MERGE

8 years agoam 9e7a0ddb: am 18089ceb: Allow debugging only for apps forked from zygote DO NOT...
Sebastien Hertz [Fri, 21 Aug 2015 10:09:22 +0000 (10:09 +0000)]
am 9e7a0ddb: am 18089ceb: Allow debugging only for apps forked from zygote DO NOT MERGE

* commit '9e7a0ddb65ad0bd04d49a24a68aa96730b2ba9a1':
  Allow debugging only for apps forked from zygote DO NOT MERGE

8 years agoam 18089ceb: Allow debugging only for apps forked from zygote DO NOT MERGE
Sebastien Hertz [Fri, 21 Aug 2015 09:50:24 +0000 (09:50 +0000)]
am 18089ceb: Allow debugging only for apps forked from zygote DO NOT MERGE

* commit '18089ceb71ad4ce2332096b8e7b5f8c1f8e263db':
  Allow debugging only for apps forked from zygote DO NOT MERGE

8 years agoresolved conflicts for merge of a2d19318 to lmp-mr1-ub-dev
Sebastien Hertz [Fri, 21 Aug 2015 07:53:41 +0000 (09:53 +0200)]
resolved conflicts for merge of a2d19318 to lmp-mr1-ub-dev

Change-Id: I4cb38241b5efab1eb7af161e1589fa477a473a39

8 years agoam 87a786af: am 445ab7fa: am ff8dc212: Allow debugging only for apps forked from...
Sebastien Hertz [Fri, 21 Aug 2015 07:19:10 +0000 (07:19 +0000)]
am 87a786af: am 445ab7fa: am ff8dc212: Allow debugging only for apps forked from zygote

* commit '87a786afdba8ec94036c62fb58265d364a7064ae':
  Allow debugging only for apps forked from zygote

8 years agoam 445ab7fa: am ff8dc212: Allow debugging only for apps forked from zygote
Sebastien Hertz [Fri, 21 Aug 2015 07:08:43 +0000 (07:08 +0000)]
am 445ab7fa: am ff8dc212: Allow debugging only for apps forked from zygote

* commit '445ab7fa43f32ac1a256b15f5ab2bd619e9711e4':
  Allow debugging only for apps forked from zygote

8 years agoam ff8dc212: Allow debugging only for apps forked from zygote
Sebastien Hertz [Fri, 21 Aug 2015 07:01:02 +0000 (07:01 +0000)]
am ff8dc212: Allow debugging only for apps forked from zygote

* commit 'ff8dc21278b19b22ed8dc9f9475850838336d351':
  Allow debugging only for apps forked from zygote

8 years agoam 5389f46c: Docs: Fixes to interactive-watch-face docs (CL 743190)
David Friedman [Thu, 20 Aug 2015 16:59:08 +0000 (16:59 +0000)]
am 5389f46c: Docs: Fixes to interactive-watch-face docs (CL 743190)

* commit '5389f46ce4245a6a0cfc931160ea13dab17f6590':
  Docs: Fixes to interactive-watch-face docs (CL 743190)

8 years agoDocs: Fixes to interactive-watch-face docs (CL 743190)
David Friedman [Thu, 20 Aug 2015 15:31:07 +0000 (08:31 -0700)]
Docs: Fixes to interactive-watch-face docs (CL 743190)

Change-Id: I2b9c7d7afbf5583da01808027869e1e98873c7d1

8 years agoam 56c22d29: Merge "Docs: Creating interactive watch faces Bug: 21721463" into mnc...
David Friedman [Thu, 20 Aug 2015 00:57:50 +0000 (00:57 +0000)]
am 56c22d29: Merge "Docs: Creating interactive watch faces Bug: 21721463" into mnc-preview-docs

* commit '56c22d29b8727e55073cede04b51e65eb6125b9f':
  Docs: Creating interactive watch faces Bug: 21721463

8 years agoMerge "Docs: Creating interactive watch faces Bug: 21721463" into mnc-preview-docs
David Friedman [Thu, 20 Aug 2015 00:44:58 +0000 (00:44 +0000)]
Merge "Docs: Creating interactive watch faces Bug: 21721463" into mnc-preview-docs

8 years agoDocs: Creating interactive watch faces
David Friedman [Wed, 15 Jul 2015 05:42:53 +0000 (22:42 -0700)]
Docs: Creating interactive watch faces
Bug: 21721463

Training module and related API-reference documentation. This is new
material for Android Wear D(iamond) release.

Change-Id: I9959bca50fd96812abd7cfb693139986bc59b133

8 years agoam ed54f60a: Merge "Docs: Updating, clarifying Debug-over-WiFi instructions. Bug...
David Friedman [Wed, 19 Aug 2015 22:31:15 +0000 (22:31 +0000)]
am ed54f60a: Merge "Docs: Updating, clarifying Debug-over-WiFi instructions. Bug: 21371836" into mnc-preview-docs

* commit 'ed54f60ae4d57ed1e9cc963fc3baf5de91d51c53':
  Docs: Updating, clarifying Debug-over-WiFi instructions. Bug: 21371836

8 years agoMerge "Docs: Updating, clarifying Debug-over-WiFi instructions. Bug: 21371836" into...
David Friedman [Wed, 19 Aug 2015 22:21:41 +0000 (22:21 +0000)]
Merge "Docs: Updating, clarifying Debug-over-WiFi instructions. Bug: 21371836" into mnc-preview-docs

8 years agoDocs: Updating, clarifying Debug-over-WiFi instructions.
David Friedman [Thu, 23 Jul 2015 16:05:08 +0000 (09:05 -0700)]
Docs: Updating, clarifying Debug-over-WiFi instructions.
Bug: 21371836

Change-Id: Ieef63c416c85f778e4b00ef08b434040709c2493

8 years agoAllow debugging only for apps forked from zygote DO NOT MERGE
Sebastien Hertz [Mon, 10 Aug 2015 16:55:34 +0000 (18:55 +0200)]
Allow debugging only for apps forked from zygote DO NOT MERGE

When starting the runtime from app_process, we only pass JDWP options
if starting zygote. It prevents from opening a JDWP connection in
non-zygote programs while Android apps (forked from zygote) remain
debuggable.

Bug: 23050463

(cherry picked from commit 7a09b8322cab26d6e3da1362d3c74964ae66b5d4)

Change-Id: I2400ecc8aea7579c43300efccf288b69f70eef53

8 years agoAllow debugging only for apps forked from zygote
Sebastien Hertz [Mon, 10 Aug 2015 16:55:34 +0000 (18:55 +0200)]
Allow debugging only for apps forked from zygote

When starting the runtime from app_process, we only pass JDWP options
if starting zygote. It prevents from opening a JDWP connection in
non-zygote programs while Android apps (forked from zygote) remain
debuggable.

Bug: 23050463

(cherry picked from commit 7a09b8322cab26d6e3da1362d3c74964ae66b5d4)

Change-Id: Ib5b6d3bc4d45389993c3c54226df5a7b72479d19

8 years agoam e7489fde: docs: Updating the permissions docs for Preview 3.
Andrew Solovay [Fri, 14 Aug 2015 17:29:03 +0000 (17:29 +0000)]
am e7489fde: docs: Updating the permissions docs for Preview 3.

* commit 'e7489fde9ff1529cc0c7a984046918a47b97b40c':
  docs: Updating the permissions docs for Preview 3.

8 years agoam d381eb95: Merge "Adding link to location API video." into mnc-preview-docs
Eric Gilmore [Fri, 14 Aug 2015 17:28:54 +0000 (17:28 +0000)]
am d381eb95: Merge "Adding link to location API video." into mnc-preview-docs

* commit 'd381eb9587717c64aa34471e1e87b5cd65d43292':
  Adding link to location API video.

8 years agoam 72c1f222: Merge "docs: studio 1.3.1 revision updates" into mnc-preview-docs
Rich Sloager [Fri, 14 Aug 2015 17:28:49 +0000 (17:28 +0000)]
am 72c1f222: Merge "docs: studio 1.3.1 revision updates" into mnc-preview-docs

* commit '72c1f222a172ef314d7fadb715c327ce781c2751':
  docs: studio 1.3.1 revision updates

8 years agoam 4f66c1da: Merge "docs: studio 1.3.1 download updates" into mnc-preview-docs
Rich Sloager [Fri, 14 Aug 2015 17:28:45 +0000 (17:28 +0000)]
am 4f66c1da: Merge "docs: studio 1.3.1 download updates" into mnc-preview-docs

* commit '4f66c1da04e2b6266f9ab652c757aa7f00e78c08':
  docs: studio 1.3.1 download updates

8 years agoam caec50ec: docs: changed version 5 to 3 for Billing API
Cheryl Potter [Fri, 14 Aug 2015 17:28:38 +0000 (17:28 +0000)]
am caec50ec: docs: changed version 5 to 3 for Billing API

* commit 'caec50ec4916adb3f8aa4ab579e29d6b6308f17d':
  docs: changed version 5 to 3 for Billing API

8 years agoam 862f0f03: doc: Updated Auto quality guideline for media playback (AU-MT). ...
Quddus Chong [Fri, 14 Aug 2015 17:28:27 +0000 (17:28 +0000)]
am 862f0f03: doc: Updated Auto quality guideline for media playback (AU-MT).      The update reflects new guidance that media apps do      not autoplay on startup of Android Auto or without      user initiated action to select the app or app media. bugs: 22932742

* commit '862f0f030ea229ad226253759b6b758f4f89ddf5':
  doc: Updated Auto quality guideline for media playback (AU-MT).      The update reflects new guidance that media apps do      not autoplay on startup of Android Auto or without      user initiated action to select the app or app media. bugs: 22932742

8 years agoam c5b58011: Merge "docs: gradle plugin revision update" into mnc-preview-docs
Rich Sloager [Fri, 14 Aug 2015 17:28:04 +0000 (17:28 +0000)]
am c5b58011: Merge "docs: gradle plugin revision update" into mnc-preview-docs

* commit 'c5b580116944320b47bbda5d302a5ed2e7a06088':
  docs: gradle plugin revision update

8 years agoam 5fd0eff1: docs: August 2015 Android Dashboard update
Joe Fernandez [Fri, 14 Aug 2015 17:27:57 +0000 (17:27 +0000)]
am 5fd0eff1: docs: August 2015 Android Dashboard update

* commit '5fd0eff1996ec5a3558dddb6dfa9f3467e28cd69':
  docs: August 2015 Android Dashboard update

8 years agoam 378a3a89: Merge "docs: studio 1.3 annotation-update" into mnc-preview-docs
Rich Sloager [Fri, 14 Aug 2015 17:27:51 +0000 (17:27 +0000)]
am 378a3a89: Merge "docs: studio 1.3 annotation-update" into mnc-preview-docs

* commit '378a3a8932cfc1140962bcb36a1dd057218c9e4d':
  docs: studio 1.3 annotation-update

8 years agoam 6c00399c: docs: studio 1.3 private resources
Rich Slogar [Fri, 14 Aug 2015 17:27:43 +0000 (17:27 +0000)]
am 6c00399c: docs: studio 1.3 private resources

* commit '6c00399c89bf4953ef36872e6fa237afff7a6491':
  docs: studio 1.3 private resources

8 years agoam e5fe2468: docs: studio 1.3 allocation tracker
Rich Slogar [Fri, 14 Aug 2015 17:27:37 +0000 (17:27 +0000)]
am e5fe2468: docs: studio 1.3 allocation tracker

* commit 'e5fe2468e4673c086aab463bb281a8fa09b353ed':
  docs: studio 1.3 allocation tracker

8 years agoam 16c5726e: docs: studio 1.3 developer services
Rich Slogar [Fri, 14 Aug 2015 17:27:33 +0000 (17:27 +0000)]
am 16c5726e: docs: studio 1.3 developer services

* commit '16c5726e7c237f27e135a5a5dfcd484bc28e0bef':
  docs: studio 1.3 developer services

8 years agoam b90583ac: Merge "docs: create-project-link in studio overview" into mnc-preview...
Rich Sloager [Fri, 14 Aug 2015 17:27:28 +0000 (17:27 +0000)]
am b90583ac: Merge "docs: create-project-link in studio overview" into mnc-preview-docs

* commit 'b90583acc7dcf83fa7755b5aaef36f08e8e7d5b9':
  docs: create-project-link in studio overview

8 years agoam c87ca50a: Merge "docs: studio 1.3 downloads" into mnc-preview-docs
Rich Sloager [Fri, 14 Aug 2015 17:27:24 +0000 (17:27 +0000)]
am c87ca50a: Merge "docs: studio 1.3 downloads" into mnc-preview-docs

* commit 'c87ca50a623e0ae7712708f5be50977dc8652568':
  docs: studio 1.3 downloads

8 years agoam f0cd0441: Merge "docs: studio 1.3 manifest merger update" into mnc-preview-docs
Rich Sloager [Fri, 14 Aug 2015 17:27:15 +0000 (17:27 +0000)]
am f0cd0441: Merge "docs: studio 1.3 manifest merger update" into mnc-preview-docs

* commit 'f0cd0441cebf2bdbaa0ec304cb5dd959b7702b4c':
  docs: studio 1.3 manifest merger update

8 years agoam 51c02f6a: Merge "docs: studio 1.3 revisions - android plugin for gradle" into...
Rich Sloager [Fri, 14 Aug 2015 17:27:11 +0000 (17:27 +0000)]
am 51c02f6a: Merge "docs: studio 1.3 revisions - android plugin for gradle" into mnc-preview-docs

* commit '51c02f6a10bb2653d7f5961807a2870fb5dd3a47':
  docs: studio 1.3 revisions - android plugin for gradle

8 years agoam 4c5b6cc4: Merge "docs: studio 1.3 live templates" into mnc-preview-docs
Rich Sloager [Fri, 14 Aug 2015 17:27:07 +0000 (17:27 +0000)]
am 4c5b6cc4: Merge "docs: studio 1.3 live templates" into mnc-preview-docs

* commit '4c5b6cc42e4b61a4176007a04906ad4a19d0623b':
  docs: studio 1.3 live templates

8 years agoam b8987585: Merge "docs: studio 1.3 revisions - studio" into mnc-preview-docs
Rich Sloager [Fri, 14 Aug 2015 17:27:02 +0000 (17:27 +0000)]
am b8987585: Merge "docs: studio 1.3 revisions - studio" into mnc-preview-docs

* commit 'b8987585ea1f677d61073d63a7b33e6d9cd75ebb':
  docs: studio 1.3 revisions - studio

8 years agoam 322de02a: Merge "docs: studio 1.3 hprof viewer" into mnc-preview-docs
Rich Sloager [Fri, 14 Aug 2015 17:26:58 +0000 (17:26 +0000)]
am 322de02a: Merge "docs: studio 1.3 hprof viewer" into mnc-preview-docs

* commit '322de02a10edadde014b9c31365c9f43dcbd60df':
  docs: studio 1.3 hprof viewer

8 years agoam 47c88fca: Merge "docs: studio 1.3 separate test folder" into mnc-preview-docs
Rich Sloager [Fri, 14 Aug 2015 17:26:51 +0000 (17:26 +0000)]
am 47c88fca: Merge "docs: studio 1.3 separate test folder" into mnc-preview-docs

* commit '47c88fca7df16077acd2902a29d26dd5e2b513c4':
  docs: studio 1.3 separate test folder

8 years agoam 29dfe902: Merge "docs: studio 1.3 fingerprint support" into mnc-preview-docs
Rich Sloager [Fri, 14 Aug 2015 17:26:46 +0000 (17:26 +0000)]
am 29dfe902: Merge "docs: studio 1.3 fingerprint support" into mnc-preview-docs

* commit '29dfe902de22655770f1bc001aa451b74a3195a3':
  docs: studio 1.3 fingerprint support

8 years agoam 054711b6: Merge "docs: studio 1.3 sdk manager updates" into mnc-preview-docs
Rich Sloager [Fri, 14 Aug 2015 17:26:42 +0000 (17:26 +0000)]
am 054711b6: Merge "docs: studio 1.3 sdk manager updates" into mnc-preview-docs

* commit '054711b6041fb352e5716e307341bf35858a1546':
  docs: studio 1.3 sdk manager updates

8 years agoam 1f6a5f89: docs: design support library 22.2.1 revisions
Rich Slogar [Fri, 14 Aug 2015 17:26:37 +0000 (17:26 +0000)]
am 1f6a5f89: docs: design support library 22.2.1 revisions

* commit '1f6a5f89a55a6825c68693f8ffa15426a5f123d3':
  docs: design support library 22.2.1 revisions

8 years agoam 803c5738: Merge "docs: Updated the list of auto partners, added links" into mnc...
Andrew Solovay [Fri, 14 Aug 2015 17:26:29 +0000 (17:26 +0000)]
am 803c5738: Merge "docs: Updated the list of auto partners, added links" into mnc-preview-docs

* commit '803c573871932a0f2a5e2fde22b49e78e2829069':
  docs: Updated the list of auto partners, added links

8 years agodocs: changed red to yellow in code snippet
Cheryl Potter [Wed, 12 Aug 2015 23:59:46 +0000 (16:59 -0700)]
docs: changed red to yellow in code snippet

/b22530949

Change-Id: I595df3d8abbfdfc8c1a91a4b23adf416e99bb52e

8 years agodocs: Updating the permissions docs for Preview 3.
Andrew Solovay [Wed, 22 Jul 2015 21:43:49 +0000 (14:43 -0700)]
docs: Updating the permissions docs for Preview 3.

Added section describing the new support library methods. Also
updating lists of normal and dangerous permissions based on current
AndroidManifest in mnc-dev, as well as any other changes brought to my
attention.

See first comment for doc stage location.

Change-Id: I4eaf45d98846e2bf9456f5896da4ec3079f4ba18

8 years agoMerge "Adding link to location API video." into mnc-preview-docs
Eric Gilmore [Mon, 10 Aug 2015 23:34:33 +0000 (23:34 +0000)]
Merge "Adding link to location API video." into mnc-preview-docs

8 years agoMerge "docs: studio 1.3.1 revision updates" into mnc-preview-docs
Rich Sloager [Mon, 10 Aug 2015 21:30:29 +0000 (21:30 +0000)]
Merge "docs: studio 1.3.1 revision updates" into mnc-preview-docs

8 years agoMerge "docs: studio 1.3.1 download updates" into mnc-preview-docs
Rich Sloager [Mon, 10 Aug 2015 21:29:25 +0000 (21:29 +0000)]
Merge "docs: studio 1.3.1 download updates" into mnc-preview-docs

8 years agodocs: studio 1.3.1 download updates
Rich Slogar [Fri, 7 Aug 2015 19:29:26 +0000 (12:29 -0700)]
docs: studio 1.3.1 download updates

Change-Id: I4cf86df885cd20f2d933d5043a35176d00e50904

8 years agodocs: studio 1.3.1 revision updates
Rich Slogar [Wed, 5 Aug 2015 20:28:56 +0000 (13:28 -0700)]
docs: studio 1.3.1 revision updates

Change-Id: I788dae03d2dd7f66d6f202c51c32edfc1d0edd16

8 years agoAdding link to location API video.
Eric Gilmore [Fri, 7 Aug 2015 22:21:16 +0000 (15:21 -0700)]
Adding link to location API video.

Change-Id: I1c639fe9538589b691934de83c0d4ac36fad824d

8 years agodocs: changed version 5 to 3 for Billing API
Cheryl Potter [Thu, 6 Aug 2015 23:37:17 +0000 (16:37 -0700)]
docs: changed version 5 to 3 for Billing API

b/22870647

Change-Id: Iee9e8d4de05b7e0edd3d81233fd27739c93ceddf

8 years agodoc: Updated Auto quality guideline for media playback (AU-MT).
Quddus Chong [Wed, 5 Aug 2015 18:11:10 +0000 (11:11 -0700)]
doc: Updated Auto quality guideline for media playback (AU-MT).
     The update reflects new guidance that media apps do
     not autoplay on startup of Android Auto or without
     user initiated action to select the app or app media.
bugs: 22932742

Change-Id: I5dbe4b9ccb93d2d33a294838edcf31729b7f5206

8 years agoMerge "docs: gradle plugin revision update" into mnc-preview-docs
Rich Sloager [Tue, 4 Aug 2015 18:40:58 +0000 (18:40 +0000)]
Merge "docs: gradle plugin revision update" into mnc-preview-docs

8 years agodocs: August 2015 Android Dashboard update
Joe Fernandez [Mon, 3 Aug 2015 15:47:27 +0000 (08:47 -0700)]
docs: August 2015 Android Dashboard update

Change-Id: I3430c6928a6539a0cfecc595dbcc006eff434f4d

8 years agodocs: gradle plugin revision update
Rich Slogar [Fri, 31 Jul 2015 17:00:17 +0000 (10:00 -0700)]
docs: gradle plugin revision update

Change-Id: Ic02f2c773e75f532dcd797816578f2e234d09726

8 years agoMerge "docs: studio 1.3 annotation-update" into mnc-preview-docs
Rich Sloager [Thu, 30 Jul 2015 19:09:32 +0000 (19:09 +0000)]
Merge "docs: studio 1.3 annotation-update" into mnc-preview-docs