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

45045 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Eric Fischer
5f6166b757 am c3e3cc3d: (-s ours) am ebcbde6a: Merge "Import revised translations. DO NOT MERGE" into honeycomb 
* commit 'c3e3cc3dee2a6a20fabbf98496ae1d9ddedc897c':
  Import revised translations.  DO NOT MERGE
 2011-02-09 10:52:11 -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
Glenn Kasten
dbc289d6c2 Bug 3438513 Fix incorrect throws clause 
Change-Id: Ib47c12b2b03b0b03d8df69f1b943839283c9f867
 2011-02-09 10:38:39 -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
Patrick Scott
fa8be1cccc Call window.onscroll event at the end of scrolling. 
Remove some old cruft code that isn't necessary anymore.  We almost always send
the scroll event to webkit except when restoring the scroll position when going
back.

I have verified that the scroll position is restored when going between pages
and that gmail receives the final scroll position.

Bug: 3187015
Change-Id: I0b1dfd1096d44247729bdd13bdad908310c2f19a
 2011-02-09 12:42:55 -05: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
Daniel Sandler
b6dd088a3b Merge "Bringing back the pocket." 2011-02-09 06:19:58 -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
Vasu Nori
61eadaa6c3 Merge "bug:3435895 change a couple of retryable error constants to < 400" 2011-02-08 22:01:39 -08: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
397c659273 am 4fd30641: Merge "resolved conflicts for merge of e04c1496 to honeycomb-plus-aosp" into honeycomb-plus-aosp 
* commit '4fd30641a9a82ae3bfbc59473e8ea4e9691a7c39':
  Double tap triggers text selection in a TextView. DO NOT MERGE
 2011-02-08 20:41:35 -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
Mike Lockwood
0a8bfd1b3b Merge "MTP: Fix NPE in MtpPropertyGroup" 2011-02-08 19:00:32 -08:00
Scott Main
9bcc2a748b am 5988355a: am 3f41d8f5: docs: fix a couple titles 
* commit '5988355af4635094a99e408ce4199e9d19af6f9e':
  docs: fix a couple titles
 2011-02-08 18:51:32 -08: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
Mike Lockwood
fd22edc668 MTP: Fix NPE in MtpPropertyGroup 
Change-Id: I65fbd3f2f62724434136c6ae310e6647884902d2
Signed-off-by: Mike Lockwood <lockwood@android.com>
 2011-02-08 21:45:22 -05:00
Scott Main
6edbd32835 am 2b7aec46: am f002b675: Merge "docs: shorten and revise some titles in the Developing docs and resolve respective links" into honeycomb 
* commit '2b7aec46639ffb3242eb1ac6d557c87e68442438':
  docs: shorten and revise some titles in the Developing docs and resolve respective links
 2011-02-08 18:42:01 -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
Dmitri Plotnikov
cdf228cf87 Merge "Full text search: new API, deprecating old API." 2011-02-08 18:14:40 -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
Vasu Nori
0ba3055b1e bug:3435895 change a couple of retryable error constants to < 400 
so that they are not considered permanent failures

Change-Id: I4513e6abcce127f78b5be98ab78c985ed698e43e
 2011-02-08 17:18:27 -08:00
Christopher Tate
0b6b6fcf20 Merge "Align inexact alarms in both time bases; don't pull to wall time" 2011-02-08 17:15:37 -08:00
Joe Malin
b1508a2078 am 9087566b: am 7777fb04: Merge "DOC CHANGE: Fix bug 3416872 in MonkeyRunner doc" into honeycomb 
* commit '9087566bf1d6b2b7d7a0d3112732113400f6ec47':
  DOC CHANGE: Fix bug 3416872 in MonkeyRunner doc
 2011-02-08 17:01:35 -08:00
Christopher Tate
b8849c1e85 Align inexact alarms in both time bases; don't pull to wall time 
The previous implementation failed to properly distinguish between
trigger times in the RTC vs the ELAPSED time bases.  The pernicious
result of this was that sometimes it would decide to align RTC
alarms based on, say, 0 rather than on the real current time.
This would pull the recurrence into wall-clock alignment, with
serious side effects: in particular, periodic tasks that would hit
external network resources would, because *all* devices would be
pulled into wall-clock alignment, wind up inducing heavy QPS
spikes on the backends.

The new implementation works completely differently.  The basic
goal is the same: try to align inexact alarms to "the same" time,
avoiding extra wakeups / radio spinups / etc.  The way this is done
is to divide the timeline into 15-minute quanta, and drift the start
time of every inexact alarm onto one of these 15-minute quantum
boundaries.  The skew between the RTC and ELAPSED time bases is
taken into effect; RTC alarms are no longer pulled into wall clock
alignment.

Fixes bug 3388961

Change-Id: I2a0460e1f5d0e4036f3402f332b642b557b2fc20
 2011-02-08 16:59: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
Adam Powell
a1ea2c8457 Merge "Fix bug 3345948 - ActionBar.show()/hide() shouldn't animate if called before first layout" 2011-02-08 16:32:54 -08:00