Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
20,567 Commits 3 Branches 0 Tags
eb7aca1dea7fee8b465261d20ddb0d759c9159da
Commit Graph

8050 Commits

Author SHA1 Message Date
Dirk Dougherty
eb7aca1dea am 5bfa807a: am 6c754559: am c46f28dc: Merge "doc change: In fundamentals doc, make statement about synchronous execution of RPC less strict. Indicate that FLAG_ONEWAY applies only across processes." into froyo 2010-03-29 15:51:35 -07:00
Jim Miller
e33b93206b am baaa33a3: am d41d4586: am c6dc5070: Merge "Fix 2537999: Don\'t throw exception when SlidingTab has UNSPECIFIED specs" into froyo 2010-03-29 15:51:26 -07:00
Dirk Dougherty
5bfa807a6f am 6c754559: am c46f28dc: Merge "doc change: In fundamentals doc, make statement about synchronous execution of RPC less strict. Indicate that FLAG_ONEWAY applies only across processes." into froyo 
Merge commit '6c75455908579c1bd48777847c0861967bc413a9' into kraken

* commit '6c75455908579c1bd48777847c0861967bc413a9':
  doc change: In fundamentals doc, make statement about synchronous execution of RPC less strict. Indicate that FLAG_ONEWAY applies only across processes.
 2010-03-29 15:43:23 -07:00
Dirk Dougherty
6c75455908 am c46f28dc: Merge "doc change: In fundamentals doc, make statement about synchronous execution of RPC less strict. Indicate that FLAG_ONEWAY applies only across processes." into froyo 
Merge commit 'c46f28dc0fde1889b37bdc7066ec2af96c16e358' into froyo-plus-aosp

* commit 'c46f28dc0fde1889b37bdc7066ec2af96c16e358':
  doc change: In fundamentals doc, make statement about synchronous execution of RPC less strict. Indicate that FLAG_ONEWAY applies only across processes.
 2010-03-29 15:39:56 -07:00
Dirk Dougherty
c46f28dc0f Merge "doc change: In fundamentals doc, make statement about synchronous execution of RPC less strict. Indicate that FLAG_ONEWAY applies only across processes." into froyo 2010-03-29 15:36:53 -07:00
Jim Miller
baaa33a378 am d41d4586: am c6dc5070: Merge "Fix 2537999: Don\'t throw exception when SlidingTab has UNSPECIFIED specs" into froyo 
Merge commit 'd41d458696b2ab54387dd0683a3365e788b97c2d' into kraken

* commit 'd41d458696b2ab54387dd0683a3365e788b97c2d':
  Fix 2537999: Don't throw exception when SlidingTab has UNSPECIFIED specs
 2010-03-29 15:14:27 -07:00
Romain Guy
b741169d7e am 2aba9b1e: am 21ad6043: am 6b1e6969: Rename tab widget attributes, remove scroll barrier constant. Bug #2553515 #2553595 2010-03-29 15:14:13 -07:00
Jim Miller
d41d458696 am c6dc5070: Merge "Fix 2537999: Don\'t throw exception when SlidingTab has UNSPECIFIED specs" into froyo 
Merge commit 'c6dc5070ef663e514add038b1d2e78761156b0c0' into froyo-plus-aosp

* commit 'c6dc5070ef663e514add038b1d2e78761156b0c0':
  Fix 2537999: Don't throw exception when SlidingTab has UNSPECIFIED specs
 2010-03-29 15:11:01 -07:00
Jim Miller
c6dc5070ef Merge "Fix 2537999: Don't throw exception when SlidingTab has UNSPECIFIED specs" into froyo 2010-03-29 15:07:06 -07:00
Romain Guy
2aba9b1e21 am 21ad6043: am 6b1e6969: Rename tab widget attributes, remove scroll barrier constant. Bug #2553515 #2553595 
Merge commit '21ad6043cd48fbe2d52a5eb18c29e09b4b80bc9f' into kraken

* commit '21ad6043cd48fbe2d52a5eb18c29e09b4b80bc9f':
  Rename tab widget attributes, remove scroll barrier constant.
 2010-03-29 15:05:11 -07:00
Romain Guy
21ad6043cd am 6b1e6969: Rename tab widget attributes, remove scroll barrier constant. Bug #2553515 #2553595 
Merge commit '6b1e6969828f05a2f5f55825fdf16b19c9dce2dd' into froyo-plus-aosp

* commit '6b1e6969828f05a2f5f55825fdf16b19c9dce2dd':
  Rename tab widget attributes, remove scroll barrier constant.
 2010-03-29 14:49:09 -07:00
Dirk Dougherty
d76ef97930 doc change: In fundamentals doc, make statement about synchronous execution of RPC less strict. Indicate that FLAG_ONEWAY applies only across processes. 
Bug: 2554090
Change-Id: Ia13b3d156d230609e8296a3b31c2882ba13681f3
 2010-03-29 14:47:39 -07:00
Romain Guy
6b1e696982 Rename tab widget attributes, remove scroll barrier constant. 
Bug #2553515 #2553595

Change-Id: Id36280a57f00a1ee59251be6be1aae8df2189c09
 2010-03-29 14:40:34 -07:00
Doug Zongker
18867a93e8 am e1599d86: am 0d531f5b: am ab69e29c: relocate android.util.base64.* -> android.util.* 2010-03-29 14:13:53 -07:00
Romain Guy
c6fb53e650 am 6757aed3: am e16741b2: am 272b504e: Merge "Tame the monkey. Bug #2547546" into froyo 2010-03-29 14:13:49 -07:00
Doug Zongker
e1599d86ea am 0d531f5b: am ab69e29c: relocate android.util.base64.* -> android.util.* 
Merge commit '0d531f5b5927556fd94e44eedacb678f6341479b' into kraken

* commit '0d531f5b5927556fd94e44eedacb678f6341479b':
  relocate android.util.base64.* -> android.util.*
 2010-03-29 14:05:01 -07:00
Romain Guy
6757aed35d am e16741b2: am 272b504e: Merge "Tame the monkey. Bug #2547546" into froyo 
Merge commit 'e16741b22a55289bd22787b91842b410213556f6' into kraken

* commit 'e16741b22a55289bd22787b91842b410213556f6':
  Tame the monkey.
 2010-03-29 14:04:58 -07:00
Doug Zongker
0d531f5b59 am ab69e29c: relocate android.util.base64.* -> android.util.* 
Merge commit 'ab69e29c1927bdc6143324eba5ccd78f7c43128d' into froyo-plus-aosp

* commit 'ab69e29c1927bdc6143324eba5ccd78f7c43128d':
  relocate android.util.base64.* -> android.util.*
 2010-03-29 14:00:58 -07:00
Doug Zongker
ab69e29c19 relocate android.util.base64.* -> android.util.* 
b/2553469 - API REVIEW: android.util.base64

Change-Id: I6a514032152a8b1899db52d020aca8e8b19e74e9
 2010-03-29 13:46:47 -07:00
Romain Guy
e16741b22a am 272b504e: Merge "Tame the monkey. Bug #2547546" into froyo 
Merge commit '272b504ee6aaf2515572520cd642f9a4fbf81a44' into froyo-plus-aosp

* commit '272b504ee6aaf2515572520cd642f9a4fbf81a44':
  Tame the monkey.
 2010-03-29 13:06:20 -07:00
Romain Guy
7eec2bcf6f Tame the monkey. 
Bug #2547546

Change-Id: I2a41f53dbd71a166ddce70f3fbec24cfedaa514a
 2010-03-29 13:00:07 -07:00
Romain Guy
3811e64aa4 am bbb90328: am 7e31b282: am 0e122926: Merge "Rename private fields to break bad code examples" into froyo 2010-03-29 12:45:44 -07:00
Romain Guy
bbb903280b am 7e31b282: am 0e122926: Merge "Rename private fields to break bad code examples" into froyo 
Merge commit '7e31b282ddd1f4296ba702f7604044216a95f65e' into kraken

* commit '7e31b282ddd1f4296ba702f7604044216a95f65e':
  Rename private fields to break bad code examples
 2010-03-29 12:37:48 -07:00
Romain Guy
7e31b282dd am 0e122926: Merge "Rename private fields to break bad code examples" into froyo 
Merge commit '0e1229260d66b308a0ad271c20970e3decd6f55c' into froyo-plus-aosp

* commit '0e1229260d66b308a0ad271c20970e3decd6f55c':
  Rename private fields to break bad code examples
 2010-03-29 12:34:23 -07:00
Romain Guy
0e1229260d Merge "Rename private fields to break bad code examples" into froyo 2010-03-29 12:28:20 -07:00
Romain Guy
65fe2c08fa Rename private fields to break bad code examples 
Change-Id: I4a3e8df5de159c703db244212f78824e4105ba90
 2010-03-29 12:27:30 -07:00
The Android Open Source Project
d646f69c4e am f29c7d4d: am c89704a7: merge from open-source master 2010-03-29 11:21:33 -07:00
The Android Open Source Project
f29c7d4d27 am c89704a7: merge from open-source master 
Merge commit 'c89704a77f9c51ebd8c1cc6863e15ff402a56c86' into kraken

* commit 'c89704a77f9c51ebd8c1cc6863e15ff402a56c86':
  Fix Memory Leak When Switching Input Methods
 2010-03-29 11:03:33 -07:00
The Android Open Source Project
c89704a77f merge from open-source master 
Change-Id: I6a8109d11dabc579501c598ab2927cf802797130
 2010-03-29 10:57:04 -07:00
Daniel Lehmann
8aca694a36 am 7eeb9c23: am 3e9032e6: Merge "Increase name-label height so that "g" isn\'t cut off anymore. Decrease header height so that no resizes are required after background loading for most contacts Bug:2542703 Bug:2549485" into froyo 2010-03-29 10:46:24 -07:00
Daniel Lehmann
7eeb9c2382 am 3e9032e6: Merge "Increase name-label height so that "g" isn\'t cut off anymore. Decrease header height so that no resizes are required after background loading for most contacts Bug:2542703 Bug:2549485" into froyo 
Merge commit '3e9032e646c898a725c256c90031494cc349eea0' into kraken

* commit '3e9032e646c898a725c256c90031494cc349eea0':
  Increase name-label height so that "g" isn't cut off anymore. Decrease header height so that no resizes are required after background loading for most contacts
 2010-03-29 10:37:41 -07:00
Daniel Lehmann
3e9032e646 Merge "Increase name-label height so that "g" isn't cut off anymore. Decrease header height so that no resizes are required after background loading for most contacts Bug:2542703 Bug:2549485" into froyo 2010-03-29 10:30:54 -07:00
Leon Clarke
914fe1a2c1 am 8812fdcf: am 7c3006f5: http://b/issue?id=2496591 When receiving a message to delete the root layer, delay it until the next new picture message, so that the layers only disappear when we start displaying the new page, and not the moment the DOM on the old page is d 2010-03-29 10:25:50 -07:00
Wu-cheng Li
a369ad0302 am 4d47e1b1: am 0ca25191: Add some comments for zoom methods. 2010-03-29 10:25:46 -07:00
Grace Kloba
0092c80ee6 am 51b97011: cherry-pick 4a4f9886a7 into froyo 
Merge commit '51b97011b73c10b832ea4ad10637f761802e125d' into kraken

* commit '51b97011b73c10b832ea4ad10637f761802e125d':
  cherry-pick 4a4f9886a7 into froyo
 2010-03-29 09:44:05 -07:00
Grace Kloba
51b97011b7 cherry-pick 4a4f9886a7 into froyo 
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:32:36 -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
Leon Clarke
8812fdcf1a am 7c3006f5: http://b/issue?id=2496591 When receiving a message to delete the root layer, delay it until the next new picture message, so that the layers only disappear when we start displaying the new page, and not the moment the DOM on the old page is destroyed. 
Merge commit '7c3006f53ac02adeac7396726cdc0bf5d6d01926' into kraken

* commit '7c3006f53ac02adeac7396726cdc0bf5d6d01926':
  http://b/issue?id=2496591
 2010-03-29 09:10:58 -07:00
Leon Clarke
7c3006f53a http://b/issue?id=2496591 
When receiving a message to delete the root layer, delay it until the next
new picture message, so that the layers only disappear when we start displaying
the new page, and not the moment the DOM on the old page is destroyed.
 2010-03-29 16:49:16 +01: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
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
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
Daniel Lehmann
d07950f0a1 Increase name-label height so that "g" isn't cut off anymore. Decrease header height so that no resizes are required after background loading for most contacts 
Bug:2542703
Bug:2549485

Change-Id: Ic2b88fd405043c2869610c9495bd4aa860b5c025
 2010-03-26 19:34:13 -07:00
Dianne Hackborn
4c8a63ca4d Merge "Fix issue #2538228: Intents targeting browsers constantly nagging" into froyo 2010-03-26 18:06:52 -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
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