Commit Graph

1309 Commits

Author SHA1 Message Date
Grace Kloba
cbc7fe0df6 am 8dbf5105: am 54fccf8a: Merge "Update the Webkit version." into froyo
Merge commit '8dbf5105739db2354057be445483a63ec96376f0' into kraken

* commit '8dbf5105739db2354057be445483a63ec96376f0':
  Update the Webkit version.
2010-04-06 12:43:19 -07:00
Grace Kloba
a3562c6853 Update the Webkit version.
Fix http://b/issue?id=2571957
2010-04-06 11:23:01 -07:00
Joe Onorato
e0da887e64 am 703cb724: am fa588fc3: Merge "Redo the look of the recent apps switcher" into froyo
Merge commit '703cb72442461a3cfb3ffd0d15968d7c40eaba65' into kraken

* commit '703cb72442461a3cfb3ffd0d15968d7c40eaba65':
  Redo the look of the recent apps switcher
2010-04-06 08:41:50 -07:00
Joe Onorato
fa588fc374 Merge "Redo the look of the recent apps switcher" into froyo 2010-04-06 08:32:07 -07:00
Joe Onorato
fd6c969c8c Redo the look of the recent apps switcher
Change-Id: I913c3f68f487e7ccf20a014c26ab85119e991484
2010-04-06 10:30:38 -05:00
Jim Miller
bc49b43b57 am bf81cb91: am a6cce790: Merge "Fix 2325549: Allow up to 4 lines of summary text in Settings" into froyo
Merge commit 'bf81cb91aa584d3b52d807aa4134a1a90569de31' into kraken

* commit 'bf81cb91aa584d3b52d807aa4134a1a90569de31':
  Fix 2325549: Allow up to 4 lines of summary text in Settings
2010-04-05 17:25:17 -07:00
Jim Miller
a6cce790b2 Merge "Fix 2325549: Allow up to 4 lines of summary text in Settings" into froyo 2010-04-05 17:16:00 -07:00
Jim Miller
fdceefd8a2 Fix 2325549: Allow up to 4 lines of summary text in Settings
This fixes a number of screens in Settings (see the bug for examples).
Though it seems like a scary change, it should be safe since
the added line doesn't affect layout unless it's used, in which
case the view is slightly taller.

Change-Id: I13d04efadee19b407febabfae7825aedf66e8744
2010-04-05 16:53:10 -07:00
Wei Huang
fb8cc4d302 am 6ba03118: am 0abdf03d: Merge "bug 2542580: fix bad icon." into froyo
Merge commit '6ba03118790f57ec0c0c9d6ed3198de11a08b6a9' into kraken

* commit '6ba03118790f57ec0c0c9d6ed3198de11a08b6a9':
  bug 2542580: fix bad icon.
2010-04-05 15:46:22 -07:00
Wei Huang
54e93ee7ea bug 2542580: fix bad icon.
- borrow hdpi asset instead (for now), until I get a new icon from UX.

Change-Id: I6425698b02a3bcb53448db05f9939d48a2078c26
2010-04-05 15:09:52 -07:00
Wei Huang
6becff379d am d97eb7bd: am badaa778: Merge "bug #2542580: fix stat_notify_chat icon for mdpi resource." into froyo
Merge commit 'd97eb7bdd03fb4cb2c69afcfeb6d6f5c086f7fbb' into kraken

* commit 'd97eb7bdd03fb4cb2c69afcfeb6d6f5c086f7fbb':
  bug #2542580: fix stat_notify_chat icon for mdpi resource.
2010-04-05 14:44:07 -07:00
Wei Huang
36d13c32a6 bug #2542580: fix stat_notify_chat icon for mdpi resource.
Change-Id: Id6a14f76077334ad2925aeecb04fd0f69209c91f
2010-04-05 14:18:55 -07:00
Jim Miller
64265cc59b am 15be35f6: am bf1259b8: Fix 2538826: Allow aspect of LockPatternView to be customized.
Merge commit '15be35f6c9a88f453ba3a6be8d93fed8537ad77e' into kraken

* commit '15be35f6c9a88f453ba3a6be8d93fed8537ad77e':
  Fix 2538826: Allow aspect of LockPatternView to be customized.
2010-04-01 19:41:00 -07:00
Jim Miller
bf1259b8a6 Fix 2538826: Allow aspect of LockPatternView to be customized.
This fixes a problem where the pattern unlock area shrank on
mdpi devices.

This change is required since some devices (mdpi) don't have
enough vertical room to show a square LockPatternView and shrink
the area to match the minimum of width and height. To fix the
problem and minimize changes to existing platforms, the parameter
is configurable and has a default in values/donottranslate that
emulates the old behavior.  New behavior for mdpi devices is
specified in values-port-mdpi/donottranslate, which is the
only place we currently see the problem.

Tested:
mdpi device in both orientations
hdpi device in both orientations
hdpi device in both orientations with keyboard open/closed

Change-Id: I3b9a5ef1d9b5e70f7b1823c9f48a3938f52cc7a4
2010-04-01 19:33:03 -07:00
Dirk Dougherty
7fb51bf546 am 865bd884: am 2d8234b7: Merge "doc change: cherry pick 75c66da209. (clarify fill_parent/match_parent transition in ViewGroup.LayoutParams and R.attr. Mention match_parent in dev guide "declaring layout" doc.)" into froyo
Merge commit '865bd884e878bbc6d9f5832fda6971c21754b588' into kraken

* commit '865bd884e878bbc6d9f5832fda6971c21754b588':
  doc change: cherry pick 75c66da209. (clarify fill_parent/match_parent transition in ViewGroup.LayoutParams and R.attr. Mention match_parent in dev guide "declaring layout" doc.)
2010-04-01 10:47:00 -07:00
Dirk Dougherty
3d5f648f8f doc change: cherry pick 75c66da209. (clarify fill_parent/match_parent transition in ViewGroup.LayoutParams and R.attr. Mention match_parent in dev guide "declaring layout" doc.)
Change-Id: I1d2b80b8dc3f8b2e3c1befcbb7c4c522d78a2db8
2010-04-01 09:16:08 -07:00
Dianne Hackborn
d0b5b3cb61 am 2d8d4d7b: am 513ae361: Merge "Fix issue #2560791: Expose API to go in to car mode." into froyo
Merge commit '2d8d4d7b16b474ef58c86ae9ccd3dc70d7132c23' into kraken

* commit '2d8d4d7b16b474ef58c86ae9ccd3dc70d7132c23':
  Fix issue #2560791: Expose API to go in to car mode.
2010-03-31 23:23:16 -07:00
Dianne Hackborn
9c9c532d36 Fix issue #2560791: Expose API to go in to car mode.
Also fix bug where night mode was being used in desk dock.

Change-Id: I56c1cf3d6fe800a4f986d40cc4cb2e70b76ac261
2010-03-31 16:25:53 -07:00
Jeff Brown
767225d820 resolved conflicts for merge of d9ee01a9 to kraken
Change-Id: I645177513e6dfa4b3b02c0061b8026bde4acde8d
2010-03-30 23:49:17 -07:00
Jeff Brown
0733079111 Show SD unavailable icon for apps on SD when ejected.
This change include a minor refactoring of PackageItemInfo and related
classes to eliminate code duplication and to avoid redundant work
searching for an ApplicationInfo instance we already have.

Bug: b/2537578
Change-Id: Id0794c3f055ea58b943028f7a84abc7dec9d0aac
2010-03-30 22:20:42 -07:00
Kenny Root
5d8dfc172b am 664c7adb: am 7a17f0c0: Merge "Import revised translations" into froyo
Merge commit '664c7adb1847dd304f36239dc63b4986bf828dc1' into kraken

* commit '664c7adb1847dd304f36239dc63b4986bf828dc1':
  Import revised translations
2010-03-30 09:38:14 -07:00
Kenny Root
7a17f0c04e Merge "Import revised translations" into froyo 2010-03-30 09:23:16 -07:00
Kenny Root
42205f871b Import revised translations
Change-Id: I1580bddbcf945ed733725b486b2699582096d3a5
2010-03-30 09:15:10 -07:00
Adam Powell
ecf4406ce5 am 370fe2a9: am 9d32d24d: Remove overscrolling
Merge commit '370fe2a91e9e824c6339fc836377c4aa6d80fc06' into kraken

* commit '370fe2a91e9e824c6339fc836377c4aa6d80fc06':
  Remove overscrolling
2010-03-29 21:09:28 -07:00
Adam Powell
9d32d24dbd Remove overscrolling
Change-Id: I7e9db8d8a9b8ef67f0c0c82bf57c9155b7ebabea
2010-03-29 20:46:45 -07:00
Oscar Montemayor
1f4df90bfa DO NOT MERGE
Removing unused features from source tree.
Please refer to Bug#2502219.

Change-Id: I879c29bfd5ffe933f64bb1082aaae7c956450a5a
2010-03-29 18:12:24 -07:00
Romain Guy
9634e3496d am 1faae167: am 691b806f: Merge "Fix possible security issue. Bug #2553187" into froyo
Merge commit '1faae1677229bf9a4552cc3f90e0afe2858e7a4c' into kraken

* commit '1faae1677229bf9a4552cc3f90e0afe2858e7a4c':
  Fix possible security issue.
2010-03-29 16:40:43 -07:00
Ben Cheng
08eac7d5cd am 8d0dc62f: am ef3f5ddc: Replace "safeMode" with a more specific name "vmSafeMode" in the public API.
Merge commit '8d0dc62fe26e02a3a303c9286b06fc0c24c36dcb' into kraken

* commit '8d0dc62fe26e02a3a303c9286b06fc0c24c36dcb':
  Replace "safeMode" with a more specific name "vmSafeMode" in the public API.
2010-03-29 16:32:11 -07:00
Romain Guy
691b806ff8 Merge "Fix possible security issue. Bug #2553187" into froyo 2010-03-29 16:31:14 -07:00
Ben Cheng
ef3f5ddc21 Replace "safeMode" with a more specific name "vmSafeMode" in the public API.
Bug: 2553512
Change-Id: Id0dad80ecdcb8c7430dcf1ac26132ccd9c0770f5
2010-03-29 16:17:58 -07:00
Romain Guy
2aba11f6b9 Fix possible security issue.
Bug #2553187

Limit the max number of lines for each entry in the ResolveActivity to 2. Also
make sure to discard potential styling tags and newlines/space characters from
package name and activity labels.

Change-Id: Ibda3688267aa948b921164d3d3abc8c9236e61a2
2010-03-29 16:03:01 -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
6b1e696982 Rename tab widget attributes, remove scroll barrier constant.
Bug #2553515 #2553595

Change-Id: Id36280a57f00a1ee59251be6be1aae8df2189c09
2010-03-29 14:40:34 -07:00
Romain Guy
e5beca8e65 am 1889f40a: am ab924c90: Merge "Make EditTextPreference scrollable. Bug #2549257" into froyo
Merge commit '1889f40aa17bd658df1b7181d091a6dff631ec95' into kraken

* commit '1889f40aa17bd658df1b7181d091a6dff631ec95':
  Make EditTextPreference scrollable.
2010-03-29 11:32:53 -07:00
Romain Guy
ab924c909a Merge "Make EditTextPreference scrollable. Bug #2549257" into froyo 2010-03-29 11:24:31 -07:00
Romain Guy
b5d73d0fb0 Make EditTextPreference scrollable.
Bug #2549257

Change-Id: If2f69f957681e15977a7603a1f6533e9d1fea9f7
2010-03-29 11:23:18 -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
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
16f1c78739 am d49258fe: Fix issue #2544466: Car Home brightness icon comes and goes while phone is in car dock in FRE83
Merge commit 'd49258fed489bcd72a2b2a6ce3a3c38d4b2531e6' into kraken

* commit 'd49258fed489bcd72a2b2a6ce3a3c38d4b2531e6':
  Fix issue #2544466: Car Home brightness icon comes and goes while phone is in car dock in FRE83
2010-03-26 14:31:32 -07:00
Dianne Hackborn
d49258fed4 Fix issue #2544466: Car Home brightness icon comes and goes while phone is in car dock in FRE83
There was a really dumb bug that was causing us to not always apply
the new configuration.  As a result of fixing this, there were new
glithes in the transition between car and regular mode, so further
work here to fix that.  And since I was actually working during the
night and seeing night mode, I noticed how obnoxiously bright the
status bar is compared to the car home at night, so it now nicely
dims itself when we switch to the night config.  Oh and in doing
that I also found and fixed a bug in dispatching config changes to
a window (where they wouldn't get dispatched if the window didn't
resize).

FINALLY...  tweak the wallpaper enter/exit animations a bit to
make them a little smoother.

Change-Id: I4e062093cbcfbc919307799a794846db2920216f
2010-03-26 12:52:53 -07:00
Daniel Sandler
629520527e Redesigned keyguard layout in the no-SIM case. DO NOT MERGE
The emergency call button has been removed (since the user
can disable the keyguard, open the phone app, and enter the
emergency number there).

AM/PM have also been baseline-aligned with the clock.

Bug: 2421380
Change-Id: I3fb25a29e02f3e2ee2b1505a8765d53ccceb1372
2010-03-26 11:52:59 -04:00
Marco Nelissen
35a2a90fd6 Remove spurious byte order marks from xml files.
Change-Id: I864078ad1a1621609a8a33412327844499712324
2010-03-25 18:15:14 -07:00
Daniel Sandler
c68b5b7e5b Merge "Use a more benign icon for ADB notifications." 2010-03-25 13:26:36 -07:00
Daniel Sandler
39576c8df3 Use a more benign icon for ADB notifications.
Also suppress vibe & noise for ADB notifications.

Bug: 2544480
Bug: 2545486

Change-Id: I955a7271f47601f9b35f0d3fcd48363370ebd252
2010-03-25 16:19:53 -04:00
Leon Clarke
a652e4ffdd Merge "http://b/issue?id=2516676 Correctly scale the play button and youtube logo when embedded youtube videos are displayed at smaller than the suggested size." 2010-03-25 07:38:22 -07:00
Leon Clarke
6fad943d19 http://b/issue?id=2516676
Correctly scale the play button and youtube logo when embedded
youtube videos are displayed at smaller than the suggested size.
2010-03-25 14:19:06 +00:00
Bjorn Bringert
98bfa39596 Use a secure setting for default browser geolocation permissions
Partly reverts I6308b476ad18b1d71d7438b936c592a45365c9f0

Bug: http://b/issue?id=2535598

Change-Id: Ib488c6d4f10a87b714ecb78eef6fe58f572907c6
2010-03-25 14:04:45 +00:00
Amith Yamasani
1c9f1c6323 Merge "Asset update for key feedback bubble - removes edge artifact." 2010-03-24 12:43:28 -07:00
Amith Yamasani
8db3ed3e5f Asset update for key feedback bubble - removes edge artifact.
Bug: 2511111
2010-03-24 12:40:19 -07:00
Patrick Scott
f60ce402dd Remove old asset.
Change-Id: I5b4bdb6b038bba3eb2f03c6f53541d99fab0bad5
2010-03-24 14:28:55 -04:00