drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
117,486 Commits 1 Branch 0 Tags
Commit Graph

117486 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Scott Main
48371ca146 am 4aa9c6d5: DO NOT MERGE Revert "Revert "add \'coming soon\' page for google io announcements"" 
* commit '4aa9c6d5d38a1091bda7950baba5a9199898a728':
  DO NOT MERGE Revert "Revert "add 'coming soon' page for google io announcements""
 2014-06-25 01:02:00 +00:00
Scott Main
1b4a9dbf83 am 87670bcb: Revert "add \'coming soon\' page for google io announcements" 
* commit '87670bcb34c308731bbec177dae99cd9981656fb':
  Revert "add 'coming soon' page for google io announcements"
 2014-06-25 01:01:57 +00:00
smain@google.com
bf5d1a93aa am cca2a91a: add \'coming soon\' page for google io announcements 
* commit 'cca2a91a7cba2f0005b9d4a9a21a506ed191c348':
  add 'coming soon' page for google io announcements
 2014-06-25 01:01:54 +00:00
Scott Main
4aa9c6d5d3 DO NOT MERGE 
Revert "Revert "add 'coming soon' page for google io announcements""

This reverts commit 87670bcb34c308731bbec177dae99cd9981656fb.

Change-Id: Ica55fdc9f345c55ab038ecbf836673be4f4bb1a0
 2014-06-25 00:58:45 +00:00
Scott Main
87670bcb34 Revert "add 'coming soon' page for google io announcements" 
This reverts commit cca2a91a7cba2f0005b9d4a9a21a506ed191c348.

Change-Id: I0212a0f0dbe63c14d796c9e764c0871790fddc46
 2014-06-25 00:57:48 +00:00
smain@google.com
cca2a91a7c add 'coming soon' page for google io announcements 
Change-Id: I17e09aaa3c93060b306301ffa5012d8fcee3af22
 2014-06-24 17:54:28 -07:00
Andrew Solovay
1d5976c844 am 906eda45: Merge "docs: Fixed instructions on checking VM version." into klp-docs 
* commit '906eda45b27668e4c0a37b5ba3fbd530308883e6':
  docs: Fixed instructions on checking VM version.
 2014-06-24 21:39:27 +00:00
Andrew Solovay
906eda45b2 Merge "docs: Fixed instructions on checking VM version." into klp-docs 2014-06-23 21:50:10 +00:00
Andrew Solovay
dccf940c4b 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
 2014-06-24 13:04:54 -07:00
Dirk Dougherty
39b707c8d5 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.
 2014-06-21 02:33:40 +00:00
Joe Fernandez
845835c779 am 2d7b3ded: Merge "ExoPlayer developer guide" into klp-docs 
* commit '2d7b3dedd0ddccd5a44b7c289f5075ea1696c06c':
  ExoPlayer developer guide
 2014-06-20 21:41:30 +00:00
Dirk Dougherty
bf66c17e4a Merge "remove extraneous tag causing extra spacing between heading/text." into klp-docs 2014-06-20 02:09:17 +00:00
Joe Fernandez
2d7b3dedd0 Merge "ExoPlayer developer guide" into klp-docs 2014-06-20 00:24:32 +00:00
Joe Fernandez
afe3bb96f2 ExoPlayer developer guide 
Change-Id: Icacaa0e68e602fc77946e10729b3649baaf4331b
 2014-06-20 14:28:54 -07:00
Deepanshu Gupta
5a49fc331e 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]
 2014-06-18 00:10:34 +00:00
Andrew Solovay
bd8ca9f9ad am 4737af8b: docs: Added "Verifying for ART" to TOC. 
* commit '4737af8b0aa77681270b6bc6478a946b71144e45':
  docs: Added "Verifying for ART" to TOC.
 2014-06-13 18:23:03 +00:00
Andrew Solovay
4737af8b0a 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
 2014-06-13 10:52:29 -07:00
Deepanshu Gupta
c57b410c8e 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
 2014-06-12 15:08:46 -07:00
Andrew Solovay
436f4e36d3 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.
 2014-06-12 17:19:33 +00:00
Dirk Dougherty
b9830ad3c4 remove extraneous tag causing extra spacing between heading/text. 
Change-Id: I008f48f8274ed45d38dcef05fa9c47b935f23910
 2014-06-11 21:03:33 -07:00
Dirk Dougherty
b024fd2087 am bdcd6fc7: Doc change: Update monetization docs. 
* commit 'bdcd6fc777e678fb3d0d9b7f000b43d703fea9cd':
  Doc change: Update monetization docs.
 2014-06-12 02:37:27 +00:00
Dirk Dougherty
bdcd6fc777 Doc change: Update monetization docs. 
Change-Id: Ic34c1a08f8b7bcd271ad53f31c62d0bab82fc053
 2014-06-11 17:52:07 -07:00
Andrew Solovay
ded9c171ea Merge "docs: New "Verifying App Behavior on the Android Runtime (ART)" guide." into klp-docs 2014-06-10 21:32:31 +00:00
Robert Ly
a7ddd02924 am 80e84e2d: am f3cecfa2: am 55d525b2: am 716cc7dc: Add documentation for AndroidKeyStore 
* commit '80e84e2db92ba190c6c517dd4c71cd12c0adb249':
  Add documentation for AndroidKeyStore
 2014-06-10 02:44:08 +00:00
Robert Ly
80e84e2db9 am f3cecfa2: am 55d525b2: am 716cc7dc: Add documentation for AndroidKeyStore 
* commit 'f3cecfa2185ef5622992b21da8204b8b6590ef2d':
  Add documentation for AndroidKeyStore
 2014-06-10 02:39:28 +00:00
Robert Ly
f3cecfa218 am 55d525b2: am 716cc7dc: Add documentation for AndroidKeyStore 
* commit '55d525b26b716351625798675afe69c6cf43cf5a':
  Add documentation for AndroidKeyStore
 2014-06-10 02:36:10 +00:00
Robert Ly
55d525b26b am 716cc7dc: Add documentation for AndroidKeyStore 
* commit '716cc7dcac1bb9279326ab92a78a246b3a70de4e':
  Add documentation for AndroidKeyStore
 2014-06-10 02:32:29 +00:00
Amit Mahajan
e5a28d34f6 am 20c5ce50: Handle provisioning APN by turning off/on radio. 
* commit '20c5ce50c456742bf912ebb915be45bfdb51487d':
  Handle provisioning APN by turning off/on radio.
 2014-06-09 19:46:01 +00:00
Amit Mahajan
20c5ce50c4 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
 2014-06-09 17:55:27 +00:00
Andrew Solovay
220cf297d8 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
 2014-06-09 10:10:27 -07:00
Robert Ly
5cb1805413 am e115755d: Merge "remove erroneous file" into klp-docs 
* commit 'e115755d0fbd067a1996eb448cda58a14cce22d1':
  remove erroneous file
 2014-06-08 08:35:23 +00:00
Robert Ly
e115755d0f Merge "remove erroneous file" into klp-docs 2014-06-08 05:39:55 +00:00
Robert Ly
6ee94e5388 remove erroneous file 
Change-Id: Idb46777d80ee1b6286769fdceba7639877ab2388
 2014-06-07 22:38:18 -07:00
Dave Holmes
4e99af342b 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.
 2014-06-04 23:38:34 +00:00
Dave Holmes
aabfcb78cf 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 2014-06-04 23:35:50 +00:00
Deepanshu Gupta
03df93bcb8 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]
 2014-06-04 20:45:02 +00:00
Deepanshu Gupta
5cde33a6ff 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]
 2014-06-04 20:41:47 +00:00
Deepanshu Gupta
dcfba78fbb 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]
 2014-06-04 20:38:25 +00:00
Deepanshu Gupta
ed5ab0f01e 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]
 2014-06-04 20:34:14 +00:00
Deepanshu Gupta
022d8a9f44 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]
 2014-06-04 20:30:05 +00:00
Deepanshu Gupta
bad112f23f 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]
 2014-06-04 20:27:49 +00:00
Deepanshu Gupta
3ce1ca6830 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]
 2014-06-04 20:26:07 +00:00
Deepanshu Gupta
e4aa313821 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]
 2014-06-04 20:25:57 +00:00
Deepanshu Gupta
88c9ca28ef 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]
 2014-06-04 20:25:54 +00:00
Deepanshu Gupta
c8235b8e74 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]
 2014-06-04 20:21:00 +00:00
Deepanshu Gupta
0ed9d498b7 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]
 2014-06-04 20:20:52 +00:00
Deepanshu Gupta
a9e8291409 Merge branch 'klp-dev' of https://googleplex-android.googlesource.com/_direct/platform/frameworks/base into klp-dev 2014-06-04 20:20:51 +00:00
Deepanshu Gupta
d49f9b2531 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]
 2014-06-04 20:20:27 +00:00
Deepanshu Gupta
ab6c61b2dd Merge "Distinguish between menus in ActionBar and popup. [DO NOT MERGE]" into klp-dev 2014-06-04 20:20:26 +00:00
Deepanshu Gupta
ffcad247d0 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]
 2014-06-04 20:17:40 +00:00