Commit Graph

622 Commits

Author SHA1 Message Date
Konstantin Lopyrev
a15dcfaf2b Fix 2677197: Adding minimum complex character support.
Change-Id: I520bc5f9aa924bf9b5585b2235a91cc96cb99c25
2010-05-27 15:27:06 -07:00
Amith Yamasani
8b932067c1 Merge "Add a battery capacity value to the power profile." 2010-05-27 10:49:08 -07:00
Amith Yamasani
bed865932f Add a battery capacity value to the power profile.
Can be accessed through PowerProfile.getBatteryCapacity()

Individual device profiles need to be updated with their capacities.
2010-05-27 10:37:54 -07:00
Jim Miller
dc0f4f059c Merge "Fix 2584857: Reset grabbed state when SlidingTab visibility changes" 2010-05-26 13:22:26 -07:00
Jim Miller
92c1571f0a Fix 2584857: Reset grabbed state when SlidingTab visibility changes
This fixes a case where the widget is hidden while the grabbed
state is set. The result is that the host of the widget is never
informed that the grabbed state changed.

Change-Id: I78b41cff0e31e982a3b46f0319260ba59815092c
2010-05-25 19:20:36 -07:00
Konstantin Lopyrev
3255823de0 Fix 2673731: Adding support for password history to Device Admin.
Change-Id: If3240048813e32b2bae79fe5cb8a73aea20ec56c
2010-05-24 17:13:18 -07:00
Wink Saville
33c26f9fd0 am 199d3783: am 7e3b31d7: Merge "Update docs, add HANDLED, NOT_HANDLED and getCurrentMessage." into kraken 2010-05-19 13:09:11 -07:00
Wink Saville
7e3b31d786 Merge "Update docs, add HANDLED, NOT_HANDLED and getCurrentMessage." into kraken 2010-05-19 13:05:55 -07:00
Wink Saville
a4f3bec29c Update docs, add HANDLED, NOT_HANDLED and getCurrentMessage.
The EBNF statemachine description language was to difficult
to remember changed to use a simpler and more obvious psuedo
language.

Added HANDLED and NOT_HANDLED as it makes the psuedo code
more obvious.

Added getCurrentMessage primarily for use by code in enter
so that it can know why the new state is being entered.

Change-Id: I1446e417b77684fbde0020b1da0975eedc57cce4
2010-05-19 09:11:38 -07:00
The Android Open Source Project
39ccc0811f am 56d4bcd8: am 627356ce: am d6c0bb0f: merge from open-source master 2010-05-19 08:36:58 -07:00
The Android Open Source Project
627356cee4 am d6c0bb0f: merge from open-source master
Merge commit 'd6c0bb0f0f3827f1c336db20ac9dc0eb90cd46fa' into kraken

* commit 'd6c0bb0f0f3827f1c336db20ac9dc0eb90cd46fa':
  Removed Calls to deprecated APIs
2010-05-19 08:33:27 -07:00
The Android Open Source Project
d6c0bb0f0f merge from open-source master
Change-Id: I0598edad283a177a5ddcc30e20d2284503e6038e
2010-05-19 08:28:32 -07:00
Romain Guy
2b9a49a30d Merge "Removed Calls to deprecated APIs" 2010-05-19 00:01:02 -07:00
Dianne Hackborn
9b081a809a resolved conflicts for merge of 8b625a95 to master
Change-Id: I03264c6aad2d87629f9154f5c390cb36ce08efba
2010-05-18 18:21:07 -07:00
Dianne Hackborn
dc8a7f69d7 Add new API to take over a window's Surface.
Change-Id: Iad6245faadc95f19ea63c8e229a1c02e9188f69e
2010-05-18 10:46:33 -07:00
The Android Open Source Project
f90fa1a04f am 75c1b73d: am 40090708: am 4547e528: merge from open-source master 2010-05-18 09:28:28 -07:00
The Android Open Source Project
400907086a am 4547e528: merge from open-source master
Merge commit '4547e5284e79192373f3a6bb6c452501171bc1d6' into kraken

* commit '4547e5284e79192373f3a6bb6c452501171bc1d6':
  Removed Calls to deprecated APIs and unused Imports
2010-05-18 09:21:28 -07:00
The Android Open Source Project
4547e5284e merge from open-source master
Change-Id: I3607454a9257701855354c12ef1f36841c889aea
2010-05-18 09:18:37 -07:00
Christian Mehlmauer
15d24708b1 Removed Calls to deprecated APIs and unused Imports
Change-Id: Ib26783ca1d6c345cc91aa3ab5b9654f5316c78a0
2010-05-17 21:27:27 +02:00
Christian Mehlmauer
746a95ab71 Removed Calls to deprecated APIs
Change-Id: I3f9b6a8d3c8a050156a6cc7ea0eb9de33b82f79a
2010-05-17 21:16:20 +02:00
Adam Powell
a1700783b5 ActionBar - custom navigation views
Change-Id: Ibc98565816c713474eefd4e96fb51175abfb0187
2010-05-14 10:35:21 -07:00
Jeff Hamilton
7cd51efcbd Remove the deprecated cursor methods.
Change-Id: Ie3571fea9f36996c31c327240b11086f8cc487f0
2010-05-13 23:44:09 -05:00
Mike Lockwood
468202dd71 am 702b8752: am 5a9cbb29: am a3d5549c: am 098e58da: Use SystemClock.elapsedRealtime in ShutdownThread timeout logic 2010-05-13 14:09:46 -07:00
Mike Lockwood
5a9cbb291f am a3d5549c: am 098e58da: Use SystemClock.elapsedRealtime in ShutdownThread timeout logic
Merge commit 'a3d5549c802bc4fbf1e1ca05bc3552db17212036' into kraken

* commit 'a3d5549c802bc4fbf1e1ca05bc3552db17212036':
  Use SystemClock.elapsedRealtime in ShutdownThread timeout logic
2010-05-13 14:06:25 -07:00
Mike Lockwood
a3d5549c80 am 098e58da: Use SystemClock.elapsedRealtime in ShutdownThread timeout logic
Merge commit '098e58da93f304d7d7791f193c6237870b94989d' into froyo-plus-aosp

* commit '098e58da93f304d7d7791f193c6237870b94989d':
  Use SystemClock.elapsedRealtime in ShutdownThread timeout logic
2010-05-13 14:04:30 -07:00
Mike Lockwood
098e58da93 Use SystemClock.elapsedRealtime in ShutdownThread timeout logic
This avoids problems if the time is reset while shutting down.

Change-Id: I54c7c787e55648ebf5a68e79056f92fbac0081ae
Signed-off-by: Mike Lockwood <lockwood@android.com>
2010-05-13 16:29:49 -04:00
Adam Powell
33b974393b ActionBar added to framework, integrated with Activity and styles.
Added onClick attribute support to menus in MenuInflater.

Change-Id: I739771b4f249d87a0d8b15969f3d526b099067a1
2010-05-13 01:27:59 -07:00
Konstantin Lopyrev
863f22d045 Fix 2673731: Added password history
Change-Id: I88919357abea31062caf96b214823b03cbaa15a4
2010-05-12 17:17:53 -07:00
Adam Powell
42364be58b am b7e23dbe: am 37f4f5b1: am d135f74b: am 151af19b: Fix bug 2651076 - Catch/log ActivityNotFoundException in MenuItemImpl.invoke() 2010-05-05 11:07:30 -07:00
Adam Powell
37f4f5b1ea am d135f74b: am 151af19b: Fix bug 2651076 - Catch/log ActivityNotFoundException in MenuItemImpl.invoke()
Merge commit 'd135f74b972b88de2ae8b11b3ada886d29c1e25d' into kraken

* commit 'd135f74b972b88de2ae8b11b3ada886d29c1e25d':
  Fix bug 2651076 - Catch/log ActivityNotFoundException in MenuItemImpl.invoke()
2010-05-04 15:41:41 -07:00
Adam Powell
d135f74b97 am 151af19b: Fix bug 2651076 - Catch/log ActivityNotFoundException in MenuItemImpl.invoke()
Merge commit '151af19bf409a47424ddaa51e1ac4a0c532c4eb6' into froyo-plus-aosp

* commit '151af19bf409a47424ddaa51e1ac4a0c532c4eb6':
  Fix bug 2651076 - Catch/log ActivityNotFoundException in MenuItemImpl.invoke()
2010-05-04 15:40:36 -07:00
Adam Powell
151af19bf4 Fix bug 2651076 - Catch/log ActivityNotFoundException in MenuItemImpl.invoke()
Change-Id: I841a37349fbc6af33073aaecae903eb8999cc5bd
2010-05-04 14:44:45 -07:00
The Android Open Source Project
8bede19e88 am facad955: am dcb5f18f: am 007ad770: merge from open-source master 2010-05-03 16:28:29 -07:00
The Android Open Source Project
dcb5f18fd6 am 007ad770: merge from open-source master
Merge commit '007ad7700a23ff7e618cfeee1eab97063c93b800' into kraken

* commit '007ad7700a23ff7e618cfeee1eab97063c93b800':
  Adapt to new location of libcore
  Parse custom text header and ignore it.
  Parse "multipart/vnd.wap.multipart.alternative" which is a part of multipart body (nested multipart).
  'uses-library' was not working for persistent applications.
  Fix an NPE in InputMethodService when mExtractAction is null.
2010-05-03 16:25:15 -07:00
The Android Open Source Project
007ad7700a merge from open-source master
Change-Id: If72ad6758c9e1bf77c38c4afec6b00ec9d5b89e4
2010-05-03 16:19:31 -07:00
takuo
42b21c3333 Parse custom text header and ignore it.
Some MMS carrier append own custom header as text into PduData. We should parse it and ignore it at the moment.

Change-Id: I4d6cf20f5cf99172ebbe310ab18101316eb04c77
2010-04-30 07:11:53 +09:00
takuo
334dc0b270 Parse "multipart/vnd.wap.multipart.alternative" which is a part of multipart body (nested multipart).
And take the first part of parsed as a parent part data.

Change-Id: I2752654f41d642524061802772e2a7eaa10a4e2d
2010-04-30 05:12:19 +09:00
Daniel Lehmann
4fcc5b1f93 Ensure public methods exist to update the state of the UI, so that it can be set from outside
Change-Id: Ib1d7b0b36b6cdcbf1256647da76130927a29ec6d
2010-04-19 13:41:07 -07:00
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