Commit Graph

15336 Commits

Author SHA1 Message Date
Xavier Ducrohet
b732b7b5e8 am ce57a7f3: am 6504490c: am dff6b8e7: Merge "Add --non-constant-id to aapt."
* commit 'ce57a7f35344e76689d30f45964d1e37b78280cb':
  GpsLocationProvider: Clean up HAL initialization/cleanup sequence
  Fixed GSM encoded network initiated position request
  Ensuring thread-safe usage of DateFormat.
  Fixing infinite loop for zero duration.
  Fix for an infinite loop while scrolling lists.
  WAPPushManager, WAP Push over SMS message handler
  Add --non-constant-id to aapt.
2011-02-28 10:10:38 -08:00
Xavier Ducrohet
ce57a7f353 am 6504490c: am dff6b8e7: Merge "Add --non-constant-id to aapt."
* commit '6504490cde3ec5d48321d539e654d1f2072b33f9':
  GpsLocationProvider: Clean up HAL initialization/cleanup sequence
  Fixed GSM encoded network initiated position request
  Ensuring thread-safe usage of DateFormat.
  Fixing infinite loop for zero duration.
  Fix for an infinite loop while scrolling lists.
  WAPPushManager, WAP Push over SMS message handler
  Add --non-constant-id to aapt.
2011-02-28 09:51:38 -08:00
Xavier Ducrohet
6504490cde am dff6b8e7: Merge "Add --non-constant-id to aapt."
* commit 'dff6b8e71dda9f5d841fa26408714aec2aef1505':
  GpsLocationProvider: Clean up HAL initialization/cleanup sequence
  Fixed GSM encoded network initiated position request
  Ensuring thread-safe usage of DateFormat.
  Fixing infinite loop for zero duration.
  Fix for an infinite loop while scrolling lists.
  WAPPushManager, WAP Push over SMS message handler
  Add --non-constant-id to aapt.
2011-02-28 09:16:38 -08:00
Mike Lockwood
1b8956398b am 69e19ae1: DO NOT MERGE: KeyguardManager: Fix copy & paste error in isKeyguardLocked()
* commit '69e19ae15baa5785667dbf45c7a2d508e429099b':
  DO NOT MERGE: KeyguardManager: Fix copy & paste error in isKeyguardLocked()
2011-02-26 13:21:20 -08:00
Mike Lockwood
bbd460d76d am 6aea1154: DO NOT MERGE: KeyguardManager: Add isKeyguardLocked() and isKeyguardSecure()
* commit '6aea1154bae3a0935fdb9b09b2d91d9548232eb0':
  DO NOT MERGE: KeyguardManager: Add isKeyguardLocked() and isKeyguardSecure()
2011-02-26 13:21:05 -08:00
Mike Lockwood
69e19ae15b DO NOT MERGE: KeyguardManager: Fix copy & paste error in isKeyguardLocked()
BUG: 3402847

Change-Id: Ic731e49b43fa40df6f8b658d8620a99a85c346e6
Signed-off-by: Mike Lockwood <lockwood@android.com>
2011-02-26 14:32:22 -05:00
Mike Lockwood
6aea1154ba DO NOT MERGE: KeyguardManager: Add isKeyguardLocked() and isKeyguardSecure()
BUG: 3402847

Change-Id: I7cb199763e8d5386914b4c2173c9e1579b08674c
Signed-off-by: Mike Lockwood <lockwood@android.com>
2011-02-26 14:32:00 -05:00
Svetoslav Ganov
f114809031 resolved conflicts for merge of 66edf2bb to honeycomb-plus-aosp
Change-Id: I687ca9b7873890e3b30da16d5dde6b57ce92f0d6
2011-02-25 12:39:59 -08:00
Svetoslav Ganov
66edf2bb3f am 9e5b1a49: Merge "Use different version of CLDR data in DatePicker" into gingerbread
* commit '9e5b1a49022d08aee8653fd34f3a8cd878618aa5':
  Use different version of CLDR data in DatePicker
2011-02-25 00:09:03 -08:00
Svetoslav Ganov
9e5b1a4902 Merge "Use different version of CLDR data in DatePicker" into gingerbread 2011-02-24 23:56:52 -08:00
Jeff Hamilton
09979bcf73 am fd34aa8e: am 5644d0e1: Support for NDEF on iCODE.
* commit 'fd34aa8e1386547bcfbaf043f26c054946b92c2b':
  Support for NDEF on iCODE.
2011-02-24 20:43:15 -08:00
Jeff Hamilton
fd34aa8e13 am 5644d0e1: Support for NDEF on iCODE.
* commit '5644d0e18ad847b66a8cb4f185cb28edebe75d88':
  Support for NDEF on iCODE.
2011-02-24 20:30:14 -08:00
Jeff Hamilton
5644d0e18a Support for NDEF on iCODE.
Change-Id: I9ce2ee5e739d34a9047ca494315cbc54b30fefb8
2011-02-24 22:03:20 -06:00
Svetoslav Ganov
ef7ec7a029 Use different version of CLDR data in DatePicker
The ICU CLDR data doesn't use the month abbreviations that are
appropriate for the DatePicker, so use the framework copy of the CLDR
data.

Bug: 2641810
Note: cherry-picked from Honeycomb

Change-Id: I3c045dbfb751b8b7ce6361b5a67407206fc64db1
2011-02-24 15:45:04 -08:00
Alon Albert
c96b669013 Merge "DO NOT MERGE - Increasing timeout to 60 sec This was already done in HC branch in this CL: https://android-git.corp.google.com/w/?p=platform/frameworks/base.git;a=commit;h=d39fd5a97c6f56794a6ed7ac1dfb0bbf585becf1 This is also related to bug http://b/issue?id=3402863 I first considered increasing the timeout specificaly for our GData client but when I saw we already accepted a CL for HC that did this at a lower level, I decided to do that instead." into gingerbread 2011-02-24 09:20:46 -08:00
Jason Chen
22577b8d3a am 5ff79c3b: Merge "DO NOT MERGE Cherry-pick of Ie4026a7c back to GB" into gingerbread
* commit '5ff79c3b06d7087153617dc973491fc890700af5':
  DO NOT MERGE Cherry-pick of Ie4026a7c back to GB
2011-02-23 18:03:34 -08:00
Jason Chen
5ff79c3b06 Merge "DO NOT MERGE Cherry-pick of Ie4026a7c back to GB" into gingerbread 2011-02-23 17:23:53 -08:00
Dianne Hackborn
9248e95a2f DO NOT MERGE Cherry-pick of Ie4026a7c back to GB
Original change description follows:
-----------------------------------

Implement issue #3326435: Battery stats improvements

Keep track of discharge while screen is on vs. off.

Checkin looks like:

5,0,u,dc,1,1,1,0

The last four numbers are, from left:

- Maximum battery drain over time period.
- Minimum battery drain over time period.
- Battery drain while screen was on.
- Battery drain while screen was off.

Change-Id: Ie3cfe52df29b3f28ba8dc3350abe6cc967c76324
2011-02-23 17:21:09 -08:00
Scott Main
b1eea45a71 am 201959af: Merge "docs: fix sensorevent code snippets bug: 3480932" into honeycomb
* commit '201959af6e61c148576c77de6cf772456d664251':
  docs: fix sensorevent code snippets bug: 3480932
2011-02-23 16:00:08 -08:00
Scott Main
201959af6e Merge "docs: fix sensorevent code snippets bug: 3480932" into honeycomb 2011-02-23 15:58:13 -08:00
Irfan Sheriff
b0e5326d8c am a46a5cba: Merge "DO NOT MERGE No backup of country and sleep policy" into honeycomb
* commit 'a46a5cba276ee269d227a5e4d69f3891c4349edf':
  DO NOT MERGE No backup of country and sleep policy
2011-02-23 14:38:10 -08:00
Alon Albert
9add122296 DO NOT MERGE - Increasing timeout to 60 sec
This was already done in HC branch in this CL:
https://android-git.corp.google.com/w/?p=platform/frameworks/base.git;a=commit;h=d39fd5a97c6f56794a6ed7ac1dfb0bbf585becf1
This is also related to bug http://b/issue?id=3402863
I first considered increasing the timeout specificaly for our GData client
but when I saw we already accepted a CL for HC that did this at a lower level, I decided
to do that instead.

Bug: 3402863
Change-Id: I7ef2968ecbab3cc0d698a408f2c643c83d333e2f
2011-02-23 13:55:11 -08:00
Irfan Sheriff
ae388dac6d DO NOT MERGE No backup of country and sleep policy
Remove country code and sleep policy setting back up as it
is a device specific setting

Bug: 3481068
Change-Id: Ifc824c1cd3c3706f8cdaf09b06a05a0c94243acb
2011-02-23 13:51:52 -08:00
Scott Main
02be2f1d87 am 2788e4f9: docs: fix some typos
* commit '2788e4f96a3f210192145a340a1d072c70c7bc4f':
  docs: fix some typos
2011-02-23 11:24:42 -08:00
Scott Main
d11ee90b6e docs: fix sensorevent code snippets
bug: 3480932

Change-Id: Id97ca4e0edfb92eaac0f2996bc5e91d757644afb
2011-02-23 10:57:23 -08:00
Scott Main
2788e4f96a docs: fix some typos
Change-Id: I2dc9855f8fe87234d4337351e8bac6c382fb74d2
2011-02-23 10:54:31 -08:00
Alon Albert
a0946d6399 am 1aba843d: am ccc802e1: Merge "Support quoted parameters" into gingerbread
* commit '1aba843dc327490a749059bcddff90e8048ed75c':
  Support quoted parameters
2011-02-22 21:23:50 -08:00
Alon Albert
1aba843dc3 am ccc802e1: Merge "Support quoted parameters" into gingerbread
* commit 'ccc802e12be64248c2c6822eb36a957435a06ef2':
  Support quoted parameters
2011-02-22 21:18:52 -08:00
Romain Guy
e5410aa165 am ad492161: am a2090bea: am 7118bdec: Merge "Fix for #12945: ProgressBar.setMax() will always redraw."
* commit 'ad492161e4384efe11daec60cd14902f6b2c662a':
  Fix for #12945: ProgressBar.setMax() will always redraw.
2011-02-22 14:48:21 -08:00
Elliott Hughes
904f8a2032 Merge "Ensuring thread-safe usage of DateFormat." 2011-02-22 11:16:04 -08:00
Brad Fitzpatrick
a67191a174 Merge "Fix for an infinite loop while scrolling lists." 2011-02-22 10:55:44 -08:00
Jozef BABJAK
25d8b05fb7 Ensuring thread-safe usage of DateFormat.
DateFormat is inherently unsafe for multithreaded use. This patch adds
proper synchronization. The 'sLock' is re-used. To avoid two consecutive
lockings, locked version of initFormatStrings() method is created and
used where appropriate, i.e. in original method AND in added synchronized
block.

Change-Id: Id3c34613623e743e703aadb2342aa788679dda8a
2011-02-22 09:17:51 +01:00
Jozef BABJAK
47f13e7c52 Fixing infinite loop for zero duration.
Change-Id: I837478c1598f1d2f99bf773597f0d66d0fc3cf1a
2011-02-22 07:20:30 +01:00
Daniel Mladenovic
0b1ab3a277 Fix for an infinite loop while scrolling lists.
When scrolling in a list it's possible to get stuck in a
loop where the screen is continuously redrawn. This happens
when you are at the end of a list and try to scroll further.
The problem is that you enter a switch statement with the
mState variable set to STATE_PULL_DECAY. This will trigger
code in the switch statement that does some adjustments and
calculations, but it does not change the value of mState to
STATE_IDLE or STATE_RECEDE after it's done. Hence it will
continue to return to the same place and not stop updating
since the update() method signals for completion only when
the mState variable is set to STATE_IDLE.

The fix is changing the value of mState after the
adjustments and calculations have been made.

Change-Id: I57bc84ec12d43ca87a1163d94cb5b206a376a24e
2011-02-21 09:17:40 +01:00
Alon Albert
06912bddc6 Support quoted parameters
iCalendar RFC http://www.ietf.org/rfc/rfc2445.txt says:
4.1.1 List and Field Separators
   Property parameters with values containing a COLON, a SEMICOLON or a
   COMMA character MUST be placed in quoted text.

So we must be able to support this.

Bug: 3463510
Change-Id: Ie0463fdc2d5cbc340801cc8cc5b4f00e374f2954
2011-02-18 09:40:44 -08:00
Romain Guy
ad492161e4 am a2090bea: am 7118bdec: Merge "Fix for #12945: ProgressBar.setMax() will always redraw."
* commit 'a2090bea4824cf153c4d9c735ee779613cf2e3d7':
  Fix for #12945: ProgressBar.setMax() will always redraw.
2011-02-18 08:06:01 -08:00
Romain Guy
a2090bea48 am 7118bdec: Merge "Fix for #12945: ProgressBar.setMax() will always redraw."
* commit '7118bdec523568842e70555e353951df9f2596fd':
  Fix for #12945: ProgressBar.setMax() will always redraw.
2011-02-18 07:53:50 -08:00
Michael Krehan
58e3822b59 Fix for #12945: ProgressBar.setMax() will always redraw.
Fix for issue #12945: Changing the maximum of a progress bar does
not cause it to be redrawn, even though a new maximum changes the
position of the current progress in relation to its maximum. With this fix,
setMax() will always cause refreshProgress() to be called if the maximum is
different than it was before.

Change-Id: I971ec3302953bcadc0aac3dd8241481bab2b5a91
2011-02-17 20:56:29 -08:00
Andy Stadler
04ddff6905 am b1835085: Merge "@hide DPM global proxy settings" into honeycomb
* commit 'b18350851633b1d3717f2484d27b76aa64788ce1':
  @hide DPM global proxy settings
2011-02-16 12:20:36 -08:00
Andy Stadler
d26727273d @hide DPM global proxy settings
They don't work as advertised, so remove from SDK.

Bug: 3460938

Change-Id: I87f80ebf38b228a4085630f1c2526c1d86b93dd7
2011-02-16 10:53:33 -08:00
Alon Albert
b79db4cd5c am be5f82ab: Merge "DO NOT MERGE - Clear backoffs on reconnect" into gingerbread
* commit 'be5f82ab0ddacea3846cfa5aa846d1c97def0318':
  DO NOT MERGE - Clear backoffs on reconnect
2011-02-16 10:24:15 -08:00
Alon Albert
be5f82ab0d Merge "DO NOT MERGE - Clear backoffs on reconnect" into gingerbread 2011-02-16 10:20:13 -08:00
Alon Albert
c441e4e355 DO NOT MERGE - Clear backoffs on reconnect
Slightly modified backport from HC

Bug: 3460736
Change-Id: I155dfd34bb7abb76a10b5b58fe9a32af2449d4f1
2011-02-16 10:16:33 -08:00
daniel_tomas
54f9be2a26 am 99e267eb: am 7bcd2c62: New API added in NfcAdapter to enable/disable SE card emulation
* commit '99e267ebcf8f950cbdcf8438cc7383e1fc6a56c2':
  New API added in NfcAdapter to enable/disable SE card emulation
2011-02-16 09:43:08 -08:00
daniel_tomas
99e267ebcf am 7bcd2c62: New API added in NfcAdapter to enable/disable SE card emulation
* commit '7bcd2c62ebfad640e8082c1dc700c9d8c57aba81':
  New API added in NfcAdapter to enable/disable SE card emulation
2011-02-16 09:41:00 -08:00
daniel_tomas
7bcd2c62eb New API added in NfcAdapter to enable/disable SE card emulation
Change-Id: Ia0c123873ba9265b45e847d1a30c1300de3c1346
2011-02-16 09:27:25 -08:00
Robert Ly
e131ccb615 am c3ebf27a: am 4bebbe5f: Merge "Adding package summary for nfc.tech package" into gingerbread
* commit 'c3ebf27a511934d7529b2fbde223169e83c74561':
  Adding package summary for nfc.tech package
2011-02-15 22:58:51 -08:00
Robert Ly
c3ebf27a51 am 4bebbe5f: Merge "Adding package summary for nfc.tech package" into gingerbread
* commit '4bebbe5fea1b6d7f5deff6d41d7633308607c08b':
  Adding package summary for nfc.tech package
2011-02-15 22:54:52 -08:00
Scott Main
0ab1b326c7 am 13033ea5: docs: fix misc broken links
* commit '13033ea52714d48d754c6bc8fccb18514c645a47':
  docs: fix misc broken links
2011-02-15 20:08:07 -08:00
Robert Ly
2deeefeb5e Adding package summary for nfc.tech package
Change-Id: Ibbf55c21dcaf48b4eb369e78c54fb1023abb3cb3
2011-02-15 17:41:47 -08:00