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

1756 Commits

Author SHA1 Message Date
kmccormick@google.com
2f9947e9aa am ddf10d44: Merge "Doc Update: Removed "no guaranteed delivery" line." into jb-dev-docs 
* commit 'ddf10d44c12fbd8ffb115c847913296b455f412d':
  Doc Update: Removed "no guaranteed delivery" line.
 2012-11-19 16:53:11 -08:00
&& repo sync -j8
ddf10d44c1 Merge "Doc Update: Removed "no guaranteed delivery" line." into jb-dev-docs 2012-11-19 16:51:09 -08:00
kmccormick@google.com
f53c5f3683 am d1ae2721: Merge "Doc Update: Fixing images" into jb-dev-docs 
* commit 'd1ae2721fa7b350b979e75319812636ea31bb56b':
  Doc Update: Fixing images
 2012-11-15 09:45:46 -08:00
&& repo sync -j8
d1ae2721fa Merge "Doc Update: Fixing images" into jb-dev-docs 2012-11-15 09:43:18 -08:00
&& repo sync -j8
1019a9c44e Doc Update: Fixing images 
Bug: 7542170
Change-Id: I18e5d360e21af9d30864456ae429b804314e1edb
 2012-11-14 18:27:36 -08:00
&& repo sync -j8
91cd7a7d52 Doc Update: Removed "no guaranteed delivery" line. 
Change-Id: I6f5b80d263069752b7d47b5825ff024b1858e41e
 2012-11-14 18:15:53 -08:00
Scott Main
e907a3909d am 22cc2764: implement new organization for Training classes This also moves a few of the documents from API Guides > Best Practices into the new courses for best practices. This is also dependent on CL Ieac8a97a8d6fda41a3682241901150cfe16afc4d which generates the lis 
* commit '22cc2764cc74e52888b043e0c6371594305bb5e9':
  implement new organization for Training classes This also moves a few of the documents from API Guides > Best Practices into the new courses for best practices. This is also dependent on CL Ieac8a97a8d6fda41a3682241901150cfe16afc4d which generates the list of classes/lessons on each course landing page.
 2012-11-14 17:38:15 -08:00
Scott Main
22cc2764cc implement new organization for Training classes 
This also moves a few of the documents from API Guides > Best Practices
into the new courses for best practices.
This is also dependent on CL Ieac8a97a8d6fda41a3682241901150cfe16afc4d
which generates the list of classes/lessons on each course landing page.

Change-Id: I8132f72f78d844c3b035c7aa269ad3b88a25d02a
 2012-11-14 17:30:24 -08:00
kmccormick@google.com
39cc8f8079 am 4233c939: Merge "Doc Update: param name change" into jb-dev-docs 
* commit '4233c939014c39ce9d95556db1b654e906f8ce5b':
  Doc Update: param name change
 2012-11-12 15:00:12 -08:00
&& repo sync -j8
4233c93901 Merge "Doc Update: param name change" into jb-dev-docs 2012-11-12 14:56:58 -08:00
&& repo sync -j8
2128ec9892 Doc Update: param name change 
Change-Id: I320374f8d40ba090a561fe173bb08837abaa263a
 2012-11-12 14:45:08 -08:00
Joe Fernandez
1c350fa458 am cee5dab6: Merge "docs: JOBB tool help page" into jb-dev-docs 
* commit 'cee5dab6752a9e793f620981014f3b7cc4f8c137':
  docs: JOBB tool help page
 2012-11-12 14:29:08 -08:00
Joe Fernandez
cee5dab675 Merge "docs: JOBB tool help page" into jb-dev-docs 2012-11-12 14:25:55 -08:00
kmccormick@google.com
856e24d82a am fa2dbd69: Merge "Doc change: GCM category & dry_run params" into jb-dev-docs 
* commit 'fa2dbd693c3ffebd806cbbb4f708f754d58423ed':
  Doc change: GCM category & dry_run params
 2012-11-06 15:56:25 -08:00
&& repo sync -j8
fa2dbd693c Merge "Doc change: GCM category & dry_run params" into jb-dev-docs 2012-11-06 10:38:45 -08:00
Robert Ly
0fc15da005 am 677c1e14: Merge "docs: google market -> google play" into jb-dev-docs 
* commit '677c1e14fbd991a46b5496d0873b7ca155fd71fb':
  docs: google market -> google play
 2012-11-01 14:16:47 -07:00
Robert Ly
677c1e14fb Merge "docs: google market -> google play" into jb-dev-docs 2012-11-01 14:14:26 -07:00
Joe Malin
d2e163461e am ac294abb: Revision to Notifications API guide 
* commit 'ac294abb40483fc734e22833371d95cbb161ec87':
  Revision to Notifications API guide
 2012-11-01 13:55:08 -07:00
Joe Malin
ac294abb40 Revision to Notifications API guide 
Change-Id: I52229dfdff3649e03a1fbce91234c8b2a544502a
 2012-11-01 12:57:58 -07:00
Joe Fernandez
e4ba91d228 docs: JOBB tool help page 
Change-Id: I0651c0080cb8bb2436591247d72dfe7be66061f5
 2012-10-25 22:14:41 -07:00
&& repo sync -j8
eb1e7eac9f Doc change: GCM category & dry_run params 
Bug # 7171849

Change-Id: Ifde95a058fc90b777faf3d43d34a72b048e20126
 2012-10-22 13:57:14 -07:00
Scott Main
4a6b69488f am 07322102: revise code sample for callback interface 
* commit '07322102e5f1877bc2860d2c72eeeb41839d6bea':
  revise code sample for callback interface
 2012-10-18 12:18:31 -07:00
Scott Main
07322102e5 revise code sample for callback interface 
Change-Id: I8e27e2579dcc5cb84a71c74769fb89bb639e16ba
 2012-10-17 15:40:53 -07:00
Robert Ly
dd5c182ad9 docs: google market -> google play 
Change-Id: I546a0c07920612a3fa31a2507c934a28c4d9f419
 2012-10-17 11:50:40 -07:00
Scott Main
a7b56a20ec am e249763d: small update to Toast guide, flatten sidenav for notifications/toasts, new screenshots for notifications 
* commit 'e249763db18bb445e93f493046946c13185aa09d':
  small update to Toast guide, flatten sidenav for notifications/toasts, new screenshots for notifications
 2012-10-12 14:12:07 -07:00
Scott Main
e249763db1 small update to Toast guide, flatten sidenav for notifications/toasts, 
new screenshots for notifications

Change-Id: I0c02e9e6db70a60ca299ff7f0caa7c8276b7ab68
 2012-10-12 12:06:10 -07:00
Joe Malin
5832d1ce72 am 01154bda: DOC CHANGE: Notifications Guide 
* commit '01154bdae9d6f3d1fbed3169ffa194d51045c9cf':
  DOC CHANGE: Notifications Guide
 2012-10-11 17:38:46 -07:00
Joe Malin
01154bdae9 DOC CHANGE: Notifications Guide 
Change-Id: I7968e933b0fdc5b1de1aa24acbad4f65f183ca42
 2012-10-11 16:55:12 -07:00
Katie McCormick
fa4865f680 resolved conflicts for merge of 0b479e43 to jb-dev 
Change-Id: I04bc45425f11b3562a4219719716c55eaff2228e
 2012-10-10 11:09:03 -07:00
&& repo sync -j8
0b479e4379 Merge "Doc changes: misc GCM updates." into jb-dev-docs 2012-10-10 10:34:48 -07:00
&& repo sync -j8
4fd6c20b17 Doc changes: misc GCM updates. 
Change-Id: I12e7ae6c4b52b8aa54dc355d09916c3b4499f172
 2012-10-09 14:30:41 -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
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
Scott Main
78866b71e6 Merge "Doc update: TTL change." into jb-dev-docs 2012-10-04 10:20: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
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
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
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
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
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
19a39686b7 am b79d8ecc: udpate media formats for JB 
* commit 'b79d8ecc27c0c7a8c2f8dcc1a752450e4d7d39e2':
  udpate media formats for JB
 2012-09-19 11:00:23 -07:00