Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
30,305 Commits 3 Branches 0 Tags
6c5d9a0622ed33be8549f8d4dcdf597b0dc499cf
Commit Graph

9838 Commits

Author SHA1 Message Date
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
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
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
Alon Albert
1aba843dc3 am ccc802e1: Merge "Support quoted parameters" into gingerbread 
* commit 'ccc802e12be64248c2c6822eb36a957435a06ef2':
  Support quoted parameters
 2011-02-22 21:18:52 -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
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
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
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
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
Robert Ly
2deeefeb5e Adding package summary for nfc.tech package 
Change-Id: Ibbf55c21dcaf48b4eb369e78c54fb1023abb3cb3
 2011-02-15 17:41:47 -08:00
Gilles Debunne
8e28ab22de am 2050de5b: Text selection is broken. 
* commit '2050de5b9a5c097e30545ab822211d49031bd9dc':
  Text selection is broken.
 2011-02-09 16:49:42 -08:00
Gilles Debunne
2050de5b9a Text selection is broken. 
Bug 3439569

Lazy initialization code was not back-ported.

Change-Id: I9815f649891e2ddc602383488749144686ab1dd3
 2011-02-09 14:17:22 -08:00
Jeff Hamilton
c1cc9ba6d1 am 58c9d472: Merge "More documentation updates for NFC." into gingerbread 
* commit '58c9d4726ebf3165b0dbbcebb1130dfc5502bfe9':
  More documentation updates for NFC.
 2011-02-09 00:36:53 -08:00
Jeff Hamilton
58c9d4726e Merge "More documentation updates for NFC." into gingerbread 2011-02-09 00:34:22 -08:00
Jeff Hamilton
28319c0cec More documentation updates for NFC. 
Change-Id: Ie134d4296ee12333e6647ce76126f9767ba1ba34
 2011-02-09 17:26:47 +09:00
Nick Pelly
47dac545da am 39cf3a44: Document NFC permissions. 
* commit '39cf3a445e507f219ecc8a476f6038f095d9d520':
  Document NFC permissions.
 2011-02-08 23:25:29 -08:00
Nick Pelly
39cf3a445e Document NFC permissions. 
Change-Id: Ib1b1625058c9c673692f3fbcb3546ec7c2d54a07
 2011-02-09 16:10:46 +09:00
Jeff Hamilton
1ac35411f1 am 584afa8d: Merge "Improve the docs a bit for foreground dispatch." into gingerbread 
* commit '584afa8dde1777b181e773a491416769f25607a8':
  Improve the docs a bit for foreground dispatch.
 2011-02-08 19:33:53 -08:00
Jeff Hamilton
167d9e473f Improve the docs a bit for foreground dispatch. 
Change-Id: I4179133a0956bc66a49201c20f1dd2d6d67874d2
 2011-02-09 12:30:18 +09:00
Gilles Debunne
63bd55c7bf am cdfe8999: Fix for multiple merge problem. 
* commit 'cdfe899991c365d9e197d83f8859089cae082011':
  Fix for multiple merge problem.
 2011-02-08 17:31:33 -08:00
Gilles Debunne
e04c14962f resolved conflicts for merge of c0728cc0 to gingerbread-plus-aosp 
Change-Id: I1b941e0610e498365d441c7bd23af276d1b5f986
 2011-02-08 16:33:58 -08:00
Gilles Debunne
cdfe899991 Fix for multiple merge problem. 
Change-Id: I5d9c497f44aa9cdc34c195c41e02c3d7353c3fb4
 2011-02-04 16:50:01 -08:00
Kenny Root
c4dfa998b7 am d2a99617: am c94a9998: Merge "JPtextinput: Dont break emoji characters when cutting strings." 
* commit 'd2a996173e53e7b38ff9b703cc5986d9715508a1':
  JPtextinput: Dont break emoji characters when cutting strings.
 2011-02-04 16:12:14 -08:00
Kenny Root
d2a996173e am c94a9998: Merge "JPtextinput: Dont break emoji characters when cutting strings." 
* commit 'c94a99987d8a49ea599c22ffad0e61db591963e0':
  JPtextinput: Dont break emoji characters when cutting strings.
 2011-02-04 16:01:13 -08:00
Gilles Debunne
1ba2a47b82 am 893ac28f: Merge "Blinking runnable is created only if text is editable. DO NOT MERGE." into gingerbread 
* commit '893ac28f75561061a8f334cbd4e47833d7fd7843':
  Blinking runnable is created only if text is editable. DO NOT MERGE.
 2011-02-04 15:50:15 -08:00
Gilles Debunne
826fbdf7b6 am 8a6ba494: Merge "All runnable are stopped on detach. DO NOT MERGE." into gingerbread 
* commit '8a6ba494a28702e68b0a8fbd8bac34335536a8f8':
  All runnable are stopped on detach. DO NOT MERGE.
 2011-02-04 15:50:12 -08:00
Gilles Debunne
c0728cc042 Double tap triggers text selection in a TextView. DO NOT MERGE 
This is a convenient way to switch to selection mode without the
context menu. Context menu is still available and offerts Select Input method option.

Browser overloads touch events and this feature is not available in Browser which
limits the conflict with double tap zoom in browser.

Change-Id: I286504cf03733d5c2fb9bc01765f713d14bbd2f4
 2011-02-04 15:50:10 -08:00
Gilles Debunne
2f7e9d403a am 53841df2: Merge "SelectAllOnFocus shows a higlighted text. DO NOT MERGE." into gingerbread 
* commit '53841df2a49bffa53ba3d1e4b0580f4f23a64dc3':
  SelectAllOnFocus shows a higlighted text. DO NOT MERGE.
 2011-02-04 15:49:56 -08:00
Gilles Debunne
893ac28f75 Merge "Blinking runnable is created only if text is editable. DO NOT MERGE." into gingerbread 2011-02-04 15:46:15 -08:00
Gilles Debunne
8a6ba494a2 Merge "All runnable are stopped on detach. DO NOT MERGE." into gingerbread 2011-02-04 15:46:11 -08:00
Gilles Debunne
53841df2a4 Merge "SelectAllOnFocus shows a higlighted text. DO NOT MERGE." into gingerbread 2011-02-04 15:46:06 -08:00
Kenny Root
c94a99987d Merge "JPtextinput: Dont break emoji characters when cutting strings." 2011-02-04 15:42:14 -08:00
Nick Pelly
062443f295 am 40684946: Merge "Fix docs type that broke build." into gingerbread 
* commit '40684946cb00080c1c7424885f49a809816dd26e':
  Fix docs type that broke build.
 2011-02-03 16:32:29 -08:00
Nick Pelly
40684946cb Merge "Fix docs type that broke build." into gingerbread 2011-02-03 16:27:51 -08:00
Nick Pelly
46797ac098 Fix docs type that broke build. 
Change-Id: I5b5a2fc5baf95ace74bf90ff2c750ba890054d64
 2011-02-03 16:23:58 -08:00
Nick Pelly
5394ef0618 am 630ac8df: Merge "NFC documentation overhaul." into gingerbread 
* commit '630ac8df2478cd0d47a90b95fbb13b9de4ad58b1':
  NFC documentation overhaul.
 2011-02-03 15:55:53 -08:00
Nick Pelly
630ac8df24 Merge "NFC documentation overhaul." into gingerbread 2011-02-03 15:23:17 -08:00
Nick Pelly
74fe6c6b24 NFC documentation overhaul. 
Change-Id: I45dca95a24b2d0327e080436fbcc7b1dad79de02
 2011-02-03 15:11:09 -08:00