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

22747 Commits

Author SHA1 Message Date
Brian Carlstrom
3b765f0462 Merge "New KeyChain API for application access to keystore credentials" 2011-06-10 14:11:15 -07:00
Dianne Hackborn
f7f413e118 am 0a63ccc6: am 5624b793: am 2bb2d48f: Commit final (maybe) MR 2 API. 
* commit '0a63ccc63b833e8034cc941bf55a6e2003037309':
  Commit final (maybe) MR 2 API.
 2011-06-10 14:08:49 -07:00
Nick Pelly
e14674d515 Merge "NfcAdapter: Remove dead AIDL methods." 2011-06-10 13:55:36 -07:00
Soojung Shin
d027329cd6 Ignore duplicate WAP push PDU source/destination port if configured 
Some carriers duplicate the OMADM wap push PDU source/destination
port.

e.g. MSGTYPE-TotalSegments-CurrentSegment
     -SourcePortDestPort-SourcePortDestPort-OMADM PDU

So the client has to ignore the duplicate source/destination
port.

Change-Id: I83df6e8e7d2e2e4275036a1b574247f9f40c5cf4
Signed-off-by: Soojung Shin <sj46.shin@samsung.com>
 2011-06-10 13:48:36 -07:00
Shimeng (Simon) Wang
e86cdeb86c Fix reflow for mobile sites. 
1. use correct mDefaultScale instead of 1.0f.
2. ignore mMinZoomScaleFixed in case of using wide viewport since
sometimes mobile site will impose a min scale while the web content
will make it bigger than overview scale.

issue: 4257815

Change-Id: Ib4ca9b4dab8585827081a32432076eeeaedecd38
 2011-06-10 13:42:32 -07:00
John Reck
60f36a52ac Merge "Expose hook for crash backup" 2011-06-10 13:10:52 -07:00
Dianne Hackborn
32ed8448d2 Merge "resolved conflicts for merge of f51ded0f to master" 2011-06-10 12:47:12 -07:00
Dianne Hackborn
6b592723c9 resolved conflicts for merge of f51ded0f to master 
Change-Id: Ida356524a68aeb2b9b0013dfbb6ab4bd11e616e2
 2011-06-10 12:45:36 -07:00
Svetoslav Ganov
8dffad68c7 Bug fixes in the accessibility interrogation APIs 
1. AccessibilityNodeInfo was not overriding equals.

2. ViewAncestor was not calling the callback for
   setting the result of an interrogation request
   thus making the system process wait upto the
   maximal timeout.

Change-Id: I040a3c12d97f48aee319ba6414879546e71e9b8e
 2011-06-10 12:43:00 -07:00
Adam Powell
679dd99cdc Merge "Fix some measurement/sizing with split action bars" 2011-06-10 11:59:03 -07:00
Adam Powell
cc2e5bea7d Fix some measurement/sizing with split action bars 
Change-Id: I5fded370d214eb0a50d06fd6a14446227d3b30ac
 2011-06-10 11:55:09 -07:00
Philip Milne
08b992c88e Merge "Optimise the way that indices are auto-allocated so that XML files can normally avoid using indices." 2011-06-10 11:54:39 -07:00
RoboErik
a2aee84eee Merge "Upgrade of Calendar db to 305" 2011-06-10 11:36:15 -07:00
Nick Pelly
c17a7a57d7 NfcAdapter: Remove dead AIDL methods. 
Change-Id: Ia848c86dffcbe9f661d63fab6b32af41bbd8ee81
 2011-06-10 11:36:13 -07:00
Dan Morrill
75f27b56a6 Merge "Adding config_alwaysUseCdmaRssi. The change that added this didn't make it to master do to a merge conflict oversight." 2011-06-10 11:01:48 -07:00
RoboErik
9734df5f0c Upgrade of Calendar db to 305 
Name changes for db upgrade and reorganization for easier
referencing of calendar/event columns.

Change-Id: Ic892729e1fa11c7971d99ec17d930db9300d44e9
 2011-06-10 10:58:31 -07:00
Chet Haase
ec609d3a36 Merge "Change Property.set() to throw UnsupportedOperationException by default" 2011-06-10 10:58:26 -07:00
Teng-Hui Zhu
2302fe5226 fix one NPE when webChromeClient don't have progress view support 
Change-Id: I5a88365f216d5dea38ab2eac9562d26b00a2d617
 2011-06-10 10:56:33 -07:00
Dan Morrill
5ffe6bc98d Adding config_alwaysUseCdmaRssi. The change that added this didn't make it to 
master do to a merge conflict oversight.

Change-Id: I35e7b0e3ad008b2c350ce720848d1b91e2e9fc5b
 2011-06-10 10:53:43 -07:00
Philip Milne
f474870fe1 Optimise the way that indices are auto-allocated so that XML files can normally avoid using indices. 
Change-Id: Iafb25b17fec9391664c81a7e213eeaa918254912
 2011-06-10 10:51:45 -07:00
Brian Carlstrom
42f6528b98 New KeyChain API for application access to keystore credentials 
The KeyChain API is Currently in use by Browser and validated by Email
for client certificate authentication.

Change-Id: Ifeab416be594457a05747406e31656e71795cb53
 2011-06-10 10:43:02 -07:00
Justin Ho
b2ba51e6de am e9f203e4: am 9b0a8f9a: am 1d3173c3: Merge "Updating default wallpaper of large devices to match xlarge" into honeycomb-mr2 
* commit 'e9f203e44363f0ee035aa2cd6aad3d5680e6c94f':
  Updating default wallpaper of large devices to match xlarge
 2011-06-10 10:32:10 -07:00
Elliott Hughes
8e26790444 de_DE "Mai" isn't an abbreviation. 
Change-Id: I5cf493bacf5082a67e3dfe7629b062e9a47e3773
 2011-06-10 10:20:21 -07:00
Ben Komalo
799b7f0c1a Merge "New device policy to disable camera." 2011-06-10 10:17:34 -07:00
Chet Haase
a2f78a3617 Change Property.set() to throw UnsupportedOperationException by default 
Change-Id: I2326e066e0b7ce63cbafe83a3a37b90a3d148c43
 2011-06-10 10:07:59 -07:00
Jamie Gennis
4532c5e49c Merge "Add ParcelSurfaceTexture Java class to enable ISurfaceTexture sharing via Binder." 2011-06-10 10:05:04 -07:00
Ben Komalo
2447edd85b New device policy to disable camera. 
This introduces a new policy that a DeviceAdmin can use to disable _all_
cameras on the device. A separate CL will be made on the media side to
watch this policy bit and act accordingly.

Bug: 4185303
Change-Id: I700cfc4a8317bb74087ccae39346d74467fc58b2
 2011-06-10 09:37:17 -07:00
Narayan Kamath
d3ee2fa184 Refactor some of TextToSpeech 
required to let the Settings code to the same logic
and not have to roll it's own.

Change-Id: I2766b8562c940182a2954555fb1854889c3ac91a
 2011-06-10 16:33:28 +01:00
Debashish Chatterjee
d868be588b Made VoicemailContract classes non-instantiable. 
Change-Id: I35539e5b293412f4f11b0bc062d754f813d4168e
 2011-06-10 16:20:31 +01:00
Narayan Kamath
a5084e6389 Merge "Don't hardcode the default engine." 2011-06-10 07:53:56 -07:00
Dianne Hackborn
0a63ccc63b am 5624b793: am 2bb2d48f: Commit final (maybe) MR 2 API. 
* commit '5624b793cb791621a586931d9f02eefdf6cfc7c8':
  Commit final (maybe) MR 2 API.
 2011-06-10 07:46:51 -07:00
Narayan Kamath
22302fb7ba Don't hardcode the default engine. 
One point to note is that no TTS engine will be selected
by default if there are no system TTS engines.

Change-Id: I397061e3cf29b8a1c66e7864262b43621ef5100d
 2011-06-10 15:29:06 +01:00
Ben Murdoch
179c87f6e6 Merge WebKit at r84325: Update user agent string. 
Change-Id: I927bd1cfadb3cc5b68f93f761d4d82cdc4f54439
 2011-06-10 15:07:51 +01:00
Narayan Kamath
f13874ffe6 Merge "Some TTS fixes." 2011-06-10 06:23:17 -07:00
Narayan Kamath
abc63fbdda Some TTS fixes. 
(a) Document the undocumented queue mode (mode == 2)
(b) intern strings to fix a bug in removeCallbacksAndMessages
(c) remove an unnecessarly lock object, change the field it
guarded to volatile.

Change-Id: If46bbfe2afb047b3ba5b3cb9a90c292656379ec1
 2011-06-10 13:01:46 +01:00
Debashish Chatterjee
64c99171e8 Merge "Voicemail provider contract definition." 2011-06-10 04:42:32 -07:00
Debashish Chatterjee
489d2d546a Merge "Voicemail related fields in calllog provider." 2011-06-10 04:38:07 -07:00
satok
21e2f1b4a0 Merge "API to set additional subtypes" 2011-06-10 00:26:52 -07:00
satok
e7c6998e0a API to set additional subtypes 
Bug: 4321667

- Due to the voice team's strong request

Change-Id: Ia8bbc277c0987bde996e6f65541877cec96a3ca1
 2011-06-10 15:26:03 +09:00
Adam Powell
81cf3ecade Action buttons now use themable style. 
Obey action view layoutparams.

Change-Id: Ia466008465b57659615fbf9d450ce3fdb3c06379
 2011-06-09 22:01:16 -07:00
Adam Powell
fdac5ea971 Merge "Refine the behavior of split action bars." 2011-06-09 21:08:52 -07:00
Adam Powell
1ab418a222 Refine the behavior of split action bars. 
Change-Id: I27212c7554025433ee366f0766971f0092b26d67
 2011-06-09 21:01:56 -07:00
Fabrice Di Meglio
7a736fbf69 Update Configuration for renaming and fixes 
- rename layoutDirection to textLayoutDirection
- rename constants for being clear that they cannot be used (work in progress)
- fix a few issues concerning default switch case and relation to Locale

Change-Id: Icfe9a9b5c0d1c0e28e5a893549b437fc4fa5df82
 2011-06-09 20:24:43 -07:00
Dianne Hackborn
5624b793cb am 2bb2d48f: Commit final (maybe) MR 2 API. 
* commit '2bb2d48f9ca1726b8de957ec7ea321c767409c12':
  Commit final (maybe) MR 2 API.
 2011-06-09 19:26:25 -07:00
Dianne Hackborn
2bb2d48f9c Commit final (maybe) MR 2 API. 
Change-Id: I42f72819a29d4ac7902b7be5af0b5d353d790eae
 2011-06-09 19:22:05 -07:00
Dianne Hackborn
7bbf6f7d11 am 8297f669: am 3aabdeac: am 5ba2e872: Merge "Fix for not reporting correct "sw" in compat mode." into honeycomb-mr2 
* commit '8297f669356ee997c5faa745815e8b9a7009fba7':
  Fix for not reporting correct "sw" in compat mode.
 2011-06-09 18:42:55 -07:00
Dianne Hackborn
e6b03d0979 resolved conflicts for merge of 9dfd7d0a to master 
Change-Id: I9fbee3209b7fe5c7b5b42b62309eb60dc49bf9e2
 2011-06-09 18:39:37 -07:00
John Wang
924b7c7496 am 4d042048: am 08a8f3f9: Merge "Set emergency call text visibility." into honeycomb-LTE 
* commit '4d042048243f38d3062ab4719ac26c9154380115':
  Set emergency call text visibility.
 2011-06-09 18:16:49 -07:00
Dianne Hackborn
a47847fc50 Merge "resolved conflicts for merge of e2aa0490 to master" 2011-06-09 18:00:13 -07:00
Romain Guy
8af7f5f8e4 Merge "Add a way to measure potential framerate of the view hierarchy." 2011-06-09 17:50:51 -07:00