drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
43,445 Commits 1 Branch 0 Tags
Commit Graph

43445 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Dirk Dougherty
1649d91f78 am a47ef32e: Merge "Doc change: Add announce for Android at GDC 2011." into honeycomb 
* commit 'a47ef32e8bd8eb944e97e12e3b1fac87f87bcd76':
  Doc change: Add announce for Android at GDC 2011.
 2011-02-27 22:34:33 -08:00
Dirk Dougherty
a47ef32e8b Merge "Doc change: Add announce for Android at GDC 2011." into honeycomb 2011-02-27 22:23:25 -08:00
Dirk Dougherty
ba27fe163f Doc change: Add announce for Android at GDC 2011. 
Change-Id: I0f170fa0e926154feab09a97159fd257706af50d
 2011-02-27 19:36:06 -08:00
Jamie Gennis
0dc5fdb9b2 am e630e5f4: am 919853ce: Merge "Prevent SurfaceFlinger from using layer token 31." into gingerbread 
* commit 'e630e5f49ba15005172dceeda7299569b2d2351f':
  Prevent SurfaceFlinger from using layer token 31.
 2011-02-27 15:55:21 -08:00
Jamie Gennis
e630e5f49b am 919853ce: Merge "Prevent SurfaceFlinger from using layer token 31." into gingerbread 
* commit '919853ce244f853966817d4adb2f3b7b6e4bbe74':
  Prevent SurfaceFlinger from using layer token 31.
 2011-02-27 15:44:36 -08:00
Jamie Gennis
919853ce24 Merge "Prevent SurfaceFlinger from using layer token 31." into gingerbread 2011-02-27 15:27:22 -08:00
Mike Lockwood
710c510b36 am 8719c406: DO NOT MERGE: MTP: Disable MTP when the keyguard is locked and secure 
* commit '8719c406c3db17842d9350c1f6611f088d105f38':
  DO NOT MERGE: MTP: Disable MTP when the keyguard is locked and secure
 2011-02-26 13:21:28 -08:00
Mike Lockwood
fbd67fec87 am 0600fff9: DO NOT MERGE: MTP: Add support for dynamically adding and removing storage units 
* commit '0600fff9149df3af01e90d4996b70dbc1ee7c135':
  DO NOT MERGE: MTP: Add support for dynamically adding and removing storage units
 2011-02-26 13:21:23 -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
8719c406c3 DO NOT MERGE: MTP: Disable MTP when the keyguard is locked and secure 
BUG:  3402847

Change-Id: Id0e20597423131a13ac7cef13ec5c39b962b3e0b
Signed-off-by: Mike Lockwood <lockwood@android.com>
 2011-02-26 14:33:07 -05:00
Mike Lockwood
0600fff914 DO NOT MERGE: MTP: Add support for dynamically adding and removing storage units 
BUG: 3402847

Change-Id: I46e90f546a8d72c273cd7f2de2d086bb6dbdc1b8
Signed-off-by: Mike Lockwood <lockwood@android.com>
 2011-02-26 14:32:45 -05: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
Andreas Huber
cd6828e842 am 2332cd8c: Merge "DO NOT MERGE: Cherry picked hacks to better hide A/V sync issues." into honeycomb 
* commit '2332cd8c675628f3bdd6e46a8dd6da639bd7f76e':
  DO NOT MERGE: Cherry picked hacks to better hide A/V sync issues.
 2011-02-25 15:38:06 -08:00
Andreas Huber
2332cd8c67 Merge "DO NOT MERGE: Cherry picked hacks to better hide A/V sync issues." into honeycomb 2011-02-25 15:33:28 -08:00
Samyeoul Choi
350799b72c am 6c5d9a06: am 09223891: Crespo4G: Voicemail: Add \'config_telephony_...\' for Sprint 
* commit '6c5d9a0622ed33be8549f8d4dcdf597b0dc499cf':
  Crespo4G: Voicemail: Add 'config_telephony_...' for Sprint
 2011-02-25 12:51:51 -08:00
Svetoslav Ganov
dc365a36da Merge "resolved conflicts for merge of 66edf2bb to honeycomb-plus-aosp" into honeycomb-plus-aosp 2011-02-25 12:40:57 -08: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
Samyeoul Choi
6c5d9a0622 am 09223891: Crespo4G: Voicemail: Add \'config_telephony_...\' for Sprint 
* commit '092238916fd5d10090c0bcad33644778a1f366e7':
  Crespo4G: Voicemail: Add 'config_telephony_...' for Sprint
 2011-02-25 12:08:08 -08:00
Samyeoul Choi
092238916f Crespo4G: Voicemail: Add 'config_telephony_...' for Sprint 
'*86' which is set now as a default at CDMAPhone.java,
is default voicemail number for Verizon.
For Sprint, we use user's own number for voicemail.

So we add codes in CDMAPhone.java to use
'config_telephony_use_own_number_for_voicemail',
and use config.xml to set this value as false.
Then we overlay Sprint's own config.xml file to
override 'config_telephony_use_own_number_for_voicemail' as a true.

Change-Id: I110914bdfa9a79aaba89d3b80edbcf044e9aabee
 2011-02-25 11:28:43 -08:00
Eric Fischer
040f61504a am 9967ce04: Merge "Import revised translations. DO NOT MERGE" into honeycomb 
* commit '9967ce04572e916a5f68ae0f9345f13b35ec20b0':
  Import revised translations.  DO NOT MERGE
 2011-02-25 11:11:13 -08:00
Eric Fischer
9967ce0457 Merge "Import revised translations. DO NOT MERGE" into honeycomb 2011-02-25 10:54:34 -08:00
Eric Fischer
0484786af7 Import revised translations. DO NOT MERGE 
Change-Id: I75f16cb4c3d9a4caa1234a86fbba9cae6799d180
 2011-02-25 10:47:43 -08:00
Andreas Huber
06572b9abd DO NOT MERGE: Cherry picked hacks to better hide A/V sync issues. 
Squashed commit of the following:

commit b1732e9b8bfea4c99bd07907c9aac9fcf1e8b264
Author: Andreas Huber <andih@google.com>
Date:   Thu Feb 24 12:05:40 2011 -0800

    DO NOT MERGE: Alternate patch for late video issue: seek only the video ahead to the next

    syncframe after the current audio media position, leave audio untouched.

    Change-Id: I4f6eb4e577147bc12ed2e998bea299f4bcfaf936
    related-to-bug: 3375737

commit 5e7282cf0b5c7a613da5e65fd6c8cb33a1058f8e
Author: Andreas Huber <andih@google.com>
Date:   Fri Feb 11 13:09:36 2011 -0800

    DO NOT MERGE: Start playing (and decoding) audio only after the first video frame has been decoded.

    if there's both audio and video content. This gives the video decoder an opportunity
    to fill its internal buffer queue at the start of playback.

    Change-Id: If17c4243546b1c27c8e5ee43941654d0e36f5ee5
    related-to-bug: 3431702

Change-Id: Ic3a6be467ff7ad09da04b1d2bb1a692ee38002b4
 2011-02-25 09:13:53 -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
Robert Ly
dbc796c5c0 am b7a8c1e7: Merge "Doc change: fixing errors in library proj docs" into honeycomb 
* commit 'b7a8c1e781517b5c6b47ee2b0c7bd0e70d9a1880':
  Doc change: fixing errors in library proj docs
 2011-02-24 18:13:43 -08:00
Robert Ly
b7a8c1e781 Merge "Doc change: fixing errors in library proj docs" into honeycomb 2011-02-24 18:07:28 -08:00
Robert Ly
92a07c634d am 00e08463: Doc change: clarifying nfc tech filter usage 
* commit '00e08463cb8df0969e71fd731a4e078680c4f2b5':
  Doc change: clarifying nfc tech filter usage
 2011-02-24 18:02:58 -08:00
Robert Ly
bd1a431ef0 Doc change: fixing errors in library proj docs 
Change-Id: Idfd357b8b79b1e626bbf8a8f0ac00669f9714259
 2011-02-24 17:59:12 -08:00
Xavier Ducrohet
b84c678a9c am db1acf52: (-s ours) am 1175ef7e: Merge "LayoutLib: Adapt the HC layoutlib to GB. do not merge." into gingerbread 
* commit 'db1acf52bb6e4b949bcef09f903d662aed9b8a3a':
  LayoutLib: Adapt the HC layoutlib to GB. do not merge.
 2011-02-24 17:24:07 -08:00
Xavier Ducrohet
b052ecaa7e resolved conflicts for merge of 86e43034 to honeycomb-plus-aosp 
Change-Id: Ia9ad4c3b79821fef6ab8493f4c93ca58f877f9ce
 2011-02-24 17:19:38 -08: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
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
Robert Ly
00e08463cb Doc change: clarifying nfc tech filter usage 
Change-Id: I536e4523fbc172e769ebbe4d7df0ac4422039476
 2011-02-24 15:03:09 -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
Eric Fischer
86409c8cb7 am 1c38872f: Merge "Import revised translations. DO NOT MERGE" into honeycomb 
* commit '1c38872fd30d7b19a01cc309537e911e7f2344e9':
  Import revised translations.  DO NOT MERGE
 2011-02-24 11:18:56 -08:00
Eric Fischer
1c38872fd3 Merge "Import revised translations. DO NOT MERGE" into honeycomb 2011-02-24 11:15:53 -08:00
Wink Saville
ee38808dcc am 0dc8618d: Do not start RILReceiver if wifi-only. 
* commit '0dc8618dc70a6aa23ea030eeda1ea9934b4a04c6':
  Do not start RILReceiver if wifi-only.
 2011-02-24 10:50:31 -08:00
Eric Fischer
f951bbf957 Import revised translations. DO NOT MERGE 
Change-Id: I6a05c3031a451b0d288762f079203a412133dd14
 2011-02-24 10:50:23 -08:00
repo sync
3905bc6ca3 am be2ed6d6: resolved conflicts for merge of c96b6690 to gingerbread-plus-aosp 
* commit 'be2ed6d6e366d3639aecd7ef615c95f0ccf17b9d':
  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.
 2011-02-24 10:26:49 -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