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

80691 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Geremy Condra
dadea723a3 am a22000d2: Merge "DO NOT MERGE remove defunct javascript interface" into jb-dev 
* commit 'a22000d244915df2098619be5fd66bf1c4d019c8':
  DO NOT MERGE remove defunct javascript interface
 2012-10-09 21:34:33 -07:00
Geremy Condra
a22000d244 Merge "DO NOT MERGE remove defunct javascript interface" into jb-dev 2012-10-09 21:32:01 -07:00
Dirk Dougherty
0c9c8d0a06 am 137b8f4c: am f761a9a6: Merge "Doc change: edits to TV tablet story." into jb-dev-docs 
* commit '137b8f4c0e8fdc354432231362a0bfbcf11ed96e':
  Doc change: edits to TV tablet story.
 2012-10-09 17:36:26 -07:00
Dirk Dougherty
137b8f4c0e am f761a9a6: Merge "Doc change: edits to TV tablet story." into jb-dev-docs 
* commit 'f761a9a634a43662525d9c0c537ac5499263fd81':
  Doc change: edits to TV tablet story.
 2012-10-09 17:33:52 -07:00
Dirk Dougherty
f761a9a634 Merge "Doc change: edits to TV tablet story." into jb-dev-docs 2012-10-09 17:31:35 -07:00
Dirk Dougherty
8048b9ec0c am 28a40e01: am aa0d43ba: Merge "Doc change: Link to AVDs docs from tablet quality checklist." into jb-dev-docs 
* commit '28a40e01fec9e00c74e52a88a5f6fca98057af91':
  Doc change: Link to AVDs docs from tablet quality checklist.
 2012-10-09 15:52:13 -07:00
Dirk Dougherty
28a40e01fe am aa0d43ba: Merge "Doc change: Link to AVDs docs from tablet quality checklist." into jb-dev-docs 
* commit 'aa0d43ba2581bb97f9ee955ea185b4f2759055c6':
  Doc change: Link to AVDs docs from tablet quality checklist.
 2012-10-09 15:50:12 -07:00
Dirk Dougherty
aa0d43ba25 Merge "Doc change: Link to AVDs docs from tablet quality checklist." into jb-dev-docs 2012-10-09 15:48:34 -07:00
Dirk Dougherty
f32b582597 Doc change: Link to AVDs docs from tablet quality checklist. 
Change-Id: Ifb20a903a0dd32009b6db6e583a6d0c86cddb52e
 2012-10-09 15:43:10 -07:00
Robert Ly
fba8b7f596 am f19e4b42: Merge "docs: nfc ndef helper methods bug 5957772" into jb-dev 
* commit 'f19e4b420de65306f09c199829e7e06fe210e21d':
  docs: nfc ndef helper methods bug 5957772
 2012-10-09 11:40:34 -07:00
Robert Ly
f19e4b420d Merge "docs: nfc ndef helper methods bug 5957772" into jb-dev 2012-10-09 11:38:00 -07:00
Dirk Dougherty
fb554fc0bf am b049b1ef: am 46c4b488: Doc change: Subscriptions free trials on Google Play. 
* commit 'b049b1ef81d301359444b6b18671a513373ba221':
  Doc change: Subscriptions free trials on Google Play.
 2012-10-09 10:36:43 -07:00
Dirk Dougherty
b049b1ef81 am 46c4b488: Doc change: Subscriptions free trials on Google Play. 
* commit '46c4b4886ae7b3a982cb1803f2b3ed7b7aa5f1c4':
  Doc change: Subscriptions free trials on Google Play.
 2012-10-09 10:33:53 -07:00
Dirk Dougherty
46c4b4886a Doc change: Subscriptions free trials on Google Play. 
Change-Id: I981eb94658f9f152d1c1a9915ffaadd63b4a965d
 2012-10-09 10:17:55 -07:00
Robert Ly
1f415fa2ea docs: nfc ndef helper methods bug 5957772 
Change-Id: I9c8356f44c1f9cc4a5187d40816cbfdd6212ab6e
 2012-10-08 16:59:39 -07:00
Selim Gurun
8d197601e7 DO NOT MERGE remove defunct javascript interface 
Bug: 7073422

The feature that is using search box implementation was removed from
browser after Honeycomb. This is to remove the js interface that
is added for this feature.

Clean cherry pick of d773ca8ff2a7a5be94d7f2aaa8ff5ef5dac501a8

Change-Id: I033d29718d08803f375759faf83e2058df6d4906
 2012-10-08 14:35:19 -07:00
Dirk Dougherty
08fdd5b639 Doc change: edits to TV tablet story. 
Change-Id: Idbada9a3b83f7e80cd7cf7b79da5c2f9ab4398d6
 2012-10-08 11:41:44 -07:00
Dirk Dougherty
42bf1848fe am daf69014: am a4c7176d: Merge "Doc change: Add core quality and tablet quality docs and spotlight." into jb-dev-docs 
* commit 'daf69014b5f25accae38dfef3d5880b4b7b87f8b':
  Doc change: Add core quality and tablet quality docs and spotlight.
 2012-10-05 19:06:06 -07:00
Dirk Dougherty
daf69014b5 am a4c7176d: Merge "Doc change: Add core quality and tablet quality docs and spotlight." into jb-dev-docs 
* commit 'a4c7176dbc5193085ba3f2f602d16adac12cfa63':
  Doc change: Add core quality and tablet quality docs and spotlight.
 2012-10-05 19:03:51 -07:00
Dirk Dougherty
a4c7176dbc Merge "Doc change: Add core quality and tablet quality docs and spotlight." into jb-dev-docs 2012-10-05 19:01:06 -07:00
Dirk Dougherty
07afab6bd4 am 34765caf: am d8a4a72a: Merge "Doc change: edits to distribute content." into jb-dev-docs 
* commit '34765caf6543bce8a4669563eb21f0077d4e2d26':
  Doc change: edits to distribute content.
 2012-10-05 18:54:45 -07:00
Dirk Dougherty
34765caf65 am d8a4a72a: Merge "Doc change: edits to distribute content." into jb-dev-docs 
* commit 'd8a4a72ab5f99d2dc5e95a07d9e3eb6ada40da6b':
  Doc change: edits to distribute content.
 2012-10-05 18:52:13 -07:00
Dirk Dougherty
d8a4a72ab5 Merge "Doc change: edits to distribute content." into jb-dev-docs 2012-10-05 18:50:03 -07:00
Dirk Dougherty
9aeb0a81da Doc change: Add core quality and tablet quality docs and spotlight. 
Change-Id: Ia88e66818200fdc20417c0fe20672a5758284028

Conflicts:

	docs/html/distribute/googleplay/quality/core.jd
	docs/html/distribute/googleplay/quality/index.jd
	docs/html/distribute/googleplay/quality/tablet.jd
 2012-10-05 18:47:10 -07:00
Scott Main
1c2056d6a5 am 98d4d719: am 2ed01adc: a few more crosslinks for design guide (to other design docs or dev docs) 
* commit '98d4d7196870205d5d93df330bdef0c23fcaf2c0':
  a few more crosslinks for design guide (to other design docs or dev docs)
 2012-10-05 17:05:55 -07:00
Scott Main
98d4d71968 am 2ed01adc: a few more crosslinks for design guide (to other design docs or dev docs) 
* commit '2ed01adc8d1af5a11520bd71450b764ca36fcb1c':
  a few more crosslinks for design guide (to other design docs or dev docs)
 2012-10-05 17:03:33 -07:00
Scott Main
2ed01adc8d a few more crosslinks for design guide (to other design docs or dev docs) 
Change-Id: Icba63102236b6efe445957f1f3070b705a40e1a9
 2012-10-04 15:13:16 -07:00
Joe Fernandez
7645936c7b am ab1456ab: am e3eeeb6d: Merge "docs: Remove Android Open Accessory docs, which are now on source.android.com" into jb-dev-docs 
* commit 'ab1456abad6094e527ab318294c20ec58453e4af':
  docs: Remove Android Open Accessory docs, which are now on source.android.com
 2012-10-04 13:08:27 -07:00
Joe Fernandez
ab1456abad am e3eeeb6d: Merge "docs: Remove Android Open Accessory docs, which are now on source.android.com" into jb-dev-docs 
* commit 'e3eeeb6d03ed8575df5e8c8dfecd4e26af2d4127':
  docs: Remove Android Open Accessory docs, which are now on source.android.com
 2012-10-04 13:07:15 -07:00
Joe Fernandez
e3eeeb6d03 Merge "docs: Remove Android Open Accessory docs, which are now on source.android.com" into jb-dev-docs 2012-10-04 13:05:12 -07:00
Scott Main
a35333c171 am c465ae32: am 688447e5: fix the lesson title names 
* commit 'c465ae324521fa1cb6e130f297fbb6da72a5072e':
  fix the lesson title names
 2012-10-04 12:47:59 -07:00
Scott Main
c465ae3245 am 688447e5: fix the lesson title names 
* commit '688447e512185dab4acd9ddfc9f22066d164ff4e':
  fix the lesson title names
 2012-10-04 12:45:29 -07:00
Scott Main
688447e512 fix the lesson title names 
Change-Id: I09ba41685664b92b5082376a8b9e885bf444415f
 2012-10-04 12:43:05 -07:00
Scott Main
c3b8a9b6d0 am bc7a20a4: resolved conflicts for merge of 78866b71 to jb-dev 
* commit 'bc7a20a48c3e8405c8dbbf54dd8f422fa5e19e3a':
  Doc update: TTL change.
 2012-10-04 11:50:18 -07:00
Joe Fernandez
069bc4a3b6 docs: Remove Android Open Accessory docs, which are now on source.android.com 
Change-Id: I5346de7e575304523d33a94329792fb1a37db89b
 2012-10-04 11:43:09 -07:00
Scott Main
bc7a20a48c resolved conflicts for merge of 78866b71 to jb-dev 
Change-Id: I028637f4622f398769ad43e714d45ec95ff3f23d
 2012-10-04 11:39:00 -07:00
Scott Main
78866b71e6 Merge "Doc update: TTL change." into jb-dev-docs 2012-10-04 10:20:13 -07:00
Scott Main
70e6cff9bc am 6b962174: am cea1f19c: Merge "add links from various design docs to corresponding developer docs" into jb-dev-docs 
* commit '6b962174bf974edd5298a37498777780e0b7b1fe':
  add links from various design docs to corresponding developer docs
 2012-10-04 10:10:21 -07:00
Scott Main
6b962174bf am cea1f19c: Merge "add links from various design docs to corresponding developer docs" into jb-dev-docs 
* commit 'cea1f19cb85c8204cc920bb1073c0726b610cedd':
  add links from various design docs to corresponding developer docs
 2012-10-04 10:08:00 -07:00
Scott Main
cea1f19cb8 Merge "add links from various design docs to corresponding developer docs" into jb-dev-docs 2012-10-04 10:06:02 -07:00
Dirk Dougherty
4473ababad Doc change: edits to distribute content. 
Change-Id: Ief68326428be5fc94060daca664b062e0af1f9df
 2012-10-04 09:38:34 -07:00
Scott Main
d4cc942996 add links from various design docs to corresponding developer docs 
Change-Id: Id731979a9b6ebcfc956848933d64ea5cf64953b5
 2012-10-03 20:53:05 -07:00
Dirk Dougherty
486eb4616e am 5713b5bc: am 99f5ff0a: Merge "Revert "Doc change: Add core quality and tablet quality docs, tablet developer stories."" into jb-dev-docs 
* commit '5713b5bc929962e8ddc559f3f3e73a925a0c3150':
  Revert "Doc change: Add core quality and tablet quality docs, tablet developer stories."
 2012-10-03 19:40:35 -07:00
Dirk Dougherty
5713b5bc92 am 99f5ff0a: Merge "Revert "Doc change: Add core quality and tablet quality docs, tablet developer stories."" into jb-dev-docs 
* commit '99f5ff0abb361de352f374822d2edc1a9379ad0c':
  Revert "Doc change: Add core quality and tablet quality docs, tablet developer stories."
 2012-10-03 19:38:17 -07:00
Dirk Dougherty
99f5ff0abb Merge "Revert "Doc change: Add core quality and tablet quality docs, tablet developer stories."" into jb-dev-docs 2012-10-03 19:37:01 -07:00
Dirk Dougherty
b4dc1c80a2 Revert "Doc change: Add core quality and tablet quality docs, tablet developer stories." 
This reverts commit c395f4a39cef3e0c2eaac8318b5e1723eac7d696

Change-Id: If74bdf2e567f60fc1af9e2c272531ef58e2cee41
 2012-10-03 19:36:08 -07:00
Scott Main
c1f68fdde0 am 3a247b27: am 48b2cadf: fix badge generator button 
* commit '3a247b27284060ce16346091a8bb8bf36fc41b5a':
  fix badge generator button
 2012-10-03 17:28:53 -07:00
Scott Main
3a247b2728 am 48b2cadf: fix badge generator button 
* commit '48b2cadf1bc2c1c3400e567e1ea7c66be86e3ff5':
  fix badge generator button
 2012-10-03 17:26:24 -07:00
Scott Main
48b2cadf1b fix badge generator button 
Change-Id: I797da9baca30873db0c3600de67c41a0fba1b492
 2012-10-03 17:23:45 -07:00
Scott Main
663db551ce am 4d62456e: resolved conflicts for merge of f15f8a1b to jb-dev 
* commit '4d62456e211a0b4cd77a8967417340612994cb6c':
  add analytics event tracking for Design downloads, SDK downloads, Badges and Device art.
 2012-10-03 16:50:56 -07:00