30579 Commits

Author SHA1 Message Date
Jeff Hamilton
5644d0e18a Support for NDEF on iCODE.
Change-Id: I9ce2ee5e739d34a9047ca494315cbc54b30fefb8
2011-02-24 22:03:20 -06:00
Xavier Ducrohet
db1acf52bb am 1175ef7e: Merge "LayoutLib: Adapt the HC layoutlib to GB. do not merge." into gingerbread
* commit '1175ef7e2e4f68532d8ade672d7f5502d9946ce4':
  LayoutLib: Adapt the HC layoutlib to GB. do not merge.
2011-02-24 16:21:41 -08:00
Xavier Ducrohet
86e43034a6 resolved conflicts for merge of a4350fc0 to gingerbread-plus-aosp
Change-Id: I065af5d555fa2197847ad47c84003dcd11fe26c7
2011-02-24 16:15:11 -08:00
Xavier Ducrohet
dff6b8e71d Merge "Add --non-constant-id to aapt." 2011-02-24 15:59:26 -08: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
Xavier Ducrohet
1175ef7e2e Merge "LayoutLib: Adapt the HC layoutlib to GB. do not merge." into gingerbread 2011-02-24 14:44:58 -08:00
Xavier Ducrohet
a4350fc0f3 Merge "LayoutLib: Original import of Honeycomb's layoutlib. do not merge." into gingerbread 2011-02-24 14:44:52 -08:00
repo sync
be2ed6d6e3 resolved conflicts for merge of c96b6690 to gingerbread-plus-aosp
Change-Id: I1d8a026d7efe0762865d6e1a6a3fc79cbbcbd9c4
2011-02-24 09:58:25 -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
Xavier Ducrohet
031d2f8b6d LayoutLib: Adapt the HC layoutlib to GB. do not merge.
Change-Id: I0b2016987a65fabbc0ce7011514543349e9fb929
2011-02-23 19:47:18 -08:00
Xavier Ducrohet
4b52ec49fe LayoutLib: Original import of Honeycomb's layoutlib. do not merge.
frameworks/base.git @ f0a53435f14d23d9555fc46014352ee6a7baa647

Change-Id: Ibc215751693dc7650683b61bb458f7c8beaf8060
2011-02-23 19:47:02 -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
Wink Saville
bf87c11590 Merge "WAPPushManager, WAP Push over SMS message handler" 2011-02-23 17:40:43 -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
Mike Lockwood
e2567f2200 Merge "GpsLocationProvider: Clean up HAL initialization/cleanup sequence" 2011-02-23 16:27:27 -08:00
Mike Lockwood
0a5098106c GpsLocationProvider: Clean up HAL initialization/cleanup sequence
Change-Id: Id5467000f3f3da5cbe1f112dad97a032688d2eac
Signed-off-by: Mike Lockwood <lockwood@android.com>
2011-02-23 14:01:44 -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
Jamie Gennis
76d0c763f0 am fa238f03: Merge "egl: fixes for object refcounts" into gingerbread
* commit 'fa238f033203f8e722b060af3f0095762b134f37':
  egl: fixes for object refcounts
2011-02-23 12:46:57 -08:00
Jamie Gennis
fa238f0332 Merge "egl: fixes for object refcounts" into gingerbread 2011-02-23 12:30:55 -08:00
Brad Fitzpatrick
0ca6bf18af Merge "Fixed GSM encoded network initiated position request" 2011-02-23 08:17:31 -08:00
Justin Ho
da34ab2148 am 9208875e: Updated iconography for network status and adding 4G assets
* commit '9208875e92ec190d49864b92823dd7011b9b443a':
  Updated iconography for network status and adding 4G assets
2011-02-22 21:19:05 -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
Michael I. Gold
c0775a2567 egl: fixes for object refcounts
eglMakeCurrent() would only deref the previous surfaces if the old and
new contexts were the same.  eglTerminate() should not touch TLS.
eglReleaseThread() needs to unbind the current context.

Change-Id: I7f4c090a287ee1e29e4708ae10679fb9d7d8c8c5
Related-Bug: 2964479
2011-02-22 18:15:08 -08:00
Justin Ho
9208875e92 Updated iconography for network status and adding 4G assets
Change-Id: Ie8dc203587836d88ded2846329db1a0c1667afcc
2011-02-22 16:12:46 -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
Alon Albert
ccc802e12b Merge "Support quoted parameters" into gingerbread 2011-02-22 10:31:26 -08:00
Brad Fitzpatrick
4564e9c34f Merge "Fixing infinite loop for zero duration." 2011-02-22 08:23:23 -08:00
Hakan Gustavsson
6664d989c8 Fixed GSM encoded network initiated position request
GSM encoded network initiated position requests were previously
not correctly decoded. The GSM encoded string was decoded as
ASCII but not all characters are encoded in the same way for
GSM and ASCII. These characters was not displayed.

Besides that, when the number of characters was evenly divided
by 8 the last character was lost. This is also corrected.

Change-Id: Ic70b7c28bbba1f2936a9cc99e78f8002cc5c8761
2011-02-22 14:35:47 +01:00
Jozef BABJAK
93c5b6a81d Releasing lock even if exception is thrown.
However, the whole method needs to be reviewed. It still has several
locking/unlocking places not tied together by try-finally construct,
but they cannot be fixed without deeper understanding.

Change-Id: Iaaf87568d585327654be409377b6d57a1da135eb
2011-02-22 09:33:19 +01: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
c007925423 Removing self-assignment statement.
Change-Id: I429235093de4539bde3950075fbdaa4ef5bdeedd
2011-02-22 08:09:01 +01:00
Jozef BABJAK
5d29860222 Fixing self-assignment in copying code.
Change-Id: I0799f83dc9d02b9bc31c76e747e6ba1ff58000b0
2011-02-22 08:06:44 +01:00
Jozef BABJAK
a8b9183a7c Fixing self-assignment in cloning code.
Change-Id: I6c918c0c7345678cbb171905eccfca50e59ae41a
2011-02-22 08:05:08 +01:00
Jozef BABJAK
c28480a1b4 Removing repetitive conditional; it simply does nothing except slowing down things.
Change-Id: I53a176cebae0051a33647317e2f269ebf149f7d2
2011-02-22 07:57:51 +01:00
Jozef BABJAK
4a64ab84d2 Removing repetitive conditional; it simply does nothing except slowing down things.
Change-Id: Ibe76c1ed49bdf66eb57702e5f89363a5132d9617
2011-02-22 07:55:23 +01:00
Jozef BABJAK
47f13e7c52 Fixing infinite loop for zero duration.
Change-Id: I837478c1598f1d2f99bf773597f0d66d0fc3cf1a
2011-02-22 07:20:30 +01:00
Jozef BABJAK
594b47d592 Using proper key for removing object from the map.
Stored value was used for map removal instead of key. The error was
silently ignore, because remove() method accepts Object type argument
and siletly does nothing when no value identified by such key is
found. Now proper key is used for removal. i.e. the same as for lookup.

Change-Id: I3a61fc219385cd0e7bcd4a33cd6ca23be220efe3
2011-02-21 15:44:06 +01:00
Jozef BABJAK
6fe725ee5d Using proper key for removing from map.
Window object was improperly used as a key for removing record from
map. This was silenly ignored, because remove() method accepts Object.
However, the ID should be used there which is type of String, i.e.
the same ID which was used for lookup.

Change-Id: I81fc2f90926a34414bf9042ddf4a2edff4c1fda1
2011-02-21 15:33:59 +01:00
Jozef BABJAK
b62353ad1d Removing wrong equals method in comparator.
This implementation of equals method has been likely created by
template in an IDE. It is useless, possibly leading to poor performance
and completely violating the contract of equals method as defined in
Object base class.

Change-Id: I5e7fd759b7bd9370b44d9374b57390c4e9feba02
2011-02-21 15:19:00 +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
Maarten Hooft
62f40c8bcf am 99cca89f: Merge "Import revised translations. DO NOT MERGE" into gingerbread
* commit '99cca89f41e500f8b39fd75eb17f337422c4ac90':
  Import revised translations.  DO NOT MERGE
2011-02-18 15:22:48 -08: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
Romain Guy
7118bdec52 Merge "Fix for #12945: ProgressBar.setMax() will always redraw." 2011-02-17 22:40:33 -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
Maarten Hooft
99cca89f41 Merge "Import revised translations. DO NOT MERGE" into gingerbread 2011-02-17 17:17:40 -08:00
noda
7640caaf91 WAPPushManager, WAP Push over SMS message handler
The WAPPushManager is a new, optional service for handling WAP Push
over SMS messages.  This service allows a carrier to designate a high
priority handler for specific WAP Push over SMS messages without
affecting other WAP Push over SMS, binary SMS, or SMS text messages.
It is also optional, so that it can be configured out of the target
image resulting in no change in the WAP Push over SMS handling
behavior compared to the current AOSP.

- This patch contains the WAPPushManager itself, the associated test
  code, and the modifications to telephony to use the WAPPushManager.

Change-Id: I4f7fb5b68fc666da9bdeeea525e8797ae317e4b5
2011-02-18 00:31:24 +09:00