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

1754 Commits

Author SHA1 Message Date
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
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
Scott Main
db705ef67b re-write the Dialog guide to focus on using DialogFragment 
Change-Id: Ia7812f4dab5d6c3d2f945da009891239b9d8d5e3
 2012-09-28 11:49:25 -07:00
Joe Malin
44c564f251 am d8104d9b: am 829986a5: Merge "DOC CHANGE: Fix Google Play services page" into jb-dev-docs 
* commit 'd8104d9b3debad8c960a302972488e5157702618':
  DOC CHANGE: Fix Google Play services page
 2012-09-26 12:45:58 -07:00
Joe Malin
d8104d9b3d am 829986a5: Merge "DOC CHANGE: Fix Google Play services page" into jb-dev-docs 
* commit '829986a5f6b46a744f1f9953b8af5bbe849c71a9':
  DOC CHANGE: Fix Google Play services page
 2012-09-26 12:43:38 -07:00
Joe Malin
829986a5f6 Merge "DOC CHANGE: Fix Google Play services page" into jb-dev-docs 2012-09-26 12:41:43 -07:00
Joe Malin
74708d896b DOC CHANGE: Fix Google Play services page 
Change-Id: I9b175a01ee415fee187ff4257c36b9462acfd29b
 2012-09-26 12:36:50 -07:00
Scott Main
16eb53668b am 54645245: am 14a36625: fix markup bugs 
* commit '5464524524ce40af3e421e2d1c9bf810605ae43a':
  fix markup bugs
 2012-09-26 11:37:38 -07:00
Scott Main
5464524524 am 14a36625: fix markup bugs 
* commit '14a366255aee79eec81d5a80ec3d8f298af9a938':
  fix markup bugs
 2012-09-26 11:34:49 -07:00
Scott Main
14a366255a fix markup bugs 
Change-Id: I37111431505f7803c2374917b3c186529c6e3d60
 2012-09-26 11:22:09 -07:00
Scott Main
2e6428668c am be676b6c: am 4a5425db: fix layout bug 
* commit 'be676b6cc4a2a594dcb1fb233539cf927f0b49e5':
  fix layout bug
 2012-09-21 16:00:51 -07:00
Scott Main
be676b6cc4 am 4a5425db: fix layout bug 
* commit '4a5425dbd29329aaffbab3bb83c33bd437958237':
  fix layout bug
 2012-09-21 15:59:04 -07:00
Scott Main
4a5425dbd2 fix layout bug 
Change-Id: Ibf3f04d6c2077c77b75076c02312d3b2dea394eb
 2012-09-21 15:55:15 -07:00
Scott Main
9198495b27 am 19a39686: am b79d8ecc: udpate media formats for JB 
* commit '19a39686b7bcf5c47cc0e2f99caca7beb9173212':
  udpate media formats for JB
 2012-09-19 11:22:02 -07:00
Scott Main
19a39686b7 am b79d8ecc: udpate media formats for JB 
* commit 'b79d8ecc27c0c7a8c2f8dcc1a752450e4d7d39e2':
  udpate media formats for JB
 2012-09-19 11:00:23 -07:00
Scott Main
b79d8ecc27 udpate media formats for JB 
Change-Id: Ide41c5dde11298e875c957467c39262dafadcc4c
 2012-09-19 00:02:12 -07:00
Scott Main
61d85c4347 add link to device dock lesson 2012-09-17 10:56:49 -07:00
Scott Main
d5abc5586e docs: update for multi apk doc for ABI support 2012-09-17 10:54:55 -07:00
Katie McCormick
73ec048e4d Doc update: Appwidgets JB additions. 2012-09-17 10:54:17 -07:00
Joe Fernandez
8982939d17 docs: Accessibility DevGuide, Jelly Bean edition 2012-09-17 10:50:42 -07:00
Katie McCormick
d21b9a9e21 am 2f140f96: Merge "Doc change: GCM changes" into jb-dev 
* commit '2f140f9692c3f8e8ae278839637ff5f72d145c60':
  Doc change: GCM changes
 2012-09-13 09:39:50 -07:00
Katie McCormick
2f140f9692 Merge "Doc change: GCM changes" into jb-dev 2012-09-13 09:36:48 -07:00
Katie McCormick
4e11e3e962 Doc change: GCM changes 
Bug: 7072792

Change-Id: I718e407647571d093996139b857f703c104d4e4d
 2012-09-12 14:05:34 -07:00
Scott Main
53d1864c10 am 8dc0ff07: Merge "fix another link in the style doc" into jb-dev 
* commit '8dc0ff07c9713945b0075dd1010057a47cb8c40b':
  fix another link in the style doc
 2012-09-12 10:43:57 -07:00
Scott Main
816518fa59 fix another link in the style doc 
Change-Id: Icd40456ab32232eacc6fa3acdd86ff78aa03e3aa
 2012-09-12 10:40:29 -07:00
Scott Main
eb0b6e272f am 94b2b5ef: Merge "fix links to style and themes source files" into jb-dev 
* commit '94b2b5efa017138663e00e23e138333149641023':
  fix links to style and themes source files
 2012-09-12 10:11:00 -07:00
Scott Main
600a75c31f fix links to style and themes source files 
Change-Id: I49759c689c3d345be014c7a252e266d7529af230
 2012-09-12 10:05:38 -07:00
Scott Main
c02b5008c1 am c0e0d2bf: Merge "docs: update for multi apk doc for ABI support" into jb-dev 
* commit 'c0e0d2bf3db18eaa2b94608654784cad29f96b23':
  docs: update for multi apk doc for ABI support
 2012-09-11 10:50:40 -07:00
Scott Main
c0e0d2bf3d Merge "docs: update for multi apk doc for ABI support" into jb-dev 2012-09-11 10:48:16 -07:00
Scott Main
cd3ec7a251 am e9e40b43: Merge "add link to device dock lesson" into jb-dev 
* commit 'e9e40b438e0a9c30df5834cf7f8f069b20789c76':
  add link to device dock lesson
 2012-09-10 16:27:58 -07:00
Scott Main
c73d67f3f1 add link to device dock lesson 
Change-Id: I7af36f89204d49f2a0a23c33376f2f343f3b1593
 2012-09-10 16:20:08 -07:00
Katie McCormick
21d8331d61 am ae050d56: Merge "Doc update: Appwidgets JB additions." into jb-dev 
* commit 'ae050d56247257f652fecb71e3f2ed474238e23f':
  Doc update: Appwidgets JB additions.
 2012-09-07 11:08:46 -07:00
Katie McCormick
ae050d5624 Merge "Doc update: Appwidgets JB additions." into jb-dev 2012-09-07 11:06:00 -07:00
Scott Main
bd4a708735 docs: update for multi apk doc for ABI support 
Change-Id: I6ef9b7f4bb213dddddcf03b304ffedfd2f9e209b
 2012-09-06 21:53:24 -07:00
Katie McCormick
96ab46039d Doc update: Appwidgets JB additions. 
Change-Id: Id18a1c82a50fc654e383d9acb53ca61073172287
 2012-09-05 13:07:09 -07:00
Scott Main
3bcf81dfa4 am 253483dd: Merge "docs: Accessibility DevGuide, Jelly Bean edition" into jb-dev 
* commit '253483dd974302f0d286eacf6f0f8a9ac9258f78':
  docs: Accessibility DevGuide, Jelly Bean edition
 2012-09-05 11:52:57 -07:00
Scott Main
253483dd97 Merge "docs: Accessibility DevGuide, Jelly Bean edition" into jb-dev 2012-09-05 11:50:18 -07:00
Joe Fernandez
ba4cf3c850 docs: Accessibility DevGuide, Jelly Bean edition 
Change-Id: Idafa0d755c0397b539a6de5b10096abc1c06c2c7
 2012-09-05 11:27:48 -07:00
Katie McCormick
9447af12e2 am 645eab64: Merge "Doc update: client javadoc fix for @value." into jb-dev 
* commit '645eab640e9c139b7a4e99c6c4d4f3bb2a86f092':
  Doc update: client javadoc fix for @value.
 2012-08-22 16:21:46 -07:00
Katie McCormick
c44ba477b3 Doc update: client javadoc fix for @value. 
Change-Id: I9e1327a21d0755fc10b4e5cb4aa9ecd30053b6ef
 2012-08-22 13:56:17 -07:00
Scott Main
91d08fe51a am 2d9063bc: docs: Add a few links and small edits to a couple layout guides 
* commit '2d9063bc705aae7ef4cc90206ece03d4caeefba7':
  docs: Add a few links and small edits to a couple layout guides
 2012-08-15 15:37:39 -07:00
Scott Main
2d9063bc70 docs: Add a few links and small edits to a couple layout guides 
Change-Id: I4c0c043782524a29f7fb8fcb54cc26d7399c39fc
 2012-08-15 15:11:19 -07:00
Scott Main
13f5ed254a am 18c2045b: Merge "revise info on Search button availability... behavior not guaranteed either bug: 6966922" into jb-dev 
* commit '18c2045bed1ee4e5615947bdc4539a6b4d4a1d23':
  revise info on Search button availability... behavior not guaranteed either bug: 6966922
 2012-08-15 09:49:47 -07:00
Scott Main
911711fd31 revise info on Search button availability... behavior not guaranteed either 
bug: 6966922

Change-Id: I4122e6fb99b95da3f53b56333a5f27d2adde6d44
 2012-08-14 13:20:53 -07:00
Scott Main
bd63fb875c am 6958c161: Merge "docs: misc bug fixes from external issues" into jb-dev 
* commit '6958c161a9f12aaa1db33bdc526040c3691638dc':
  docs: misc bug fixes from external issues
 2012-08-14 12:40:41 -07:00
Scott Main
183bf11697 docs: misc bug fixes from external issues 
Change-Id: I380b65341200c0519a93e2f8969f70f64aec0264
 2012-08-13 19:12:13 -07:00