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

20478 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Wu-cheng Li
a369ad0302 am 4d47e1b1: am 0ca25191: Add some comments for zoom methods. 2010-03-29 10:25:46 -07:00
Grace Kloba
4a4f9886a7 Use the content width to calculate the zoom overview 
width. We used to use the minimum preferred width
to calculate the overview width as it is what we
use to define the viewport width. But some sites,
like cbsnews, engadget, the content width will be
slightly wider than the viewport width decided by
the min preferred width. The result is we can still
scroll a little bit in the overview mode. This issue
is magnified when we introduce the overscroll feature.

By using content width as zoom overview width, we
will have content fit in the overview mode. But
some sites, like
"http://www.sfjazz.org/concerts/2010/spring/artists/towner.php"
will be layout wider in the overview mode than it
is in the zoom in state. This is a tradeoff.

Fix http://b/issue?id=2551119
 2010-03-29 09:24:02 -07:00
Wu-cheng Li
4d47e1b16b am 0ca25191: Add some comments for zoom methods. 
Merge commit '0ca25191c663ef229f1f475b17899f2017ed6980' into kraken

* commit '0ca25191c663ef229f1f475b17899f2017ed6980':
  Add some comments for zoom methods.
 2010-03-29 02:08:09 -07:00
Wu-cheng Li
0ca25191c6 Add some comments for zoom methods. 
Also change RuntimeException to IllegalArgumentException.
bug:2458926

Change-Id: I87af31f5f3f10244131a1117bd1725c2d292b587
 2010-03-29 16:21:12 +08:00
Jack Palevich
e70f0c0198 am 8cab04f0: am 4a65900c: Turn off logging. 2010-03-27 15:17:13 -07:00
Jack Palevich
8cab04f010 am 4a65900c: Turn off logging. 
Merge commit '4a65900cd69b79e6e47d275575eaeb5bb2487f9f' into kraken

* commit '4a65900cd69b79e6e47d275575eaeb5bb2487f9f':
  Turn off logging.
 2010-03-27 15:12:31 -07:00
Jack Palevich
4a65900cd6 Turn off logging. 2010-03-27 15:02:59 -07:00
Dirk Dougherty
fc23112643 am f459bde9: am 7205b0fc: Merge "cherry-pick 7d39f981badf7ec75138d6ef97d37c57a63ab5f0 to froyo." into froyo 2010-03-27 13:19:17 -07:00
Dianne Hackborn
31f805ac2f am 54ca402c: am 4c8a63ca: Merge "Fix issue #2538228: Intents targeting browsers constantly nagging" into froyo 2010-03-27 13:19:13 -07:00
Dirk Dougherty
dc512f4427 am ee419b40: am 5c2a502b: cherry-pick 72aadeb013548cfdc317b5f6fec9dab9551911b8 to froyo. 2010-03-27 13:19:10 -07:00
Dirk Dougherty
2b5172e480 am f9b2ad0a: am 1f196f29: Merge "cherry-pick af4786bcb5945f72e8639d74611cd5f9b0236710 to froyo" into froyo 2010-03-27 13:19:07 -07:00
Dirk Dougherty
f459bde976 am 7205b0fc: Merge "cherry-pick 7d39f981badf7ec75138d6ef97d37c57a63ab5f0 to froyo." into froyo 
Merge commit '7205b0fcb43e9309e2516420d235a1df0b3cd04a' into kraken

* commit '7205b0fcb43e9309e2516420d235a1df0b3cd04a':
  cherry-pick 7d39f981badf7ec75138d6ef97d37c57a63ab5f0 to froyo.
 2010-03-27 13:08:53 -07:00
Dianne Hackborn
54ca402c25 am 4c8a63ca: Merge "Fix issue #2538228: Intents targeting browsers constantly nagging" into froyo 
Merge commit '4c8a63ca4d4ac18f593fd9c235f18ba1f691eef7' into kraken

* commit '4c8a63ca4d4ac18f593fd9c235f18ba1f691eef7':
  Fix issue #2538228: Intents targeting browsers constantly nagging
 2010-03-27 13:08:50 -07:00
Dirk Dougherty
ee419b40eb am 5c2a502b: cherry-pick 72aadeb013548cfdc317b5f6fec9dab9551911b8 to froyo. 
Merge commit '5c2a502bffc05d54c8de3456fee5aec5b99ff3e9' into kraken

* commit '5c2a502bffc05d54c8de3456fee5aec5b99ff3e9':
  cherry-pick 72aadeb013548cfdc317b5f6fec9dab9551911b8 to froyo.
 2010-03-27 13:08:48 -07:00
Dirk Dougherty
f9b2ad0ab0 am 1f196f29: Merge "cherry-pick af4786bcb5945f72e8639d74611cd5f9b0236710 to froyo" into froyo 
Merge commit '1f196f29127f9a05d0bd0553d2f3db2ad983df14' into kraken

* commit '1f196f29127f9a05d0bd0553d2f3db2ad983df14':
  cherry-pick af4786bcb5945f72e8639d74611cd5f9b0236710 to froyo
 2010-03-27 13:08:44 -07:00
Dirk Dougherty
7205b0fcb4 Merge "cherry-pick 7d39f981badf7ec75138d6ef97d37c57a63ab5f0 to froyo." into froyo 2010-03-26 18:25:05 -07:00
Katie McCormick
913cbccb66 cherry-pick 7d39f981badf7ec75138d6ef97d37c57a63ab5f0 to froyo. 
Change-Id: I670cd996a54602b70469b3b6883cce5a2c6d113f
 2010-03-26 18:13:29 -07:00
Dianne Hackborn
4c8a63ca4d Merge "Fix issue #2538228: Intents targeting browsers constantly nagging" into froyo 2010-03-26 18:06:52 -07:00
Dirk Dougherty
5c2a502bff cherry-pick 72aadeb013548cfdc317b5f6fec9dab9551911b8 to froyo. 
Change-Id: Ic205588bb0ecd5660b8c8949da88fbae6981f416
 2010-03-26 17:53:41 -07:00
Dirk Dougherty
1f196f2912 Merge "cherry-pick af4786bcb5945f72e8639d74611cd5f9b0236710 to froyo" into froyo 2010-03-26 17:50:26 -07:00
Romain Guy
027ec01c46 am dcb11669: am 213b9805: Merge "Don\'t assume there\'s a selected position in touch mode. Bug #2520743" into froyo 2010-03-26 17:42:34 -07:00
Romain Guy
dcb116690c am 213b9805: Merge "Don\'t assume there\'s a selected position in touch mode. Bug #2520743" into froyo 
Merge commit '213b9805e31ae9de26c740c04e04af2090759e52' into kraken

* commit '213b9805e31ae9de26c740c04e04af2090759e52':
  Don't assume there's a selected position in touch mode.
 2010-03-26 17:37:08 -07:00
Dirk Dougherty
7b229effcc cherry-pick af4786bcb5945f72e8639d74611cd5f9b0236710 to froyo 
Conflicts:

	docs/html/sdk/installing.jd

Change-Id: Id43ad8c62039099bb518722bb8694dcf8ba6dfa6
 2010-03-26 17:32:26 -07:00
Romain Guy
213b9805e3 Merge "Don't assume there's a selected position in touch mode. Bug #2520743" into froyo 2010-03-26 17:30:40 -07:00
Romain Guy
91c8613679 Don't assume there's a selected position in touch mode. 
Bug #2520743

Bad GridView, bad!

Change-Id: Ideed32dc70a69c85df5afbf949e78b481e147b7f
 2010-03-26 17:29:45 -07:00
Dianne Hackborn
5ef402baaf Fix issue #2538228: Intents targeting browsers constantly nagging 
Some applications are setting the MIME type field for an http:
intent, which is technically wrong because the recipient opening
the URI will get the MIME type from the header.  This was hitting
a bug when we compute the intent filter when setting the
preferred activity, where we have to set both the MIME type and
data URI for the intent filter.  (For file: and content: URIs
only the MIME type is needed, since these can be opened directly
through ContentResolver so everyone is presumed to be able to
handle them.)

Change-Id: Ia7025e6859e9c90997bf56c2c80f225fca7a2007
 2010-03-26 17:17:25 -07:00
Dirk Dougherty
64f15a2658 am 0f3d0d63: am a947fce3: cherry-pick fda3521ea37b53c1dc633c39845e4e8f25c3234f into froyo 2010-03-26 17:13:42 -07:00
Dirk Dougherty
35f7257393 am c008c03b: am 7986a167: Merge "Cherry-pick 97432e866eedd2a179242fa7017e03b6febe4887 to froyo." into froyo 2010-03-26 17:13:37 -07:00
Dirk Dougherty
0f3d0d6350 am a947fce3: cherry-pick fda3521ea37b53c1dc633c39845e4e8f25c3234f into froyo 
Merge commit 'a947fce312fb0670ed4e5a486cf9dbd226baa948' into kraken

* commit 'a947fce312fb0670ed4e5a486cf9dbd226baa948':
  cherry-pick fda3521ea37b53c1dc633c39845e4e8f25c3234f into froyo
 2010-03-26 17:02:28 -07:00
Dirk Dougherty
c008c03b7d am 7986a167: Merge "Cherry-pick 97432e866eedd2a179242fa7017e03b6febe4887 to froyo." into froyo 
Merge commit '7986a167d0d8078f33d3ab580252e2f0849e1fad' into kraken

* commit '7986a167d0d8078f33d3ab580252e2f0849e1fad':
  Cherry-pick 97432e866eedd2a179242fa7017e03b6febe4887 to froyo.
 2010-03-26 17:02:25 -07:00
Jean-Michel Trivi
603c4b01c9 am fbcd5ed1: am c7d2e169: Merge "Cherry-picking this fix into Froyo." into froyo 2010-03-26 16:35:09 -07:00
Dirk Dougherty
a947fce312 cherry-pick fda3521ea37b53c1dc633c39845e4e8f25c3234f into froyo 
Conflicts:

	docs/html/sdk/ndk/1.5_r1/index.jd

Change-Id: I19f6e97bd019ac347a34db0aea157a33d0217189
 2010-03-26 16:32:02 -07:00
Jean-Michel Trivi
fbcd5ed1e1 am c7d2e169: Merge "Cherry-picking this fix into Froyo." into froyo 
Merge commit 'c7d2e169c04de37717c2320184f87caed6be7769' into kraken

* commit 'c7d2e169c04de37717c2320184f87caed6be7769':
  Cherry-picking this fix into Froyo.
 2010-03-26 16:27:47 -07:00
Dirk Dougherty
7986a167d0 Merge "Cherry-pick 97432e866eedd2a179242fa7017e03b6febe4887 to froyo." into froyo 2010-03-26 16:27:07 -07:00
Jason Sams
5caddea2cb Merge "Update Script java classes and llvm samples." 2010-03-26 16:27:04 -07:00
Katie McCormick
4658b4dccf Cherry-pick 97432e866eedd2a179242fa7017e03b6febe4887 to froyo. 
Change-Id: Iaad92f99883c868d71d0cb17c115811e017994e4
 2010-03-26 16:20:32 -07:00
Jean-Michel Trivi
c7d2e169c0 Merge "Cherry-picking this fix into Froyo." into froyo 2010-03-26 16:17:38 -07:00
Charles Chen
def7185cf1 Cherry-picking this fix into Froyo. 
This fix is part of addressing bug #2548048

Making it possible to determine which TTS engine is currently set
as the default by the user.

Change-Id: Ifa422f43a33498b94d96811078c0794d64668357
 2010-03-26 16:14:10 -07:00
Jason Sams
2d71bc7b4c Update Script java classes and llvm samples. 
Change-Id: I05c8d63fcca095d4fea6abb1ff5736ab9d78a3e6
 2010-03-26 16:08:09 -07:00
Jason Sams
19ce64903f Merge "Checkin new types for RS." 2010-03-26 16:00:41 -07:00
Grace Kloba
46c1da5d3a am 04f2f31a: am 307a2b59: Merge "Remove long_press when WebView lost window focus. Reset touch mode too." into froyo 2010-03-26 15:47:47 -07:00
Irfan Sheriff
f623e9bdbe Merge "Do a clean WifiWatchdog shutdown" 2010-03-26 15:45:00 -07:00
Grace Kloba
04f2f31a5f am 307a2b59: Merge "Remove long_press when WebView lost window focus. Reset touch mode too." into froyo 
Merge commit '307a2b59ba9666c071f5c5b03f58700e7c28ea35' into kraken

* commit '307a2b59ba9666c071f5c5b03f58700e7c28ea35':
  Remove long_press when WebView lost window focus.
 2010-03-26 15:40:18 -07:00
Jason Sams
a70f416c9c Checkin new types for RS. 
Change-Id: I3d7a1a91c45cc1c97c60f3615f32e54e98e12f91
 2010-03-26 15:34:30 -07:00
Grace Kloba
307a2b59ba Merge "Remove long_press when WebView lost window focus. Reset touch mode too." into froyo 2010-03-26 15:30:26 -07:00
Irfan Sheriff
288b4ac945 Do a clean WifiWatchdog shutdown 
Killing the WifiWatchdogService thread from
WifiService can cause messages to be handled on
a dead thread. Quit the thread on the broadcast
instead.

A couple of more fixes:
- Do an asynchronous bring up of Wifi. This will
allow WifiWatchdogServiceThread to be immediately
brought up, instead of relying on an update.

- There is no need to listen on supplicant connection
in wifiwatchdog anymore. We kill the thread when
supplicant connection is no more.

Bug: 2546756
Change-Id: I9beae3eebee9cf0446d1dc031ce8fc1c27943521
 2010-03-26 15:12:47 -07:00
Grace Kloba
378f028000 Remove long_press when WebView lost window focus. 
Reset touch mode too.

Fix http://b/issue?id=2542711.

Also move dismissZoomControl() before calling
super.onDetachedFromWindow(). This is a guess to
fix http://b/issue?id=2547574
 2010-03-26 15:01:30 -07:00
Christopher Tate
1af118ad34 am 3cc042cb: am 9c3cee98: API CHANGE: Backup/restore API changes requested by the API Council 2010-03-26 14:55:44 -07:00
Brett Chabot
cad51acb5b am 9c14c7c5: am a3de7455: Move PackageManagerTests and AsecTests. 2010-03-26 14:55:41 -07:00
Grace Kloba
b240a3ee73 am 02b45ce7: am 092cfaaa: Merge "cherry-picked bf4650ca39c9153e38c76280ceb5e9af48b67751 to froyo" into froyo 2010-03-26 14:55:37 -07:00