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

80713 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Scott Main
4d62456e21 resolved conflicts for merge of f15f8a1b to jb-dev 
Change-Id: Ic20777658426aa27304858dd51f315ee967a7bfa
 2012-10-03 16:42:06 -07:00
Scott Main
2af828790b am 25a9144b: Merge "docs: Update design download links" into jb-dev 
* commit '25a9144bf8728f24a87ca21f9e1c19c5fcc9abdc':
  docs: Update design download links
 2012-10-03 16:38:42 -07:00
Scott Main
25a9144bf8 Merge "docs: Update design download links" into jb-dev 2012-10-03 16:36:21 -07:00
Scott Main
f15f8a1b44 Merge "add analytics event tracking for Design downloads, SDK downloads, Badges and Device art." into jb-dev-docs 2012-10-03 16:23:00 -07:00
Scott Main
fe3057f913 add analytics event tracking for Design downloads, SDK downloads, Badges and Device art. 
Change-Id: I479b0059678d31fb993f6ddc68f5a7ef5ee26ecc
 2012-10-03 16:21:51 -07:00
Scott Main
d4c18b01cc am b31d0b3b: am d2e9486b: Merge "re-write the Dialog guide to focus on using DialogFragment" into jb-dev-docs 
* commit 'b31d0b3b6d0506970adeecd9177e276dd407f418':
  re-write the Dialog guide to focus on using DialogFragment
 2012-10-03 16:17:13 -07:00
Scott Main
b31d0b3b6d am d2e9486b: Merge "re-write the Dialog guide to focus on using DialogFragment" into jb-dev-docs 
* commit 'd2e9486bbf88cfe83f9ce3a7e2f86ea4ddf271bc':
  re-write the Dialog guide to focus on using DialogFragment
 2012-10-03 16:15:04 -07:00
Scott Main
d2e9486bbf Merge "re-write the Dialog guide to focus on using DialogFragment" into jb-dev-docs 2012-10-03 16:12:36 -07:00
&& repo sync -j8
22702c299a Doc update: TTL change. 
Change-Id: I9ddb224e51140adc712b49442dc56cb78a8be901
 2012-10-03 15:38:34 -07:00
Roman Nurik
45eacddb41 docs: Update design download links 
This is a manual merge of change I354d5dfd9c8c8843c217767ccb04447b30f79a48
from jb-dev-docs.

Change-Id: I448eca9e6c5a3e4ff9af82e14d713fdf3e99f236
 2012-10-03 13:51:27 -07:00
Roman Nurik
21dec9f96e am 6a54f4e6: am 66ff277f: (-s ours) docs: Update design download links 
* commit '6a54f4e67bbffa743da4273efb6cb5e9df38cfd8':
  docs: Update design download links
 2012-10-03 13:48:49 -07:00
Roman Nurik
6a54f4e67b am 66ff277f: (-s ours) docs: Update design download links 
* commit '66ff277fbd143c2d5da8c96ecb174ddc6f75562f':
  docs: Update design download links
 2012-10-03 13:45:24 -07:00
Roman Nurik
66ff277fbd docs: Update design download links 
Change-Id: I354d5dfd9c8c8843c217767ccb04447b30f79a48
 2012-10-03 13:28:27 -07:00
Dirk Dougherty
bd26b2fb75 am 5958cb0d: am c395f4a3: Doc change: Add core quality and tablet quality docs, tablet developer stories. 
* commit '5958cb0d8b619b7a42dcc9fbace3b2b9e088e89c':
  Doc change: Add core quality and tablet quality docs, tablet developer stories.
 2012-10-03 01:21:48 -07:00
Dirk Dougherty
5958cb0d8b am c395f4a3: Doc change: Add core quality and tablet quality docs, tablet developer stories. 
* commit 'c395f4a39cef3e0c2eaac8318b5e1723eac7d696':
  Doc change: Add core quality and tablet quality docs, tablet developer stories.
 2012-10-03 01:19:45 -07:00
Dirk Dougherty
c395f4a39c Doc change: Add core quality and tablet quality docs, tablet developer stories. 
Change-Id: Ia88e66818200fdc20417c0fe20672a5758284028
 2012-10-03 01:16:53 -07:00
Scott Main
39c78f0a1f am b2e7d79f: am ddab47b7: update sidenav structure for localized strings dependent on change Ifcae4fcf716c8bb48f3ff18f17313b3f131c3f73 
* commit 'b2e7d79f12efca50032512b70ddd79aa74dbbc4f':
  update sidenav structure for localized strings dependent on change Ifcae4fcf716c8bb48f3ff18f17313b3f131c3f73
 2012-10-02 20:33:19 -07:00
Scott Main
b2e7d79f12 am ddab47b7: update sidenav structure for localized strings dependent on change Ifcae4fcf716c8bb48f3ff18f17313b3f131c3f73 
* commit 'ddab47b78ca5dff3b9ca8f79c2af8de0292a8fa4':
  update sidenav structure for localized strings dependent on change Ifcae4fcf716c8bb48f3ff18f17313b3f131c3f73
 2012-10-02 20:31:09 -07:00
Scott Main
ddab47b78c update sidenav structure for localized strings 
dependent on change Ifcae4fcf716c8bb48f3ff18f17313b3f131c3f73

Change-Id: I8eaf83c454bb3e4eae4aac11473f371987c29ab1
 2012-10-02 17:48:11 -07:00
Scott Main
a142be8ea9 am 33b8f417: am 11f03b4b: (-s ours) DO NOT MERGE cherrypick from jb-dev Change-Id: I9579a7eb04cb39d3b457dde390b6b2a7b240a429 docs: android training - Data Storage 
* commit '33b8f4175719b746ee290fd95478fae4643fad42':
  DO NOT MERGE cherrypick from jb-dev Change-Id: I9579a7eb04cb39d3b457dde390b6b2a7b240a429 docs: android training - Data Storage
 2012-10-02 16:20:50 -07:00
Scott Main
33b8f41757 am 11f03b4b: (-s ours) DO NOT MERGE cherrypick from jb-dev Change-Id: I9579a7eb04cb39d3b457dde390b6b2a7b240a429 docs: android training - Data Storage 
* commit '11f03b4b694f506ed5dcb7c12a9984b653f93b42':
  DO NOT MERGE cherrypick from jb-dev Change-Id: I9579a7eb04cb39d3b457dde390b6b2a7b240a429 docs: android training - Data Storage
 2012-10-02 16:18:19 -07:00
Scott Main
11f03b4b69 DO NOT MERGE 
cherrypick from jb-dev Change-Id: I9579a7eb04cb39d3b457dde390b6b2a7b240a429
docs: android training - Data Storage

Change-Id: I62b6d5385355555aa3e184bfd4418a0d2e0c1719
 2012-10-02 16:14:36 -07:00
Scott Main
b847f0b578 am 04c63a40: docs: android training - Data Storage 
* commit '04c63a4098293dd00aeaf561b05a33c04a8d7853':
  docs: android training - Data Storage
 2012-10-02 15:31:18 -07:00
Scott Main
04c63a4098 docs: android training - Data Storage 
Change-Id: I9579a7eb04cb39d3b457dde390b6b2a7b240a429
 2012-10-02 15:06:22 -07:00
The Android Open Source Project
e81e42d7a6 Reconcile with jb-release - do not merge 
Change-Id: Ie81134aa556b0deb90dcba3d914d58558f3600a9
 2012-10-02 14:47:41 -07:00
Scott Main
e9d5d6271e am 94b94fc5: am 32a1d2db: dashboard update for 10/1 
* commit '94b94fc5b35f3e55574ce8b12b65e46f0144d743':
  dashboard update for 10/1
 2012-10-01 15:49:15 -07:00
Scott Main
94b94fc5b3 am 32a1d2db: dashboard update for 10/1 
* commit '32a1d2dbf9e396ae77bc621ec583c92b6774ed32':
  dashboard update for 10/1
 2012-10-01 15:46:20 -07:00
Scott Main
30bbfeafa1 am a180cc3c: am cd579c57: wording tweak to brand guidelines 
* commit 'a180cc3c0c33333c07c7c510aef92cee78dab56c':
  wording tweak to brand guidelines
 2012-10-01 12:03:09 -07:00