OSDN Git Service

android-x86/frameworks-base.git
10 years agoam 906eda45: Merge "docs: Fixed instructions on checking VM version." into klp-docs
Andrew Solovay [Tue, 24 Jun 2014 21:39:27 +0000 (21:39 +0000)]
am 906eda45: Merge "docs: Fixed instructions on checking VM version." into klp-docs

* commit '906eda45b27668e4c0a37b5ba3fbd530308883e6':
  docs: Fixed instructions on checking VM version.

10 years agoMerge "docs: Fixed instructions on checking VM version." into klp-docs
Andrew Solovay [Tue, 24 Jun 2014 21:35:31 +0000 (21:35 +0000)]
Merge "docs: Fixed instructions on checking VM version." into klp-docs

10 years agodocs: Fixed instructions on checking VM version.
Andrew Solovay [Tue, 24 Jun 2014 20:04:54 +0000 (13:04 -0700)]
docs: Fixed instructions on checking VM version.

Per IRogers@ , you check the VM version by calling
System.getProperty("java.vm.version") -- not, as previously
documented, "dalvik.vm.version" (Ian says there's no such property as
dalvik.vm.version.) BDC@ and/or AnwarG@, can you confirm?

Revised doc is staged to:

http://asolovay.mtv:9001/guide/practices/verifying-apps-art.html#GC_Migration

bug: 15836664
Change-Id: Ie5e2e058fa9ce033afd18a0f4079faa81bbf317e

10 years agoam bf66c17e: Merge "remove extraneous tag causing extra spacing between heading/text...
Dirk Dougherty [Sat, 21 Jun 2014 02:33:40 +0000 (02:33 +0000)]
am bf66c17e: Merge "remove extraneous tag causing extra spacing between heading/text." into klp-docs

* commit 'bf66c17e4ad64c8420d3d3b5e8d789af00479eab':
  remove extraneous tag causing extra spacing between heading/text.

10 years agoam 2d7b3ded: Merge "ExoPlayer developer guide" into klp-docs
Joe Fernandez [Fri, 20 Jun 2014 21:41:30 +0000 (21:41 +0000)]
am 2d7b3ded: Merge "ExoPlayer developer guide" into klp-docs

* commit '2d7b3dedd0ddccd5a44b7c289f5075ea1696c06c':
  ExoPlayer developer guide

10 years agoMerge "remove extraneous tag causing extra spacing between heading/text." into klp...
Dirk Dougherty [Sat, 21 Jun 2014 02:29:54 +0000 (02:29 +0000)]
Merge "remove extraneous tag causing extra spacing between heading/text." into klp-docs

10 years agoMerge "ExoPlayer developer guide" into klp-docs
Joe Fernandez [Fri, 20 Jun 2014 21:36:25 +0000 (21:36 +0000)]
Merge "ExoPlayer developer guide" into klp-docs

10 years agoExoPlayer developer guide
Joe Fernandez [Wed, 11 Jun 2014 06:45:58 +0000 (23:45 -0700)]
ExoPlayer developer guide

Change-Id: Icacaa0e68e602fc77946e10729b3649baaf4331b

10 years agoam c57b410c: Add a script to rename fonts for SDK. [DO NOT MERGE]
Deepanshu Gupta [Wed, 18 Jun 2014 00:10:34 +0000 (00:10 +0000)]
am c57b410c: Add a script to rename fonts for SDK. [DO NOT MERGE]

* commit 'c57b410c8ef41e269f82f3b42a8d22a15c08755b':
  Add a script to rename fonts for SDK. [DO NOT MERGE]

10 years agoam 4737af8b: docs: Added "Verifying for ART" to TOC.
Andrew Solovay [Fri, 13 Jun 2014 18:23:03 +0000 (18:23 +0000)]
am 4737af8b: docs: Added "Verifying for ART" to TOC.

* commit '4737af8b0aa77681270b6bc6478a946b71144e45':
  docs: Added "Verifying for ART" to TOC.

10 years agodocs: Added "Verifying for ART" to TOC.
Andrew Solovay [Thu, 12 Jun 2014 17:40:23 +0000 (10:40 -0700)]
docs: Added "Verifying for ART" to TOC.

Now that "Verifying App Behavior on the Android Runtime (ART)"
(guide/practices/verifying-apps-art.jd) is published, also adding it
to the "API Guides" TOC.

You can verify it at

http://asolovay.mtv:9001/guide/practices/index.html

(...it's the last element in the "Best Practices" submenu.)

Change-Id: If7b445616768d17193309dbd3075b2630652ac96

10 years agoAdd a script to rename fonts for SDK. [DO NOT MERGE]
Deepanshu Gupta [Fri, 16 May 2014 01:39:30 +0000 (18:39 -0700)]
Add a script to rename fonts for SDK. [DO NOT MERGE]

Create a script that will rename the PS name encoded in the font that is
to be shipped with the SDK.

This commit is a combination of 5 commits:
e0660d31c256e02e5f5e2967508a7205d1f62f86
7e149f02c4e4403101e7e0e88af36cd4ab6f3554
66d3314301a8983c7070a15ea68daacc7300b7f2
c6364fd90de1600526d3431ce0740b6b856e48f0
2d8c52dc4502b8407705d5b6efe628cb657b20b4

Change-Id: I675a98db39fea4525e3673656af1764eb7e5bb96

10 years agoam ded9c171: Merge "docs: New "Verifying App Behavior on the Android Runtime (ART...
Andrew Solovay [Thu, 12 Jun 2014 17:19:33 +0000 (17:19 +0000)]
am ded9c171: Merge "docs: New "Verifying App Behavior on the Android Runtime (ART)" guide." into klp-docs

* commit 'ded9c171ead51b358538a65d8b84946e05d8db2b':
  docs: New "Verifying App Behavior on the Android Runtime (ART)" guide.

10 years agoremove extraneous tag causing extra spacing between heading/text.
Dirk Dougherty [Thu, 12 Jun 2014 04:03:33 +0000 (21:03 -0700)]
remove extraneous tag causing extra spacing between heading/text.

Change-Id: I008f48f8274ed45d38dcef05fa9c47b935f23910

10 years agoam bdcd6fc7: Doc change: Update monetization docs.
Dirk Dougherty [Thu, 12 Jun 2014 02:37:27 +0000 (02:37 +0000)]
am bdcd6fc7: Doc change: Update monetization docs.

* commit 'bdcd6fc777e678fb3d0d9b7f000b43d703fea9cd':
  Doc change: Update monetization docs.

10 years agoDoc change: Update monetization docs.
Dirk Dougherty [Tue, 10 Jun 2014 21:35:17 +0000 (14:35 -0700)]
Doc change: Update monetization docs.

Change-Id: Ic34c1a08f8b7bcd271ad53f31c62d0bab82fc053

10 years agoMerge "docs: New "Verifying App Behavior on the Android Runtime (ART)" guide." into...
Andrew Solovay [Thu, 12 Jun 2014 17:16:37 +0000 (17:16 +0000)]
Merge "docs: New "Verifying App Behavior on the Android Runtime (ART)" guide." into klp-docs

10 years agoam 80e84e2d: am f3cecfa2: am 55d525b2: am 716cc7dc: Add documentation for AndroidKeyStore
Robert Ly [Tue, 10 Jun 2014 02:44:08 +0000 (02:44 +0000)]
am 80e84e2d: am f3cecfa2: am 55d525b2: am 716cc7dc: Add documentation for AndroidKeyStore

* commit '80e84e2db92ba190c6c517dd4c71cd12c0adb249':
  Add documentation for AndroidKeyStore

10 years agoam f3cecfa2: am 55d525b2: am 716cc7dc: Add documentation for AndroidKeyStore
Robert Ly [Tue, 10 Jun 2014 02:39:28 +0000 (02:39 +0000)]
am f3cecfa2: am 55d525b2: am 716cc7dc: Add documentation for AndroidKeyStore

* commit 'f3cecfa2185ef5622992b21da8204b8b6590ef2d':
  Add documentation for AndroidKeyStore

10 years agoam 55d525b2: am 716cc7dc: Add documentation for AndroidKeyStore
Robert Ly [Tue, 10 Jun 2014 02:36:10 +0000 (02:36 +0000)]
am 55d525b2: am 716cc7dc: Add documentation for AndroidKeyStore

* commit '55d525b26b716351625798675afe69c6cf43cf5a':
  Add documentation for AndroidKeyStore

10 years agoam 716cc7dc: Add documentation for AndroidKeyStore
Robert Ly [Tue, 10 Jun 2014 02:32:29 +0000 (02:32 +0000)]
am 716cc7dc: Add documentation for AndroidKeyStore

* commit '716cc7dcac1bb9279326ab92a78a246b3a70de4e':
  Add documentation for AndroidKeyStore

10 years agoam 20c5ce50: Handle provisioning APN by turning off/on radio.
Amit Mahajan [Mon, 9 Jun 2014 19:46:01 +0000 (19:46 +0000)]
am 20c5ce50: Handle provisioning APN by turning off/on radio.

* commit '20c5ce50c456742bf912ebb915be45bfdb51487d':
  Handle provisioning APN by turning off/on radio.

10 years agoHandle provisioning APN by turning off/on radio.
Amit Mahajan [Fri, 6 Jun 2014 23:53:34 +0000 (16:53 -0700)]
Handle provisioning APN by turning off/on radio.

The change is specific to AT&T as they want no signaling from device during provisioning.
I've tested following cases:
- expired AT&T SIM to make sure provisioning flow works as expected.
- airplane mode on/off with both active and expired AT&T SIM.
- wifi <-> mobile transitions work okay.
- LTE with Verizon SIM (basic sanity).

bug: 13190133

Change-Id: I215963174ae6000ae71d1dda693f95413f3d6e81

10 years agodocs: New "Verifying App Behavior on the Android Runtime (ART)" guide.
Andrew Solovay [Tue, 20 May 2014 22:50:13 +0000 (15:50 -0700)]
docs: New "Verifying App Behavior on the Android Runtime (ART)" guide.

Contains information for developers to make sure their apps work properly
with the ART runtime.

This doc is staged to:

http://asolovay.mtv:9001/guide/practices/verifying-apps-art.html

This is intended to be a companion to the newly-expanded "Introducing ART"
doc on source.android.com (http://ag/469776), which has general information
about ART's new features.

Change-Id: I77c6e552cfedb13dee1d256fec15926fffcbbbb3

10 years agoam e115755d: Merge "remove erroneous file" into klp-docs
Robert Ly [Sun, 8 Jun 2014 08:35:23 +0000 (08:35 +0000)]
am e115755d: Merge "remove erroneous file" into klp-docs

* commit 'e115755d0fbd067a1996eb448cda58a14cce22d1':
  remove erroneous file

10 years agoMerge "remove erroneous file" into klp-docs
Robert Ly [Sun, 8 Jun 2014 05:39:55 +0000 (05:39 +0000)]
Merge "remove erroneous file" into klp-docs

10 years agoremove erroneous file
Robert Ly [Sun, 8 Jun 2014 05:38:18 +0000 (22:38 -0700)]
remove erroneous file

Change-Id: Idb46777d80ee1b6286769fdceba7639877ab2388

10 years agoam aabfcb78: Merge "Adding links to the Gradle docs. Both of these files ask you...
Dave Holmes [Wed, 4 Jun 2014 23:38:34 +0000 (23:38 +0000)]
am aabfcb78: Merge "Adding links to the Gradle docs. Both of these files ask you to change the contents of your gradle file, but neither links to reference information on gradle. Because this is still pretty new information, I\'d like to include a link to the Building

* commit 'aabfcb78cf29e3d670831c770b9d757eb79487e4':
  Adding links to the Gradle docs. Both of these files ask you to change the contents of your gradle file, but neither links to reference information on gradle. Because this is still pretty new information, I'd like to include a link to the Building with Gradle documentation.

10 years agoMerge "Adding links to the Gradle docs. Both of these files ask you to change the...
Dave Holmes [Wed, 4 Jun 2014 23:35:50 +0000 (23:35 +0000)]
Merge "Adding links to the Gradle docs. Both of these files ask you to change the contents of your gradle file, but neither links to reference information on gradle. Because this is still pretty new information, I'd like to include a link to the Building with Gradle documentation." into klp-docs

10 years agoam 5cde33a6: am dcfba78f: am ed5ab0f0: am 022d8a9f: am bad112f2: am c8235b8e: am...
Deepanshu Gupta [Wed, 4 Jun 2014 20:45:02 +0000 (20:45 +0000)]
am 5cde33a6: am dcfba78f: am ed5ab0f0: am 022d8a9f: am bad112f2: am c8235b8e: am ffcad247: am 904b89c5: am 295184bc: am 8782a120: resolved conflicts for merge of 61fb5784 to jb-mr1-dev

* commit '5cde33a6ffd6a3be87f6622e67c3d83fb61519cb':
  Distinguish between menus in ActionBar and popup. [DO NOT MERGE]

10 years agoam dcfba78f: am ed5ab0f0: am 022d8a9f: am bad112f2: am c8235b8e: am ffcad247: am...
Deepanshu Gupta [Wed, 4 Jun 2014 20:41:47 +0000 (20:41 +0000)]
am dcfba78f: am ed5ab0f0: am 022d8a9f: am bad112f2: am c8235b8e: am ffcad247: am 904b89c5: am 295184bc: am 8782a120: resolved conflicts for merge of 61fb5784 to jb-mr1-dev

* commit 'dcfba78fbb4dad6792113383b2d32eff7f2c1f88':
  Distinguish between menus in ActionBar and popup. [DO NOT MERGE]

10 years agoam ed5ab0f0: am 022d8a9f: am bad112f2: am c8235b8e: am ffcad247: am 904b89c5: am...
Deepanshu Gupta [Wed, 4 Jun 2014 20:38:25 +0000 (20:38 +0000)]
am ed5ab0f0: am 022d8a9f: am bad112f2: am c8235b8e: am ffcad247: am 904b89c5: am 295184bc: am 8782a120: resolved conflicts for merge of 61fb5784 to jb-mr1-dev

* commit 'ed5ab0f01eac6686165f67fe0e9dec3bb48bbb4b':
  Distinguish between menus in ActionBar and popup. [DO NOT MERGE]

10 years agoam 022d8a9f: am bad112f2: am c8235b8e: am ffcad247: am 904b89c5: am 295184bc: am...
Deepanshu Gupta [Wed, 4 Jun 2014 20:34:14 +0000 (20:34 +0000)]
am 022d8a9f: am bad112f2: am c8235b8e: am ffcad247: am 904b89c5: am 295184bc: am 8782a120: resolved conflicts for merge of 61fb5784 to jb-mr1-dev

* commit '022d8a9f4400dc7ec2926b133fc7151d8a5c24a3':
  Distinguish between menus in ActionBar and popup. [DO NOT MERGE]

10 years agoam bad112f2: am c8235b8e: am ffcad247: am 904b89c5: am 295184bc: am 8782a120: resolve...
Deepanshu Gupta [Wed, 4 Jun 2014 20:30:05 +0000 (20:30 +0000)]
am bad112f2: am c8235b8e: am ffcad247: am 904b89c5: am 295184bc: am 8782a120: resolved conflicts for merge of 61fb5784 to jb-mr1-dev

* commit 'bad112f23f09f8839b4b7294439b0fe725cc2034':
  Distinguish between menus in ActionBar and popup. [DO NOT MERGE]

10 years agoam c8235b8e: am ffcad247: am 904b89c5: am 295184bc: am 8782a120: resolved conflicts...
Deepanshu Gupta [Wed, 4 Jun 2014 20:27:49 +0000 (20:27 +0000)]
am c8235b8e: am ffcad247: am 904b89c5: am 295184bc: am 8782a120: resolved conflicts for merge of 61fb5784 to jb-mr1-dev

* commit 'c8235b8e7446c849df10ff2f897d2a3743b4934d':
  Distinguish between menus in ActionBar and popup. [DO NOT MERGE]

10 years agoam 0ed9d498: am 328b1f92: (-s ours) am 5d3e3851: am af3f96e4: am e87c63e0: (-s ours...
Deepanshu Gupta [Wed, 4 Jun 2014 20:26:07 +0000 (20:26 +0000)]
am 0ed9d498: am 328b1f92: (-s ours) am 5d3e3851: am af3f96e4: am e87c63e0: (-s ours) am d2dff39b: am b1ca2a0c: am f52fcc70: Merge "Distinguish between menus in ActionBar and popup. [DO NOT MERGE]" into jb-mr1.1-dev

* commit '0ed9d498b740273fdbcdf51f55648c23df29accc':
  Distinguish between menus in ActionBar and popup. [DO NOT MERGE]

10 years agoam a9e82914: Merge branch \'klp-dev\' of https://googleplex-android.googlesource...
Deepanshu Gupta [Wed, 4 Jun 2014 20:25:57 +0000 (20:25 +0000)]
am a9e82914: Merge branch \'klp-dev\' of https://googleplex-android.googlesource.com/_direct/platform/frameworks/base into klp-dev

* commit 'a9e8291409a916186cd96b8bc557a6ac83d6b1ae':
  Distinguish between menus in ActionBar and popup. [DO NOT MERGE]

10 years agoam d49f9b25: am 2983ee55: (-s ours) am 12b657d7: am dade24b4: Merge "Distinguish...
Deepanshu Gupta [Wed, 4 Jun 2014 20:25:54 +0000 (20:25 +0000)]
am d49f9b25: am 2983ee55: (-s ours) am 12b657d7: am dade24b4: Merge "Distinguish between menus in ActionBar and popup. [DO NOT MERGE]" into jb-mr2-dev

* commit 'd49f9b25310ac63310b0e5c7aeedca1d9e6ccda0':
  Distinguish between menus in ActionBar and popup. [DO NOT MERGE]

10 years agoam ffcad247: am 904b89c5: am 295184bc: am 8782a120: resolved conflicts for merge...
Deepanshu Gupta [Wed, 4 Jun 2014 20:21:00 +0000 (20:21 +0000)]
am ffcad247: am 904b89c5: am 295184bc: am 8782a120: resolved conflicts for merge of 61fb5784 to jb-mr1-dev

* commit 'ffcad247d0401fb529441ecc65437226c2845461':
  Distinguish between menus in ActionBar and popup. [DO NOT MERGE]

10 years agoam 328b1f92: (-s ours) am 5d3e3851: am af3f96e4: am e87c63e0: (-s ours) am d2dff39b...
Deepanshu Gupta [Wed, 4 Jun 2014 20:20:52 +0000 (20:20 +0000)]
am 328b1f92: (-s ours) am 5d3e3851: am af3f96e4: am e87c63e0: (-s ours) am d2dff39b: am b1ca2a0c: am f52fcc70: Merge "Distinguish between menus in ActionBar and popup. [DO NOT MERGE]" into jb-mr1.1-dev

* commit '328b1f92787bb4d793398ba6d8aa9b2025c62ca1':
  Distinguish between menus in ActionBar and popup. [DO NOT MERGE]

10 years agoMerge branch 'klp-dev' of https://googleplex-android.googlesource.com/_direct/platfor...
Deepanshu Gupta [Wed, 4 Jun 2014 20:20:51 +0000 (20:20 +0000)]
Merge branch 'klp-dev' of https://googleplex-android.googlesource.com/_direct/platform/frameworks/base into klp-dev

10 years agoam 2983ee55: (-s ours) am 12b657d7: am dade24b4: Merge "Distinguish between menus...
Deepanshu Gupta [Wed, 4 Jun 2014 20:20:27 +0000 (20:20 +0000)]
am 2983ee55: (-s ours) am 12b657d7: am dade24b4: Merge "Distinguish between menus in ActionBar and popup. [DO NOT MERGE]" into jb-mr2-dev

* commit '2983ee55a6d578b15b4862c9c8523bf00f7d83d5':
  Distinguish between menus in ActionBar and popup. [DO NOT MERGE]

10 years agoMerge "Distinguish between menus in ActionBar and popup. [DO NOT MERGE]" into klp-dev
Deepanshu Gupta [Wed, 4 Jun 2014 20:20:26 +0000 (20:20 +0000)]
Merge "Distinguish between menus in ActionBar and popup. [DO NOT MERGE]" into klp-dev

10 years agoam 904b89c5: am 295184bc: am 8782a120: resolved conflicts for merge of 61fb5784 to...
Deepanshu Gupta [Wed, 4 Jun 2014 20:17:40 +0000 (20:17 +0000)]
am 904b89c5: am 295184bc: am 8782a120: resolved conflicts for merge of 61fb5784 to jb-mr1-dev

* commit '904b89c58465b0d0822478be514572ec752df3e8':
  Distinguish between menus in ActionBar and popup. [DO NOT MERGE]

10 years agoam 5d3e3851: am af3f96e4: am e87c63e0: (-s ours) am d2dff39b: am b1ca2a0c: am f52fcc7...
Deepanshu Gupta [Wed, 4 Jun 2014 20:15:37 +0000 (20:15 +0000)]
am 5d3e3851: am af3f96e4: am e87c63e0: (-s ours) am d2dff39b: am b1ca2a0c: am f52fcc70: Merge "Distinguish between menus in ActionBar and popup. [DO NOT MERGE]" into jb-mr1.1-dev

* commit '5d3e3851bbe1ab0b30e593b371e98f02f5ed2f5d':
  Distinguish between menus in ActionBar and popup. [DO NOT MERGE]

10 years agoam 12b657d7: am dade24b4: Merge "Distinguish between menus in ActionBar and popup...
Deepanshu Gupta [Wed, 4 Jun 2014 20:15:33 +0000 (20:15 +0000)]
am 12b657d7: am dade24b4: Merge "Distinguish between menus in ActionBar and popup. [DO NOT MERGE]" into jb-mr2-dev

* commit '12b657d74961ba5a6175162b7548cce4e77c9bbc':
  Distinguish between menus in ActionBar and popup. [DO NOT MERGE]

10 years agoam 295184bc: am 8782a120: resolved conflicts for merge of 61fb5784 to jb-mr1-dev
Deepanshu Gupta [Wed, 4 Jun 2014 20:14:52 +0000 (20:14 +0000)]
am 295184bc: am 8782a120: resolved conflicts for merge of 61fb5784 to jb-mr1-dev

* commit '295184bc71a32a4e9418d34b2adeb0cef4b39781':
  Distinguish between menus in ActionBar and popup. [DO NOT MERGE]

10 years agoam af3f96e4: am e87c63e0: (-s ours) am d2dff39b: am b1ca2a0c: am f52fcc70: Merge...
Deepanshu Gupta [Wed, 4 Jun 2014 20:11:23 +0000 (20:11 +0000)]
am af3f96e4: am e87c63e0: (-s ours) am d2dff39b: am b1ca2a0c: am f52fcc70: Merge "Distinguish between menus in ActionBar and popup. [DO NOT MERGE]" into jb-mr1.1-dev

* commit 'af3f96e4349f63f862de004853ba8e10e5ee51ae':
  Distinguish between menus in ActionBar and popup. [DO NOT MERGE]

10 years agoam dade24b4: Merge "Distinguish between menus in ActionBar and popup. [DO NOT MERGE...
Deepanshu Gupta [Wed, 4 Jun 2014 20:11:19 +0000 (20:11 +0000)]
am dade24b4: Merge "Distinguish between menus in ActionBar and popup. [DO NOT MERGE]" into jb-mr2-dev

* commit 'dade24b491c82ff0b96d025c908e7eaf1bab99ba':
  Distinguish between menus in ActionBar and popup. [DO NOT MERGE]

10 years agoam 8782a120: resolved conflicts for merge of 61fb5784 to jb-mr1-dev
Deepanshu Gupta [Wed, 4 Jun 2014 20:10:55 +0000 (20:10 +0000)]
am 8782a120: resolved conflicts for merge of 61fb5784 to jb-mr1-dev

* commit '8782a12005e90bbd49be579fb8ede3a42a007380':
  Distinguish between menus in ActionBar and popup. [DO NOT MERGE]

10 years agoam e87c63e0: (-s ours) am d2dff39b: am b1ca2a0c: am f52fcc70: Merge "Distinguish...
Deepanshu Gupta [Wed, 4 Jun 2014 20:08:29 +0000 (20:08 +0000)]
am e87c63e0: (-s ours) am d2dff39b: am b1ca2a0c: am f52fcc70: Merge "Distinguish between menus in ActionBar and popup. [DO NOT MERGE]" into jb-mr1.1-dev

* commit 'e87c63e0e41cf34ef4b1ea1b06bf6a94c1f229c6':
  Distinguish between menus in ActionBar and popup. [DO NOT MERGE]

10 years agoMerge "Distinguish between menus in ActionBar and popup. [DO NOT MERGE]" into jb...
Deepanshu Gupta [Wed, 4 Jun 2014 20:07:43 +0000 (20:07 +0000)]
Merge "Distinguish between menus in ActionBar and popup. [DO NOT MERGE]" into jb-mr2-dev

10 years agoam d2dff39b: am b1ca2a0c: am f52fcc70: Merge "Distinguish between menus in ActionBar...
Deepanshu Gupta [Wed, 4 Jun 2014 19:43:09 +0000 (19:43 +0000)]
am d2dff39b: am b1ca2a0c: am f52fcc70: Merge "Distinguish between menus in ActionBar and popup. [DO NOT MERGE]" into jb-mr1.1-dev

* commit 'd2dff39b587bd073fcf5c97753c8a29e16f4ef57':
  Distinguish between menus in ActionBar and popup. [DO NOT MERGE]

10 years agoresolved conflicts for merge of 61fb5784 to jb-mr1-dev
Deepanshu Gupta [Wed, 4 Jun 2014 19:43:01 +0000 (12:43 -0700)]
resolved conflicts for merge of 61fb5784 to jb-mr1-dev

Change-Id: I079d5db0d69fd1972e6754cdd1829dfd1645202d

10 years agoam b1ca2a0c: am f52fcc70: Merge "Distinguish between menus in ActionBar and popup...
Deepanshu Gupta [Wed, 4 Jun 2014 19:38:01 +0000 (19:38 +0000)]
am b1ca2a0c: am f52fcc70: Merge "Distinguish between menus in ActionBar and popup. [DO NOT MERGE]" into jb-mr1.1-dev

* commit 'b1ca2a0c7fda713f5f2ebe928706dd813d87cabb':
  Distinguish between menus in ActionBar and popup. [DO NOT MERGE]

10 years agoam f52fcc70: Merge "Distinguish between menus in ActionBar and popup. [DO NOT MERGE...
Deepanshu Gupta [Wed, 4 Jun 2014 19:34:15 +0000 (19:34 +0000)]
am f52fcc70: Merge "Distinguish between menus in ActionBar and popup. [DO NOT MERGE]" into jb-mr1.1-dev

* commit 'f52fcc70541224c2d926f59461bde5a8bd6545a7':
  Distinguish between menus in ActionBar and popup. [DO NOT MERGE]

10 years agoam 3ff08eb6: Distinguish between menus in ActionBar and popup. [DO NOT MERGE]
Deepanshu Gupta [Wed, 4 Jun 2014 19:32:05 +0000 (19:32 +0000)]
am 3ff08eb6: Distinguish between menus in ActionBar and popup. [DO NOT MERGE]

* commit '3ff08eb6bf68868d4f4e872fbbf1ecaf521934a9':
  Distinguish between menus in ActionBar and popup. [DO NOT MERGE]

10 years agoMerge "Distinguish between menus in ActionBar and popup. [DO NOT MERGE]" into jb...
Deepanshu Gupta [Wed, 4 Jun 2014 19:31:31 +0000 (19:31 +0000)]
Merge "Distinguish between menus in ActionBar and popup. [DO NOT MERGE]" into jb-mr1.1-dev

10 years agoam 2e10cc90: Merge "docs: Fixed error in code sample." into klp-docs
Andrew Solovay [Wed, 4 Jun 2014 17:35:45 +0000 (17:35 +0000)]
am 2e10cc90: Merge "docs: Fixed error in code sample." into klp-docs

* commit '2e10cc9021b1cd3d90c55038191872f29a02c3f2':
  docs: Fixed error in code sample.

10 years agoMerge "docs: Fixed error in code sample." into klp-docs
Andrew Solovay [Wed, 4 Jun 2014 17:32:46 +0000 (17:32 +0000)]
Merge "docs: Fixed error in code sample." into klp-docs

10 years agoam 6e949d9c: Merge "docs: Added release notes for SDK Tools 22.6.4" into klp-docs
Ricardo Cervera [Wed, 4 Jun 2014 17:24:35 +0000 (17:24 +0000)]
am 6e949d9c: Merge "docs: Added release notes for SDK Tools 22.6.4" into klp-docs

* commit '6e949d9ca5044e5c2243fe8366d9a7ac55d57803':
  docs: Added release notes for SDK Tools 22.6.4

10 years agoMerge "docs: Added release notes for SDK Tools 22.6.4" into klp-docs
Ricardo Cervera [Wed, 4 Jun 2014 17:21:38 +0000 (17:21 +0000)]
Merge "docs: Added release notes for SDK Tools 22.6.4" into klp-docs

10 years agoam bb33ff04: update device dashboard for June
Robert Ly [Wed, 4 Jun 2014 16:50:26 +0000 (16:50 +0000)]
am bb33ff04: update device dashboard for June

* commit 'bb33ff04b7d1f7f554331426bd9940edbbfd395d':
  update device dashboard for June

10 years agoupdate device dashboard for June
Robert Ly [Wed, 4 Jun 2014 15:34:40 +0000 (08:34 -0700)]
update device dashboard for June

Change-Id: Ibc02e80f4d4fa721039229f63dee0af878c21765

10 years agoam c659e746: Merge "Doc update: new Volley class" into klp-docs
Katie McCormick [Wed, 4 Jun 2014 12:26:44 +0000 (12:26 +0000)]
am c659e746: Merge "Doc update: new Volley class" into klp-docs

* commit 'c659e7465df342920f3906cbc0b024f610bf65bd':
  Doc update: new Volley class

10 years agoMerge "Doc update: new Volley class" into klp-docs
Katie McCormick [Wed, 4 Jun 2014 12:01:38 +0000 (12:01 +0000)]
Merge "Doc update: new Volley class" into klp-docs

10 years agoAdding links to the Gradle docs. Both of these files ask you to change the contents...
Dave Holmes [Wed, 4 Jun 2014 07:02:25 +0000 (17:02 +1000)]
Adding links to the Gradle docs. Both of these files ask you to change the contents of your gradle file, but neither links to reference information on gradle. Because this is still pretty new information, I'd like to include a link to the Building with Gradle documentation.

https://b.corp.google.com/issue?id=14045807

Change-Id: I48e6a50f12c635cdf3dd597e4247d072bda14cc3

10 years agoam 00aae279: Merge "Fixed typos. "describe"-->"describes"; "allow"-->"allows"" into...
David Friedman [Wed, 4 Jun 2014 03:05:26 +0000 (03:05 +0000)]
am 00aae279: Merge "Fixed typos. "describe"-->"describes"; "allow"-->"allows"" into klp-docs

* commit '00aae2793d37ed098a80bc0a98e8008b36178714':
  Fixed typos. "describe"-->"describes"; "allow"-->"allows"

10 years agoMerge "Fixed typos. "describe"-->"describes"; "allow"-->"allows"" into klp-docs
David Friedman [Wed, 4 Jun 2014 03:01:52 +0000 (03:01 +0000)]
Merge "Fixed typos. "describe"-->"describes"; "allow"-->"allows"" into klp-docs

10 years agodocs: Fixed error in code sample.
Andrew Solovay [Tue, 3 Jun 2014 23:07:59 +0000 (16:07 -0700)]
docs: Fixed error in code sample.

The code sample didn't match the sample project. Also rewrote one
paragraph to clarify that you *create* a particular XML file (external
bug report said the file was missing from the sample project).

Also fixed formatting in a different line sample (overlong line
forced code box to scroll).

Doc is staged to:
http://asolovay.mtv:9098/training/contacts-provider/retrieve-names.html#NameMatch

bug: 15377898
Change-Id: I0898956255aa9174b12811e6f6ca826434b28c20

10 years agoam 7f0c6478: Merge "Adjust h3 margins for dynamic content blocks." into klp-docs
Dirk Dougherty [Tue, 3 Jun 2014 23:13:50 +0000 (23:13 +0000)]
am 7f0c6478: Merge "Adjust h3 margins for dynamic content blocks." into klp-docs

* commit '7f0c6478ae5266be92ebfa8b0c6244f1a101ce01':
  Adjust h3 margins for dynamic content blocks.

10 years agoMerge "Adjust h3 margins for dynamic content blocks." into klp-docs
Dirk Dougherty [Tue, 3 Jun 2014 23:09:37 +0000 (23:09 +0000)]
Merge "Adjust h3 margins for dynamic content blocks." into klp-docs

10 years agoam 5f664a11: am 2a57694d: (-s ours) am e2edd753: am 76364c69: am d0f21575: (-s ours...
Deepanshu Gupta [Tue, 3 Jun 2014 21:10:10 +0000 (21:10 +0000)]
am 5f664a11: am 2a57694d: (-s ours) am e2edd753: am 76364c69: am d0f21575: (-s ours) am 3c1d72c2: am ab869de1: am cd192c0b: am 704954c9: am 5f56ea8d: am f48ab8fe: am 3b7c09b4: LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE]

* commit '5f664a1119f9008feeb924ec50c2ac896a8550db':
  LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE]

10 years agoam 2a57694d: (-s ours) am e2edd753: am 76364c69: am d0f21575: (-s ours) am 3c1d72c2...
Deepanshu Gupta [Tue, 3 Jun 2014 21:06:02 +0000 (21:06 +0000)]
am 2a57694d: (-s ours) am e2edd753: am 76364c69: am d0f21575: (-s ours) am 3c1d72c2: am ab869de1: am cd192c0b: am 704954c9: am 5f56ea8d: am f48ab8fe: am 3b7c09b4: LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE]

* commit '2a57694d0ae30eeca7239c7efae4e6bf478b781a':
  LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE]

10 years agoam e2edd753: am 76364c69: am d0f21575: (-s ours) am 3c1d72c2: am ab869de1: am cd192c0...
Deepanshu Gupta [Tue, 3 Jun 2014 21:02:55 +0000 (21:02 +0000)]
am e2edd753: am 76364c69: am d0f21575: (-s ours) am 3c1d72c2: am ab869de1: am cd192c0b: am 704954c9: am 5f56ea8d: am f48ab8fe: am 3b7c09b4: LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE]

* commit 'e2edd753e8a58de5958b5145f9ea7d2f5484a6ca':
  LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE]

10 years agoam 76364c69: am d0f21575: (-s ours) am 3c1d72c2: am ab869de1: am cd192c0b: am 704954c...
Deepanshu Gupta [Tue, 3 Jun 2014 20:58:41 +0000 (20:58 +0000)]
am 76364c69: am d0f21575: (-s ours) am 3c1d72c2: am ab869de1: am cd192c0b: am 704954c9: am 5f56ea8d: am f48ab8fe: am 3b7c09b4: LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE]

* commit '76364c6970f86bdf67622c14c9f1ebac6883998b':
  LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE]

10 years agoam d0f21575: (-s ours) am 3c1d72c2: am ab869de1: am cd192c0b: am 704954c9: am 5f56ea8...
Deepanshu Gupta [Tue, 3 Jun 2014 20:53:49 +0000 (20:53 +0000)]
am d0f21575: (-s ours) am 3c1d72c2: am ab869de1: am cd192c0b: am 704954c9: am 5f56ea8d: am f48ab8fe: am 3b7c09b4: LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE]

* commit 'd0f215756aa3767db8a73ece7fe9f401256dd263':
  LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE]

10 years agoam 3c1d72c2: am ab869de1: am cd192c0b: am 704954c9: am 5f56ea8d: am f48ab8fe: am...
Deepanshu Gupta [Tue, 3 Jun 2014 20:49:37 +0000 (20:49 +0000)]
am 3c1d72c2: am ab869de1: am cd192c0b: am 704954c9: am 5f56ea8d: am f48ab8fe: am 3b7c09b4: LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE]

* commit '3c1d72c2ef1819e0de5599761b21f00351ca3feb':
  LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE]

10 years agoam b97ac2b6: am c8414f11: (-s ours) am 4dcb4a1f: am 236b7164: am 0ab0d875: (-s ours...
Deepanshu Gupta [Tue, 3 Jun 2014 20:49:35 +0000 (20:49 +0000)]
am b97ac2b6: am c8414f11: (-s ours) am 4dcb4a1f: am 236b7164: am 0ab0d875: (-s ours) am 28f550f0: am 03a83266: am 08d2007b: LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE]

* commit 'b97ac2b6acc84b02ebe16a8c875bae5cfd0898f2':
  LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE]

10 years agoam fb6e2f3b: am 9bfbe93a: (-s ours) am dd46bfd0: am 02d88f7b: am ffbf2447: (-s ours...
Deepanshu Gupta [Tue, 3 Jun 2014 20:49:32 +0000 (20:49 +0000)]
am fb6e2f3b: am 9bfbe93a: (-s ours) am dd46bfd0: am 02d88f7b: am ffbf2447: (-s ours) am 083af20d: am 531bdb5b: am fe6f3049: Remove @NonNull attribute [DO NOT MERGE]

* commit 'fb6e2f3b56fc067c634c122d605abe3841c309a9':
  Remove @NonNull attribute [DO NOT MERGE]

10 years agoam c8414f11: (-s ours) am 4dcb4a1f: am 236b7164: am 0ab0d875: (-s ours) am 28f550f0...
Deepanshu Gupta [Tue, 3 Jun 2014 20:47:34 +0000 (20:47 +0000)]
am c8414f11: (-s ours) am 4dcb4a1f: am 236b7164: am 0ab0d875: (-s ours) am 28f550f0: am 03a83266: am 08d2007b: LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE]

* commit 'c8414f11d7738dafc530178fd6dfa365d8b3d884':
  LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE]

10 years agoam 9bfbe93a: (-s ours) am dd46bfd0: am 02d88f7b: am ffbf2447: (-s ours) am 083af20d...
Deepanshu Gupta [Tue, 3 Jun 2014 20:47:30 +0000 (20:47 +0000)]
am 9bfbe93a: (-s ours) am dd46bfd0: am 02d88f7b: am ffbf2447: (-s ours) am 083af20d: am 531bdb5b: am fe6f3049: Remove @NonNull attribute [DO NOT MERGE]

* commit '9bfbe93a7e7165a7daef68175aa7dde9dbe0223a':
  Remove @NonNull attribute [DO NOT MERGE]

10 years agoam 4dcb4a1f: am 236b7164: am 0ab0d875: (-s ours) am 28f550f0: am 03a83266: am 08d2007...
Deepanshu Gupta [Tue, 3 Jun 2014 20:43:53 +0000 (20:43 +0000)]
am 4dcb4a1f: am 236b7164: am 0ab0d875: (-s ours) am 28f550f0: am 03a83266: am 08d2007b: LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE]

* commit '4dcb4a1f03abb2a4d3f1ceb9aed0feb6264ebfb5':
  LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE]

10 years agoam dd46bfd0: am 02d88f7b: am ffbf2447: (-s ours) am 083af20d: am 531bdb5b: am fe6f304...
Deepanshu Gupta [Tue, 3 Jun 2014 20:43:50 +0000 (20:43 +0000)]
am dd46bfd0: am 02d88f7b: am ffbf2447: (-s ours) am 083af20d: am 531bdb5b: am fe6f3049: Remove @NonNull attribute [DO NOT MERGE]

* commit 'dd46bfd09522fa7450293bbcb2f3ae5ecc85b882':
  Remove @NonNull attribute [DO NOT MERGE]

10 years agoam ab869de1: am cd192c0b: am 704954c9: am 5f56ea8d: am f48ab8fe: am 3b7c09b4: LayoutL...
Deepanshu Gupta [Tue, 3 Jun 2014 20:41:34 +0000 (20:41 +0000)]
am ab869de1: am cd192c0b: am 704954c9: am 5f56ea8d: am f48ab8fe: am 3b7c09b4: LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE]

* commit 'ab869de19efc24265eebda19a97628713e072178':
  LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE]

10 years agoam 236b7164: am 0ab0d875: (-s ours) am 28f550f0: am 03a83266: am 08d2007b: LayoutLib...
Deepanshu Gupta [Tue, 3 Jun 2014 20:39:10 +0000 (20:39 +0000)]
am 236b7164: am 0ab0d875: (-s ours) am 28f550f0: am 03a83266: am 08d2007b: LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE]

* commit '236b71649ce008578cf77557033df322e93a1e17':
  LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE]

10 years agoam 02d88f7b: am ffbf2447: (-s ours) am 083af20d: am 531bdb5b: am fe6f3049: Remove...
Deepanshu Gupta [Tue, 3 Jun 2014 20:39:08 +0000 (20:39 +0000)]
am 02d88f7b: am ffbf2447: (-s ours) am 083af20d: am 531bdb5b: am fe6f3049: Remove @NonNull attribute [DO NOT MERGE]

* commit '02d88f7b350e166da3b1f480c912351a5c72d00c':
  Remove @NonNull attribute [DO NOT MERGE]

10 years agoam cd192c0b: am 704954c9: am 5f56ea8d: am f48ab8fe: am 3b7c09b4: LayoutLib: Correctly...
Deepanshu Gupta [Tue, 3 Jun 2014 20:36:41 +0000 (20:36 +0000)]
am cd192c0b: am 704954c9: am 5f56ea8d: am f48ab8fe: am 3b7c09b4: LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE]

* commit 'cd192c0b1ca56af3ed3dfdb38626304de0412254':
  LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE]

10 years agoam 0ab0d875: (-s ours) am 28f550f0: am 03a83266: am 08d2007b: LayoutLib: Correctly...
Deepanshu Gupta [Tue, 3 Jun 2014 20:35:12 +0000 (20:35 +0000)]
am 0ab0d875: (-s ours) am 28f550f0: am 03a83266: am 08d2007b: LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE]

* commit '0ab0d875d46d6d8974c9cf3ea5856dcfb557e9a4':
  LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE]

10 years agoam ffbf2447: (-s ours) am 083af20d: am 531bdb5b: am fe6f3049: Remove @NonNull attribu...
Deepanshu Gupta [Tue, 3 Jun 2014 20:35:09 +0000 (20:35 +0000)]
am ffbf2447: (-s ours) am 083af20d: am 531bdb5b: am fe6f3049: Remove @NonNull attribute [DO NOT MERGE]

* commit 'ffbf24476c153bbd9293261cc14d9648f72b7369':
  Remove @NonNull attribute [DO NOT MERGE]

10 years agoam d056218b: am 661e158b: (-s ours) am 2ac96a09: am a0fc1f46: LayoutLib: Correctly...
Deepanshu Gupta [Tue, 3 Jun 2014 20:35:02 +0000 (20:35 +0000)]
am d056218b: am 661e158b: (-s ours) am 2ac96a09: am a0fc1f46: LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE]

* commit 'd056218b0486676f8e3b68854f94e2d36209ea18':
  LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE]

10 years agoam 704954c9: am 5f56ea8d: am f48ab8fe: am 3b7c09b4: LayoutLib: Correctly resolve...
Deepanshu Gupta [Tue, 3 Jun 2014 20:32:55 +0000 (20:32 +0000)]
am 704954c9: am 5f56ea8d: am f48ab8fe: am 3b7c09b4: LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE]

* commit '704954c96a797e45d421b8d910ca2426d19f6b37':
  LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE]

10 years agoam 661e158b: (-s ours) am 2ac96a09: am a0fc1f46: LayoutLib: Correctly resolve ?attr...
Deepanshu Gupta [Tue, 3 Jun 2014 20:30:57 +0000 (20:30 +0000)]
am 661e158b: (-s ours) am 2ac96a09: am a0fc1f46: LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE]

* commit '661e158b0a754f1123485673ac050e388e8056a2':
  LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE]

10 years agoam 28f550f0: am 03a83266: am 08d2007b: LayoutLib: Correctly resolve ?attr/foo [DO...
Deepanshu Gupta [Tue, 3 Jun 2014 20:30:53 +0000 (20:30 +0000)]
am 28f550f0: am 03a83266: am 08d2007b: LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE]

* commit '28f550f010045d5df9e7762a567fb0351499b846':
  LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE]

10 years agoam 083af20d: am 531bdb5b: am fe6f3049: Remove @NonNull attribute [DO NOT MERGE]
Deepanshu Gupta [Tue, 3 Jun 2014 20:30:50 +0000 (20:30 +0000)]
am 083af20d: am 531bdb5b: am fe6f3049: Remove @NonNull attribute [DO NOT MERGE]

* commit '083af20d9dc0d14eadd2ba03951579f88cd1f671':
  Remove @NonNull attribute [DO NOT MERGE]

10 years agoam 5f56ea8d: am f48ab8fe: am 3b7c09b4: LayoutLib: Correctly resolve ?attr/foo [DO...
Deepanshu Gupta [Tue, 3 Jun 2014 20:28:48 +0000 (20:28 +0000)]
am 5f56ea8d: am f48ab8fe: am 3b7c09b4: LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE]

* commit '5f56ea8d802b3a7ce5ba8992a84dd3b462676e0e':
  LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE]

10 years agodocs: Added release notes for SDK Tools 22.6.4
Ricardo Cervera [Tue, 3 Jun 2014 20:27:41 +0000 (13:27 -0700)]
docs: Added release notes for SDK Tools 22.6.4

Change-Id: Iff4d980d0159b6773f6d6c60ed5d413d4e698083

10 years agoam 2ac96a09: am a0fc1f46: LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE]
Deepanshu Gupta [Tue, 3 Jun 2014 20:27:08 +0000 (20:27 +0000)]
am 2ac96a09: am a0fc1f46: LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE]

* commit '2ac96a093b12883c44327edba899e6c79ee71a7b':
  LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE]

10 years agoam 03a83266: am 08d2007b: LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE]
Deepanshu Gupta [Tue, 3 Jun 2014 20:25:51 +0000 (20:25 +0000)]
am 03a83266: am 08d2007b: LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE]

* commit '03a832669ded18a99d4ac37f047a82d2b198302a':
  LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE]

10 years agoam 531bdb5b: am fe6f3049: Remove @NonNull attribute [DO NOT MERGE]
Deepanshu Gupta [Tue, 3 Jun 2014 20:25:48 +0000 (20:25 +0000)]
am 531bdb5b: am fe6f3049: Remove @NonNull attribute [DO NOT MERGE]

* commit '531bdb5b57a7a903cea16baedb914e34df941651':
  Remove @NonNull attribute [DO NOT MERGE]