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

2012 Commits

Author SHA1 Message Date
Joe Malin
01154bdae9 DOC CHANGE: Notifications Guide 
Change-Id: I7968e933b0fdc5b1de1aa24acbad4f65f183ca42
 2012-10-11 16:55:12 -07:00
Katie McCormick
1dbce5f1e5 am 05ab277c: am fa4865f6: resolved conflicts for merge of 0b479e43 to jb-dev 
* commit '05ab277c21731ab11333c56d7d2266b9b1c4d46d':
  Doc changes: misc GCM updates.
 2012-10-10 16:09:41 -07:00
Katie McCormick
05ab277c21 am fa4865f6: resolved conflicts for merge of 0b479e43 to jb-dev 
* commit 'fa4865f680cc151ff051b7a82fb0e94145d70377':
  Doc changes: misc GCM updates.
 2012-10-10 16:06:19 -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
0f31450fe0 am fba8b7f5: am f19e4b42: Merge "docs: nfc ndef helper methods bug 5957772" into jb-dev 
* commit 'fba8b7f5963cb2bc15f06d83d986345978cc415e':
  docs: nfc ndef helper methods bug 5957772
 2012-10-09 11:42:14 -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
3b9e7f3238 am fb554fc0: am b049b1ef: am 46c4b488: Doc change: Subscriptions free trials on Google Play. 
* commit 'fb554fc0bf46b17314df26bdfb683c580b18f214':
  Doc change: Subscriptions free trials on Google Play.
 2012-10-09 10:39:06 -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
Scott Main
78866b71e6 Merge "Doc update: TTL change." into jb-dev-docs 2012-10-04 10:20:13 -07:00
Scott Main
ab781ba0f0 am d4c18b01: am b31d0b3b: am d2e9486b: Merge "re-write the Dialog guide to focus on using DialogFragment" into jb-dev-docs 
* commit 'd4c18b01cc152f97ea30146d0ad795c05b59e178':
  re-write the Dialog guide to focus on using DialogFragment
 2012-10-03 16:18:23 -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
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
a22f081ab4 am b847f0b5: am 04c63a40: docs: android training - Data Storage 
* commit 'b847f0b578d861647be4908fc3a8d575ba4d726b':
  docs: android training - Data Storage
 2012-10-02 15:34:12 -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
fd3398c8bf am 44c564f2: am d8104d9b: am 829986a5: Merge "DOC CHANGE: Fix Google Play services page" into jb-dev-docs 
* commit '44c564f251653286f3d2b8608ff5fccba39e831f':
  DOC CHANGE: Fix Google Play services page
 2012-09-26 12:48:58 -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
80c491f07a am 16eb5366: am 54645245: am 14a36625: fix markup bugs 
* commit '16eb53668bc000c9d6cdd9c2dd68e51f16483d25':
  fix markup bugs
 2012-09-26 11:39:54 -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
Elliott Hughes
0cd016741d Attempt to clarify how pluralization actually works. 
Many languages are very unlike English.

Bug: 7229680
Change-Id: I3a2b9d10ee7d92b0a0bc47d81bd372fd8ce6ba19
 2012-09-25 16:15:35 -07:00
Eino-Ville Talvala
a91c9f9f7a Merge "Unhide and document feature android.hardware.camera.any." into jb-mr1-dev 2012-09-23 10:14:22 -07:00
Scott Main
ec501466ea am 2e642866: am be676b6c: am 4a5425db: fix layout bug 
* commit '2e6428668c97826e169e51ac5d0a7c6e8ba3bd79':
  fix layout bug
 2012-09-21 16:03:39 -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
5580005cc7 am 9198495b: am 19a39686: am b79d8ecc: udpate media formats for JB 
* commit '9198495b2767c507eb983f94b0449f23516240db':
  udpate media formats for JB
 2012-09-19 11:27:42 -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
Eino-Ville Talvala
72b4db15b6 Unhide and document feature android.hardware.camera.any. 
Bug: 6847310
Change-Id: I67a973dccfdc735aac457fce625003a386ff2fbe
 2012-09-18 17:47:23 -07:00
Nick Kralevich
5b1c8d33a7 Adjust FAQ. 
Change-Id: Ibab0e4be3b351bfcf3d759c3ddc77240334d9bfa
 2012-09-17 13:59:58 -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