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

43228 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Alex Sakhartchouk
85bccf6e0b am 699a0969: Merge "DO NOT MERGE Removing an activity that shouldn\'t go into samples" into honeycomb 
* commit '699a0969434b6ee434dd9f5f212fe1bb914fdf0d':
  DO NOT MERGE Removing an activity that shouldn't go into samples
 2011-02-09 15:23:54 -08:00
Dirk Dougherty
e05bd9ee7f am 0e40519b: Merge "Doc change: add diff report for API 11" into honeycomb 
* commit '0e40519beefe3d2ea0870a8eecac1a58f1fb6403':
  Doc change: add diff report for API 11
 2011-02-09 15:21:49 -08:00
Alex Sakhartchouk
699a096943 Merge "DO NOT MERGE Removing an activity that shouldn't go into samples" into honeycomb 2011-02-09 15:20:21 -08:00
Dirk Dougherty
0e40519bee Merge "Doc change: add diff report for API 11" into honeycomb 2011-02-09 15:19:08 -08:00
Dirk Dougherty
e110975368 am fefa95a9: Doc change: Add version notes for Android 2.3.3. 
* commit 'fefa95a9c828d2b67227894b7ee3979504c0f52a':
  Doc change: Add version notes for Android 2.3.3.
 2011-02-09 14:20:06 -08:00
Gilles Debunne
2050de5b9a Text selection is broken. 
Bug 3439569

Lazy initialization code was not back-ported.

Change-Id: I9815f649891e2ddc602383488749144686ab1dd3
 2011-02-09 14:17:22 -08:00
Dirk Dougherty
fefa95a9c8 Doc change: Add version notes for Android 2.3.3. 2011-02-09 14:04:10 -08:00
Wink Saville
bdce3d2c35 am 01a5eba8: am 6e25789f: Merge "Telephony: Fix cb sms implementation" 
* commit '01a5eba810bfdf5b111a7546814e174c1d57b6e7':
  Telephony: Fix cb sms implementation
 2011-02-09 13:45:37 -08:00
Wink Saville
01a5eba810 am 6e25789f: Merge "Telephony: Fix cb sms implementation" 
* commit '6e25789fbe7ac283021156b17f406acb48850292':
  Telephony: Fix cb sms implementation
 2011-02-09 13:42:45 -08:00
Mathias Agopian
bfe9e9cf18 am cc24170d: Merge "fix [3374821] Cannot take screenshot of HC preview" into honeycomb 
* commit 'cc24170dc653ea5fc9fe7b9b8c596700c4d6dc99':
  fix [3374821] Cannot take screenshot of HC preview
 2011-02-09 13:22:46 -08:00
Mathias Agopian
cc24170dc6 Merge "fix [3374821] Cannot take screenshot of HC preview" into honeycomb 2011-02-09 13:18:53 -08:00
Wink Saville
6e25789fbe Merge "Telephony: Fix cb sms implementation" 2011-02-09 13:09:24 -08:00
Mathias Agopian
d0f27f435e am ada1b6f2: Merge "fix [3421350] Killing a game that uses the accelerometer renders the device unable to sleep" into gingerbread 
* commit 'ada1b6f297596cac4451edbc83df060a31cdda68':
  fix [3421350] Killing a game that uses the accelerometer renders the device unable to sleep
 2011-02-09 13:09:12 -08:00
Mathias Agopian
ada1b6f297 Merge "fix [3421350] Killing a game that uses the accelerometer renders the device unable to sleep" into gingerbread 2011-02-09 13:06:00 -08:00
Scott Main
b605869cd3 am 07cefd3c: add 2.3.3 announcement to site home page 
* commit '07cefd3cc3d8d27750e4fc725d9aec86250750dd':
  add 2.3.3 announcement to site home page
 2011-02-09 13:03:11 -08:00
Dirk Dougherty
bf5cde2f71 am be04bfd0: am 01967c0e: Merge "Doc change: Add diff report for api 10." into gingerbread 
* commit 'be04bfd09914bbabf715959170c32030072b65f4':
  Doc change: Add diff report for api 10.
 2011-02-09 12:19:54 -08:00
Gilles Debunne
54afc818af am 63bd55c7: am cdfe8999: Fix for multiple merge problem. 
* commit '63bd55c7bf6f5d9384ad25637a4f4a7d2ef8d441':
  Fix for multiple merge problem.
 2011-02-09 12:19:46 -08:00
Eric Fischer
c3e3cc3dee am ebcbde6a: Merge "Import revised translations. DO NOT MERGE" into honeycomb 
* commit 'ebcbde6a6e5a8da947a3f28eba7207256b891fdd':
  Import revised translations.  DO NOT MERGE
 2011-02-09 10:47:47 -08:00
Scott Main
07cefd3cc3 add 2.3.3 announcement to site home page 
Change-Id: I4323a1a30fad8a67cce55baba9f7a89c4bdd4494
 2011-02-09 10:17:08 -08:00
Eric Fischer
ebcbde6a6e Merge "Import revised translations. DO NOT MERGE" into honeycomb 2011-02-09 10:11:18 -08:00
Alex Sakhartchouk
f82428a932 Cleanup of the code in view to do creation/destruction in the right places. 
Change-Id: I1c87682cc2c35ad5ee15c06cd78f48b612668181
 2011-02-09 08:59:32 -08:00
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