584 Commits

Author SHA1 Message Date
Adam Powell
212db7d3f8 Added MultiSelectListPreference
Added set support to XmlUtils; added Set<String> functions to SharedPreferences.

MultiSelectListPreference allows multiple selection and persistence of
string preferences. Addresses bug 2575634.

Change-Id: Icd56022d444b0ce43cccf819cd7d600fdb00e88a
2010-04-15 10:18:17 -07:00
Jesse Wilson
690de26230 am 97a22e1b: am 86b0276a: am f9e90378: am bc284a5f: Merge "Move the public method HttpDateTime.parse() into AndroidHttpClient." into froyo 2010-04-10 11:58:52 -07:00
Jesse Wilson
86b0276a39 am f9e90378: am bc284a5f: Merge "Move the public method HttpDateTime.parse() into AndroidHttpClient." into froyo
Merge commit 'f9e90378d50210298d1cec2b913653597cd62be4' into kraken

* commit 'f9e90378d50210298d1cec2b913653597cd62be4':
  Move the public method HttpDateTime.parse() into AndroidHttpClient.
2010-04-10 11:47:45 -07:00
Jesse Wilson
f9e90378d5 am bc284a5f: Merge "Move the public method HttpDateTime.parse() into AndroidHttpClient." into froyo
Merge commit 'bc284a5f9f1e3f19ddd45cfb233f0d1775b612a7' into froyo-plus-aosp

* commit 'bc284a5f9f1e3f19ddd45cfb233f0d1775b612a7':
  Move the public method HttpDateTime.parse() into AndroidHttpClient.
2010-04-10 11:41:38 -07:00
Jesse Wilson
7cfa90fee5 Move the public method HttpDateTime.parse() into AndroidHttpClient.
See bug http://b/2553589

Change-Id: Ide3399c7c63daf9c0b8c18669076f2f4d6e9a876
2010-04-09 13:34:15 -07:00
Daniel Lehmann
04867ab7c6 am ba3147d1: am 140d040b: am d8b9b511: Merge "Pass cookie to TOKEN_CONTACT_INFO so that QuickContact without photo works again Bug:2572239" into froyo 2010-04-06 14:28:37 -07:00
Daniel Lehmann
ba3147d157 am 140d040b: am d8b9b511: Merge "Pass cookie to TOKEN_CONTACT_INFO so that QuickContact without photo works again Bug:2572239" into froyo
Merge commit '140d040b6a5d2dc01e999e6f7b69863c71b2272b' into kraken

* commit '140d040b6a5d2dc01e999e6f7b69863c71b2272b':
  Pass cookie to TOKEN_CONTACT_INFO so that QuickContact without photo works again
2010-04-06 14:17:57 -07:00
Daniel Lehmann
140d040b6a am d8b9b511: Merge "Pass cookie to TOKEN_CONTACT_INFO so that QuickContact without photo works again Bug:2572239" into froyo
Merge commit 'd8b9b511821a06d86b3ffaab0d71ee9ce3834678' into froyo-plus-aosp

* commit 'd8b9b511821a06d86b3ffaab0d71ee9ce3834678':
  Pass cookie to TOKEN_CONTACT_INFO so that QuickContact without photo works again
2010-04-06 14:14:21 -07:00
Daniel Lehmann
b45c047ba0 Pass cookie to TOKEN_CONTACT_INFO so that QuickContact without photo works again
Bug:2572239

Change-Id: I5fedd6cac64d495ba208ddcb45a7d09a05bb9a65
2010-04-06 10:44:35 -07:00
Amith Yamasani
6243d4ca06 am c778f71d: am 733a2f65: am 1b4c0d70: Merge "Fix a crash in BatteryStatsImpl, due to a previous fix." into froyo 2010-04-05 14:37:32 -07:00
Amith Yamasani
c778f71d5c am 733a2f65: am 1b4c0d70: Merge "Fix a crash in BatteryStatsImpl, due to a previous fix." into froyo
Merge commit '733a2f654934d452b2febf6f80cd1136830758d5' into kraken

* commit '733a2f654934d452b2febf6f80cd1136830758d5':
  Fix a crash in BatteryStatsImpl, due to a previous fix.
2010-04-05 14:25:31 -07:00
Amith Yamasani
733a2f6549 am 1b4c0d70: Merge "Fix a crash in BatteryStatsImpl, due to a previous fix." into froyo
Merge commit '1b4c0d702066794b9ce97b02721aa9e552997381' into froyo-plus-aosp

* commit '1b4c0d702066794b9ce97b02721aa9e552997381':
  Fix a crash in BatteryStatsImpl, due to a previous fix.
2010-04-05 14:20:57 -07:00
Amith Yamasani
e5795610bd Fix a crash in BatteryStatsImpl, due to a previous fix.
This is probably the real fix for the original bug. The last line was probably not
well formed and resulted in an overrun in the native code.

Bug: 2564824
Change-Id: I8a9cc267f8045a61eff4b5d532258afa32a8b837
2010-04-05 12:43:44 -07:00
Mike Lockwood
79e642e8ed Call LocationManager.sendNiResponse() instead of calling directly to GpsLocationProvider
Change-Id: I6a5b47abb0519f5228d29bc3340bb2490564803e
Signed-off-by: Mike Lockwood <lockwood@android.com>
2010-04-04 18:44:05 -04:00
Amith Yamasani
dc6a0b84cc am e27c176e: am c2e060cb: am 0913ce95: Merge "Potential fix for bug: 2564824 : Device runtime restart in BatteryService" into froyo 2010-04-02 17:35:29 -07:00
Amith Yamasani
e27c176e6c am c2e060cb: am 0913ce95: Merge "Potential fix for bug: 2564824 : Device runtime restart in BatteryService" into froyo
Merge commit 'c2e060cbedaa2371fcc5c909c216c8ceafa4f649' into kraken

* commit 'c2e060cbedaa2371fcc5c909c216c8ceafa4f649':
  Potential fix for bug: 2564824 : Device runtime restart in BatteryService
2010-04-02 17:27:31 -07:00
Amith Yamasani
c2e060cbed am 0913ce95: Merge "Potential fix for bug: 2564824 : Device runtime restart in BatteryService" into froyo
Merge commit '0913ce95c29371cb7b58e294a8d60262bc7f4329' into froyo-plus-aosp

* commit '0913ce95c29371cb7b58e294a8d60262bc7f4329':
  Potential fix for bug: 2564824 : Device runtime restart in BatteryService
2010-04-02 17:24:49 -07:00
Amith Yamasani
0913ce95c2 Merge "Potential fix for bug: 2564824 : Device runtime restart in BatteryService" into froyo 2010-04-02 17:20:53 -07:00
Adam Powell
fcced83081 am ffc67455: am 128f1a87: am 6024ca5c: Fix bug 2185026 - back button in context menu now calls onContextMenuClosed() 2010-04-02 16:32:21 -07:00
Adam Powell
ffc67455f8 am 128f1a87: am 6024ca5c: Fix bug 2185026 - back button in context menu now calls onContextMenuClosed()
Merge commit '128f1a87c55a291109ce521a92308c186e5d2db5' into kraken

* commit '128f1a87c55a291109ce521a92308c186e5d2db5':
  Fix bug 2185026 - back button in context menu now calls onContextMenuClosed()
2010-04-02 16:25:33 -07:00
Adam Powell
128f1a87c5 am 6024ca5c: Fix bug 2185026 - back button in context menu now calls onContextMenuClosed()
Merge commit '6024ca5c90203b6c33acc6adfbf7e4e613549a0a' into froyo-plus-aosp

* commit '6024ca5c90203b6c33acc6adfbf7e4e613549a0a':
  Fix bug 2185026 - back button in context menu now calls onContextMenuClosed()
2010-04-02 16:20:54 -07:00
Adam Powell
6024ca5c90 Fix bug 2185026 - back button in context menu now calls onContextMenuClosed()
Change-Id: I6c16879a8ad8e4651d21f639a620a936bf991f8d
2010-04-02 16:05:20 -07:00
Amith Yamasani
2098eadfba Potential fix for bug: 2564824 : Device runtime restart in BatteryService
Look for corrupted bytes and replace with ?

If the problem is in the parsing code, then this will not help.

Change-Id: If33643f126a4099d4113e37760c6ef74683fe97e
2010-04-02 14:11:29 -07:00
Mike Lockwood
39f99a1cee am dfcb20d1: am a9e1a131: am 87e72cd3: Merge "Vibrate before shutting down." into froyo 2010-04-01 23:49:00 -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
Mike Lockwood
dfcb20d1c3 am a9e1a131: am 87e72cd3: Merge "Vibrate before shutting down." into froyo
Merge commit 'a9e1a131e3a5dcde4d69ee9f99aee4702dcff909' into kraken

* commit 'a9e1a131e3a5dcde4d69ee9f99aee4702dcff909':
  Vibrate before shutting down.
2010-04-01 21:15:11 -07:00
Mike Lockwood
a9e1a131e3 am 87e72cd3: Merge "Vibrate before shutting down." into froyo
Merge commit '87e72cd3b327fefc39030a628e9e9b7141791d39' into froyo-plus-aosp

* commit '87e72cd3b327fefc39030a628e9e9b7141791d39':
  Vibrate before shutting down.
2010-04-01 21:12:56 -07:00
Mike Lockwood
87e72cd3b3 Merge "Vibrate before shutting down." into froyo 2010-04-01 21:08:53 -07:00
Mike Lockwood
a717f64ddc Vibrate before shutting down.
BUG: 2439291

Change-Id: I0f5abba34a14f1dd1cbe2077122d6f3e940b4d90
Signed-off-by: Mike Lockwood <lockwood@android.com>
2010-04-01 21:07:30 -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
15be35f6c9 am bf1259b8: Fix 2538826: Allow aspect of LockPatternView to be customized.
Merge commit 'bf1259b8a6a44d7a4eab5131cd33dac0fbcb50b6' into froyo-plus-aosp

* commit 'bf1259b8a6a44d7a4eab5131cd33dac0fbcb50b6':
  Fix 2538826: Allow aspect of LockPatternView to be customized.
2010-04-01 19:37:41 -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
Daniel Lehmann
726e838cc9 am 22d7142d: am 1b679754: am 58c9a4bc: Merge "Don\'t load photo if it\'s id is 0. Saves one database query Bug:2546767" into froyo 2010-03-30 17:14:34 -07:00
Daniel Lehmann
22d7142dd9 am 1b679754: am 58c9a4bc: Merge "Don\'t load photo if it\'s id is 0. Saves one database query Bug:2546767" into froyo
Merge commit '1b679754b6f6fd5da8f5fc48415cad65cc8f3a56' into kraken

* commit '1b679754b6f6fd5da8f5fc48415cad65cc8f3a56':
  Don't load photo if it's id is 0. Saves one database query
2010-03-30 17:05:42 -07:00
Daniel Lehmann
1b679754b6 am 58c9a4bc: Merge "Don\'t load photo if it\'s id is 0. Saves one database query Bug:2546767" into froyo
Merge commit '58c9a4bca0ce20ebf63a8c9619d405b788a98b9b' into froyo-plus-aosp

* commit '58c9a4bca0ce20ebf63a8c9619d405b788a98b9b':
  Don't load photo if it's id is 0. Saves one database query
2010-03-30 17:01:45 -07:00
Daniel Lehmann
18d4b733f8 Don't load photo if it's id is 0. Saves one database query
Bug:2546767

Change-Id: I0739cd45acecd18bafda9a200dff60fdcc219021
2010-03-30 13:33: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
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
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
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
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
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
Jim Miller
966a8c7859 Fix 2537999: Don't throw exception when SlidingTab has UNSPECIFIED specs
This is try to capture the case where we sometimes see UNSPECIFIED
MeasureSpec in SlidingTab. It should be OK as long as one of the dimensions
is constrained. The log event will give some indication of what's
going on when this happens.

This also fixes a bug where it was possible to not reset the mAnimating flag
in the Phone app.

Change-Id: Ibab1c944ec895a7c19d5a18cc67f6e4db716f685
2010-03-26 15:54:09 -07:00