Commit Graph

36536 Commits

Author SHA1 Message Date
Justin Ho
0dedc8b8dc Merge "Updated Action Bar up affordance and menu button, refresh of ic_menu from designer tree Adding all xhdpi versions of these assets as well." 2011-07-06 08:04:06 -07:00
Mike Lockwood
923a74e9ed Merge "UsbService: USB connected notification now redirects to USB screen in Settings" 2011-07-06 07:59:47 -07:00
Mike Lockwood
3df3955a40 Merge "Revert "USB connected notification and temporary USB options dialog"" 2011-07-06 07:59:36 -07:00
Robert Greenwalt
5752111d6e am 7022db4c: am 2b62c4fb: am 38bb0123: Merge "Added methods to support dns cache per interface"
* commit '7022db4cd2ca3721631595d7379eabb2cc77f6a9':
  Added methods to support dns cache per interface
2011-07-06 07:48:21 -07:00
Robert Greenwalt
7a49c9129b am 2b62c4fb: am 38bb0123: Merge "Added methods to support dns cache per interface"
* commit '2b62c4fbfeb7df0988bf216c50cd4a24f05add9f':
  Added methods to support dns cache per interface
2011-07-06 07:42:19 -07:00
Robert Greenwalt
25fbdf5ecf am 38bb0123: Merge "Added methods to support dns cache per interface"
* commit '38bb0123b8b9857c3119fd359739daf872f619d6':
  Added methods to support dns cache per interface
2011-07-06 07:35:02 -07:00
Mike Lockwood
6d8e4b8068 Merge "Associate WebP Mime-Type with FILE_TYPE_WEBP." 2011-07-06 05:05:32 -07:00
Narayan Kamath
57fbf13748 Merge "Add a sample app for the TTS engine API" 2011-07-06 02:01:59 -07:00
Narayan Kamath
265334281a Merge "Minor changes to AudioTrack handling" 2011-07-06 02:01:48 -07:00
Glenn Kasten
f44c896b09 Merge "Thread ID zero for androidSetThreadSchedulingGroup" 2011-07-05 15:08:31 -07:00
Steve Block
3135e6e0f0 Merge "Clarify the documentation for WebView.loadDataWithBaseURL() when the base URL uses the 'data' scheme" 2011-07-05 07:43:56 -07:00
Steve Block
181eb35275 Merge "Maintain a reference to the Java object when WebView.removeJavascriptInterface() is called" 2011-07-05 06:34:57 -07:00
Debashish Chatterjee
b92da209fb Merge "Introduced a common SOURCE_PACKAGE_FIELD in VoicemailContract class." 2011-07-05 01:45:44 -07:00
satok
33ed52c710 Merge "Fix NPE in getLastInputMethodSubtype" 2011-07-04 21:48:47 -07:00
Hung-ying Tyan
46f6859a12 Merge "Keep last known keepalive interval to avoid duplicate effort." 2011-07-04 20:37:33 -07:00
Debashish Chatterjee
2b970a879d Merge "Got rid of deprecated fields from VoicemailContract api." 2011-07-04 10:45:33 -07:00
Steve Block
bda64acb0c Merge "Clarify documentation for WebView.loadData()" 2011-07-04 10:06:31 -07:00
Chia-chi Yeh
392b683169 Merge "VPN: implement status report for legacy VPN." 2011-07-04 03:38:16 -07:00
Steve Block
d91e09f831 Merge "Fix WebViewFragment to avoid detroying the WebView too early" 2011-07-04 02:11:38 -07:00
Hung-ying Tyan
dbd8e0c32a Merge "Do not hold wifi lock when SIP is also available over mobile network." 2011-07-03 20:01:55 -07:00
Hung-ying Tyan
8292a42dad Merge "Do not keep alive for re-established call." 2011-07-03 19:53:35 -07:00
Chia-chi Yeh
a20e76abb1 Merge "Add CleanSpec.mk for change If98e456e779f8e97f562d99c57d909b1f5d9db55." 2011-07-03 17:09:41 -07:00
Chia-chi Yeh
63ddfd9e19 VPN: remove the old VpnService.
Now VPN is (kind of) integrated into ConnectivityService.

Change-Id: If98e456e779f8e97f562d99c57d909b1f5d9db55
2011-07-02 20:21:09 -07:00
Chia-chi Yeh
4c868b23b7 Merge "VPN: export legacy VPN in IConnectivityManager." 2011-07-02 17:28:45 -07:00
Chia-chi Yeh
938e00a4a9 Merge "Promote ip-up-vpn into the framework." 2011-07-02 16:54:37 -07:00
Chia-chi Yeh
7c1771c05f Merge "VPN: merge JNI methods." 2011-07-02 16:37:25 -07:00
Chia-chi Yeh
53f1b567a8 Merge "VPN: give legacy VPN a fake package name." 2011-07-02 03:19:48 -07:00
Jeff Brown
2baa5a1735 Merge "Drop obsolete touch screen hacks." 2011-07-01 19:25:46 -07:00
Jeff Brown
35a8602302 Merge "Workaround apps that make assumptions about pointer ids." 2011-07-01 19:17:21 -07:00
Dianne Hackborn
ea5361f6d9 Merge "Don't crash when the load average service is started." 2011-07-01 19:09:03 -07:00
Jeff Brown
2e0b543c09 Workaround apps that make assumptions about pointer ids.
Modified the touch input mapper to assign pointer ids sequentially
starting from 0 instead of using the tracking id or slot index
supplied by the driver.  Applications should not depend on this
ordering but some do.  (sigh)

Bug: 4980884
Change-Id: I0dfeb3ac27c57a7102a13c960c760e2a02eb7669
2011-07-01 19:08:15 -07:00
Dianne Hackborn
975749c55e Merge "When removing a task, also kill its processes." 2011-07-01 17:13:40 -07:00
Mathias Agopian
1f339ff387 don't kill surfaceflinger when system process dies
Change-Id: I2d3ed87b590f9ccea3fa4af41d92911de070b315
2011-07-01 17:09:24 -07:00
Mathias Agopian
9303eee7dc fix ScreenshotsOfProtectedBuffersFail
- put the test window at the front most screen position
- use RGBA_8888 which is a mandatory format
- handle devices that don't support the protected usage flags

Bug: 4950464

Change-Id: I0005fb667cfe094e5978816e2924b294c5ef817e
2011-07-01 15:41:32 -07:00
Fabrice Di Meglio
69df051a8b Merge "Fix default TextView textDirection heuristic" 2011-07-01 15:35:52 -07:00
Brian Carlstrom
d9c0cc2fe7 Merge "Build cert chain in KeyChain.getCertificateChain" 2011-07-01 15:31:30 -07:00
Glenn Kasten
530035abca Merge "Bug 4571308 Provide correct video frame timestamps" 2011-07-01 15:02:33 -07:00
Mathias Agopian
d9e8c64c3d return an error code with gralloc buffer allocation failures
Change-Id: I471e5d37ea7a42fc8a0f93446ee3b4229da37807
2011-07-01 14:53:49 -07:00
Jake Hamby
05432c6df4 Merge "Fix IllegalStateException when A2DP connects before boot completes." 2011-07-01 14:47:50 -07:00
Andreas Huber
0947307a58 Merge "Charge network traffic to the uid of the process using the MediaPlayer." 2011-07-01 14:28:10 -07:00
Andreas Huber
610ca70888 Merge "Ignore all flush-complete notifications with port == OMX_ALL" 2011-07-01 14:27:37 -07:00
Amith Yamasani
f6f17b66c3 Merge "Restore some lost space in the SearchView text field in Search Dialog." 2011-07-01 14:20:24 -07:00
Fabrice Di Meglio
579fdd0906 Merge "Add charCount heuristic to TextView textDirection" 2011-07-01 14:15:08 -07:00
James Dong
b3ee1178f3 Merge "Add extended metadata buffer support by defining different types of metadata buffers" 2011-07-01 14:03:45 -07:00
Brian Carlstrom
64db2ebe38 Merge "Revert "Add keychain user with special keystore access permissions"" 2011-07-01 13:43:37 -07:00
David Brown
277950e699 Merge "Remove explicit toUpperCase after CountryDetector is fixed to return uppercase region code." 2011-07-01 13:19:37 -07:00
Debashish Chatterjee
2462b4f56f Merge "Cleanup VoicemailContract." 2011-07-01 13:08:45 -07:00
Mike Lockwood
ce360f991f Merge "UsbDeviceManager: Reset sys.usb.config if it is "none" at boot" 2011-07-01 12:01:15 -07:00
Mike Lockwood
114a4ddd0d Merge "UsbService: Use Slog instead of Log, and disable some logging" 2011-07-01 12:00:50 -07:00
Mike Lockwood
2047a8fbbc Merge "USB: Update strings for USB connected notifications" 2011-07-01 12:00:20 -07:00