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

43257 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Alex Sakhartchouk
d9349abdaa DO NOT MERGE 
Removing an activity that shouldn't go into samples

Change-Id: I00025770d926af2dbf399d28f8e855568e260b8b
 2011-02-09 08:53:32 -08:00
Jeff Hamilton
c1cc9ba6d1 am 58c9d472: Merge "More documentation updates for NFC." into gingerbread 
* commit '58c9d4726ebf3165b0dbbcebb1130dfc5502bfe9':
  More documentation updates for NFC.
 2011-02-09 00:36:53 -08:00
Jeff Hamilton
58c9d4726e Merge "More documentation updates for NFC." into gingerbread 2011-02-09 00:34:22 -08:00
Jeff Hamilton
28319c0cec More documentation updates for NFC. 
Change-Id: Ie134d4296ee12333e6647ce76126f9767ba1ba34
 2011-02-09 17:26:47 +09:00
Dirk Dougherty
8d56f6decf am a3f53afd: Merge "Doc change: Add version notes for Android 2.3.3." into gingerbread 
* commit 'a3f53afd13bc1722464e169cb82a01d3898852b5':
  Doc change: Add version notes for Android 2.3.3.
 2011-02-08 23:27:53 -08:00
Nick Pelly
47dac545da am 39cf3a44: Document NFC permissions. 
* commit '39cf3a445e507f219ecc8a476f6038f095d9d520':
  Document NFC permissions.
 2011-02-08 23:25:29 -08:00
Dirk Dougherty
a3f53afd13 Merge "Doc change: Add version notes for Android 2.3.3." into gingerbread 2011-02-08 23:24:22 -08:00
Nick Pelly
39cf3a445e Document NFC permissions. 
Change-Id: Ib1b1625058c9c673692f3fbcb3546ec7c2d54a07
 2011-02-09 16:10:46 +09:00
Mathias Agopian
9afc7b02fa fix [3374821] Cannot take screenshot of HC preview 
the screencap tool will now fallback to /dev/graphics/fb0 is the
screenshot API fails.

Change-Id: I3f593847c72f4ca5429d4f64ca22bd5436dd2051
 2011-02-08 20:43:00 -08:00
Gilles Debunne
4fd30641a9 Merge "resolved conflicts for merge of e04c1496 to honeycomb-plus-aosp" into honeycomb-plus-aosp 2011-02-08 20:38:59 -08:00
Gilles Debunne
a8b94925ab resolved conflicts for merge of e04c1496 to honeycomb-plus-aosp 
Change-Id: I59886953b76857ab0a089947e1c5335b93f68d5e
 2011-02-08 20:36:04 -08:00
Dirk Dougherty
237a3440d3 Doc change: Add version notes for Android 2.3.3. 
Change-Id: I32dffaee15079a3dffb30dcdff6587be03378fc5
 2011-02-08 20:10:51 -08:00
Jeff Hamilton
1ac35411f1 am 584afa8d: Merge "Improve the docs a bit for foreground dispatch." into gingerbread 
* commit '584afa8dde1777b181e773a491416769f25607a8':
  Improve the docs a bit for foreground dispatch.
 2011-02-08 19:33:53 -08:00
Jeff Hamilton
584afa8dde Merge "Improve the docs a bit for foreground dispatch." into gingerbread 2011-02-08 19:30:47 -08:00
Jeff Hamilton
167d9e473f Improve the docs a bit for foreground dispatch. 
Change-Id: I4179133a0956bc66a49201c20f1dd2d6d67874d2
 2011-02-09 12:30:18 +09:00
Scott Main
5988355af4 am 3f41d8f5: docs: fix a couple titles 
* commit '3f41d8f5ee1a8d5366d79ee03d97fac8403c676a':
  docs: fix a couple titles
 2011-02-08 18:48:53 -08:00
Scott Main
3f41d8f5ee docs: fix a couple titles 
Change-Id: I1c2d6c420f814e1ddff5f661214cbbd11f3ca6dd
 2011-02-08 18:46:23 -08:00
Scott Main
2b7aec4663 am f002b675: Merge "docs: shorten and revise some titles in the Developing docs and resolve respective links" into honeycomb 
* commit 'f002b6752562a442c934bdf7c04cb0fedc24d442':
  docs: shorten and revise some titles in the Developing docs and resolve respective links
 2011-02-08 18:39:24 -08:00
Scott Main
f002b67525 Merge "docs: shorten and revise some titles in the Developing docs and resolve respective links" into honeycomb 2011-02-08 18:36:04 -08:00
Eric Fischer
b8a036307a Import revised translations. DO NOT MERGE 
Change-Id: I989585acd6f901a82e8db9b07257af5a5736989e
 2011-02-08 18:00:38 -08:00
Eric Fischer
c1c3143347 am be4b39d2: Merge "Import revised translations. DO NOT MERGE" into gingerbread 
* commit 'be4b39d2fde3d34539752b99238ceebd97ccf580':
  Import revised translations.  DO NOT MERGE
 2011-02-08 17:32:18 -08:00
Scott Main
129c73723f am 3c01a139: rename SIP doc title 
* commit '3c01a139f0d8ece0e300be26ac41280f1e934747':
  rename SIP doc title
 2011-02-08 17:32:14 -08:00
Scott Main
42f1819497 am c442bc60: docs: move the SIP guide into guide/network/ 
* commit 'c442bc605c80a2900a0ed41345f53d218288de7a':
  docs: move the SIP guide into guide/network/
 2011-02-08 17:32:06 -08:00
Katie McCormick
690d31a6a8 am 7134520b: cherrypick Change-Id: I5b52c5d11e111a9dab2b08fd44a439ab4db04dd2 Doc change: Adding new docs for SIP API 
* commit '7134520b2635474c5e7f4902c26e12d0ffcc9c64':
  cherrypick Change-Id: I5b52c5d11e111a9dab2b08fd44a439ab4db04dd2 Doc change: Adding new docs for SIP API
 2011-02-08 17:31:59 -08:00
Dirk Dougherty
be04bfd099 am 01967c0e: Merge "Doc change: Add diff report for api 10." into gingerbread 
* commit '01967c0ee104e985167374e41f2c416c1100f767':
  Doc change: Add diff report for api 10.
 2011-02-08 17:31:54 -08:00
Gilles Debunne
63bd55c7bf am cdfe8999: Fix for multiple merge problem. 
* commit 'cdfe899991c365d9e197d83f8859089cae082011':
  Fix for multiple merge problem.
 2011-02-08 17:31:33 -08:00
Alex Yakavenka
f7de51cc4d Telephony: Fix cb sms implementation 
Change-Id: Ie2a678e3ab99f0d5b9dd68cc4a79e1c5a58ecbe2
 2011-02-08 17:18:46 -08:00
Joe Malin
9087566bf1 am 7777fb04: Merge "DOC CHANGE: Fix bug 3416872 in MonkeyRunner doc" into honeycomb 
* commit '7777fb04f1bdb11628ef8978c42b14e51ebb9c56':
  DOC CHANGE: Fix bug 3416872 in MonkeyRunner doc
 2011-02-08 16:58:22 -08:00
Joe Malin
7777fb04f1 Merge "DOC CHANGE: Fix bug 3416872 in MonkeyRunner doc" into honeycomb 2011-02-08 16:55:53 -08:00
Gilles Debunne
e04c14962f resolved conflicts for merge of c0728cc0 to gingerbread-plus-aosp 
Change-Id: I1b941e0610e498365d441c7bd23af276d1b5f986
 2011-02-08 16:33:58 -08:00
Scott Main
300cd26a4f docs: shorten and revise some titles in the Developing docs 
and resolve respective links

Change-Id: Ic78e859eaad99fc391857676a6aff63a655e72ca
 2011-02-08 15:04:42 -08:00
Scott Main
91c1b18533 am b70afd34: docs: remove and correct parent links for fundamental docs and hide the "beginner\'s path" because it\'s not complete 
* commit 'b70afd342b658d23518e0fa69aff9e45ec01e222':
  docs: remove and correct parent links for fundamental docs and hide the "beginner's path" because it's not complete
 2011-02-08 14:57:50 -08:00
Scott Main
3c5653773d am b508d6e2: Merge "docs: fix links to revised fundamentals documents" into honeycomb 
* commit 'b508d6e26e3a1fd68bf637dc29df335f0e7ccd92':
  docs: fix links to revised fundamentals documents
 2011-02-08 14:57:45 -08:00
Jason Sams
e2b2a02a91 am 4fd70373: Merge "Fix bug 3421901 remove 2 functions from public headers in the SDK." into honeycomb 
* commit '4fd70373ecafbf5a87a1c35852aec2818612e928':
  Fix bug 3421901 remove 2 functions from public headers in the SDK.
 2011-02-08 14:57:35 -08:00
Dirk Dougherty
81f4f8d0f9 am 50b7d70f: Merge "Cherrypick from gb: Doc change: Add diff report for api 10." into honeycomb 
* commit '50b7d70fb425daf6b2ead747df6634040d1bbf1b':
  Cherrypick from gb: Doc change: Add diff report for api 10.
 2011-02-08 14:57:25 -08:00
Xavier Ducrohet
024bbea215 am dc3fc3dc: Merge "LayoutLib: fix the background of title/action bars." into honeycomb 
* commit 'dc3fc3dc2717461113a2963c224cb190457599d8':
  LayoutLib: fix the background of title/action bars.
 2011-02-08 14:57:19 -08:00
Scott Main
b70afd342b docs: remove and correct parent links for fundamental docs 
and hide the "beginner's path" because it's not complete

Change-Id: I2f2a201a6571da6f660eb78f6ece94e47a5cddd1
 2011-02-08 14:05:54 -08:00
Scott Main
b508d6e26e Merge "docs: fix links to revised fundamentals documents" into honeycomb 2011-02-08 13:34:51 -08:00
Jason Sams
4fd70373ec Merge "Fix bug 3421901 remove 2 functions from public headers in the SDK." into honeycomb 2011-02-08 12:07:49 -08:00
Dirk Dougherty
f343d3df00 Doc change: add diff report for API 11 
Change-Id: I4cd673d1316e6f7b81ec56510029b738cd12a295
 2011-02-08 11:42:32 -08:00
Scott Main
7aee61f5a9 docs: fix links to revised fundamentals documents 
Change-Id: Ie2a660cce1d00f924c9fde5c6a00776307e5e1c7
 2011-02-08 11:37:44 -08:00
Dirk Dougherty
50b7d70fb4 Merge "Cherrypick from gb: Doc change: Add diff report for api 10." into honeycomb 2011-02-08 11:04:41 -08:00
Xavier Ducrohet
dc3fc3dc27 Merge "LayoutLib: fix the background of title/action bars." into honeycomb 2011-02-08 11:03:43 -08:00
Dirk Dougherty
920cc81420 Cherrypick from gb: Doc change: Add diff report for api 10. 2011-02-08 11:02:11 -08:00
Eric Fischer
1e09ca2a1f am c7bece13: Merge "Import revised translations. DO NOT MERGE" into honeycomb 
* commit 'c7bece13495949db1736263a7cf5cf67c6165c51':
  Import revised translations.  DO NOT MERGE
 2011-02-08 10:40:47 -08:00
Eric Fischer
c7bece1349 Merge "Import revised translations. DO NOT MERGE" into honeycomb 2011-02-08 10:34:23 -08:00
Scott Main
fd5c86cd1d am 7d9d8efe: cherrypick Change-Id: I14aa36bc617ef77c20804c868caa8bf85b0fb5f8 rename SIP doc title 
* commit '7d9d8efebab9bda05cdb7733374723e1e3787d7c':
  cherrypick Change-Id: I14aa36bc617ef77c20804c868caa8bf85b0fb5f8 rename SIP doc title
 2011-02-08 10:32:12 -08:00
Scott Main
2d258298e2 am 96764812: cherrypick Change-Id: I3c2a7ea731d2fc3c0e2372e2f1a06ed659a6539f docs: move the SIP guide into guide/network/ 
* commit '967648121d3857b808941848203dfa44229781d7':
  cherrypick Change-Id: I3c2a7ea731d2fc3c0e2372e2f1a06ed659a6539f docs: move the SIP guide into guide/network/
 2011-02-08 10:32:08 -08:00
Katie McCormick
e056d2ad42 am 6b311196: cherrypick Change-Id: I5b52c5d11e111a9dab2b08fd44a439ab4db04dd2 Doc change: Adding new docs for SIP API 
* commit '6b31119612a1b357c3675fce0111a1c69a15c2d2':
  cherrypick Change-Id: I5b52c5d11e111a9dab2b08fd44a439ab4db04dd2 Doc change: Adding new docs for SIP API
 2011-02-08 10:32:05 -08:00
Scott Main
61e5396616 am 91e1ae55: cherrypick Change-Id: I6053e6f20045b0ecba4b964f9bfb87c3241d3a91 update dashboard 
* commit '91e1ae5510c26bc6a7265e0d62ab7bbf83a6251d':
  cherrypick Change-Id: I6053e6f20045b0ecba4b964f9bfb87c3241d3a91 update dashboard
 2011-02-08 10:32:01 -08:00