Commit Graph

1334 Commits

Author SHA1 Message Date
Dianne Hackborn
ef3d2f48dd am 9004f5b8: am d00fb429: am 03e352a2: am 8258fda1: Fix issue #2576268: There is no uiMode config change constant for the manifest 2010-04-07 13:52:42 -07:00
Dianne Hackborn
d00fb429c1 am 03e352a2: am 8258fda1: Fix issue #2576268: There is no uiMode config change constant for the manifest
Merge commit '03e352a2850d74cee11d3f0734938efb22cac351' into kraken

* commit '03e352a2850d74cee11d3f0734938efb22cac351':
  Fix issue #2576268: There is no uiMode config change constant for the manifest
2010-04-07 11:58:17 -07:00
Dianne Hackborn
8258fda177 Fix issue #2576268: There is no uiMode config change constant for the manifest
Change-Id: Id0fa812048244ae408ea54c746266a88c6c214d9
2010-04-07 11:13:38 -07:00
Grace Kloba
30fa3f2377 am cbc7fe0d: am 8dbf5105: am 54fccf8a: Merge "Update the Webkit version." into froyo 2010-04-06 12:52:28 -07:00
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
a05b6883b5 am e0da887e: am 703cb724: am fa588fc3: Merge "Redo the look of the recent apps switcher" into froyo 2010-04-06 09:06:56 -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
032f351d84 am bc49b43b: am bf81cb91: am a6cce790: Merge "Fix 2325549: Allow up to 4 lines of summary text in Settings" into froyo 2010-04-05 17:33:10 -07: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
0f4852fdf8 am fb8cc4d3: am 6ba03118: am 0abdf03d: Merge "bug 2542580: fix bad icon." into froyo 2010-04-05 15:55:53 -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
241783f8de am 6becff37: am d97eb7bd: am badaa778: Merge "bug #2542580: fix stat_notify_chat icon for mdpi resource." into froyo 2010-04-05 14:50:50 -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
17145db0a7 am 64265cc5: am 15be35f6: am bf1259b8: Fix 2538826: Allow aspect of LockPatternView to be customized. 2010-04-01 23:48:50 -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
Dirk Dougherty
75c66da209 sdk doc change: clarify fill_parent/match_parent transition in ViewGroup.LayoutParams and R.attr. Mention match_parent in dev guide "declaring layout" doc.
Change-Id: I07f6858f78e3b48ccaa99e87d81d18bf0499bdc0
2010-04-01 09:08:35 -07:00
Dianne Hackborn
c1c1d63e05 am d0b5b3cb: am 2d8d4d7b: am 513ae361: Merge "Fix issue #2560791: Expose API to go in to car mode." into froyo 2010-03-31 23:34:16 -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
Romain Guy
81d56ac157 Merge "Add support for XML-defined adapters. This is preliminary work for new types of Launcher widgets." 2010-03-31 19:09:50 -07:00
Freeman Ng
943606004b Merge "Give all PreferenceActivity subclasses ability to be launched in wizard mode with Back/Next buttons" 2010-03-31 16:39:54 -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
Romain Guy
30346c4399 Add support for XML-defined adapters.
This is preliminary work for new types of Launcher widgets.

See javadoc in android.widget.Adapters for more details.

Change-Id: I413b8d5f97673e255d84dc07ad112c333c0ce9dc
2010-03-31 16:07:35 -07:00
Freeman Ng
19ea2e0d78 Give all PreferenceActivity subclasses ability to be launched in wizard mode with Back/Next buttons
Change-Id: Ifc8c22c70e808629a9a889406f17a962615e2574
2010-03-31 11:10:41 -07:00
Jeff Brown
41f7cb398e am 767225d8: resolved conflicts for merge of d9ee01a9 to kraken 2010-03-31 00:08:13 -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
aa73eec4bb am 5d8dfc17: am 664c7adb: am 7a17f0c0: Merge "Import revised translations" into froyo 2010-03-30 09:55:05 -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
1aed070562 am ecf4406c: am 370fe2a9: am 9d32d24d: Remove overscrolling 2010-03-29 21:16:37 -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
6c48e1ab78 am 9634e349: am 1faae167: am 691b806f: Merge "Fix possible security issue. Bug #2553187" into froyo 2010-03-29 16:52:23 -07:00
Ben Cheng
b14fe53afc am 08eac7d5: am 8d0dc62f: am ef3f5ddc: Replace "safeMode" with a more specific name "vmSafeMode" in the public API. 2010-03-29 16:52:19 -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