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

17379 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ying Wang
b5fb50a133 Merge "Add instrumentation as a source tag for proguard keep options." into eclair 2010-01-19 11:55:12 -08:00
Guang Zhu
e0aed796f0 am ccec75e7: Merge "Prevent orientation change from triggering activity recreation." into eclair 
Merge commit 'ccec75e7a842f8ba26617406768206eb3be32222' into eclair-plus-aosp

* commit 'ccec75e7a842f8ba26617406768206eb3be32222':
  Prevent orientation change from triggering activity recreation.
 2010-01-19 11:54:05 -08:00
Amith Yamasani
658dc0d4b0 am b35b8c13: Merge "Security fix in accessibility - don\'t read out password. # 2371557" into eclair 
Merge commit 'b35b8c1334b8bb8c4fb8b679fdb0b9bcbd5b41fe' into eclair-plus-aosp

* commit 'b35b8c1334b8bb8c4fb8b679fdb0b9bcbd5b41fe':
  Security fix in accessibility - don't read out password. # 2371557
 2010-01-19 11:53:59 -08:00
Guang Zhu
ccec75e7a8 Merge "Prevent orientation change from triggering activity recreation." into eclair 2010-01-19 11:53:00 -08:00
Guang Zhu
4ddcedeff1 Prevent orientation change from triggering activity recreation. 2010-01-19 11:51:44 -08:00
Amith Yamasani
b35b8c1334 Merge "Security fix in accessibility - don't read out password. # 2371557" into eclair 2010-01-19 11:50:39 -08:00
Elliott Hughes
fc35343cfe Remove old InetAddress DNS cache from preloaded-classes. 
For https://android-git.corp.google.com/g/37614 .
 2010-01-19 11:48:22 -08:00
Andreas Huber
cb6ffa2824 Merge "Avoid unnecessary buffer copying if at all possible, detect if running in the mediaserver process." 2010-01-19 11:43:12 -08:00
Doug Kwan
bfa05732a9 Merge "Add missing libjpeg in linker option. Currently this library is used by the main executable but is included implicitly via inter-library dependency." 2010-01-19 11:42:15 -08:00
James Dong
e73b46ef7f Merge "Media server death nodification" 2010-01-19 11:37:55 -08:00
Doug Kwan
474a97a428 Add missing libjpeg in linker option. Currently this library is used by the 
main executable but is included implicitly via inter-library dependency.
 2010-01-19 11:22:55 -08:00
Scott Main
d603e989f4 am 88e653f6: Merge "docs: some spelling typos" into eclair 
Merge commit '88e653f6653aeb237631681f6700f0e572779617' into eclair-plus-aosp

* commit '88e653f6653aeb237631681f6700f0e572779617':
  docs: some spelling typos
 2010-01-19 11:21:58 -08:00
San Mehat
f078d058ab Merge "framework: Introduce INetworkManagementService for communicating with netd" 2010-01-19 11:21:44 -08:00
Scott Main
88e653f665 Merge "docs: some spelling typos" into eclair 2010-01-19 11:18:39 -08:00
Scott Main
13244e52eb docs: some spelling typos 2010-01-19 11:12:07 -08:00
Mike Lockwood
425500913a Merge "LocationManagerService: Fix bug removing proximity alerts." 2010-01-19 11:03:19 -08:00
Mike Lockwood
0dac8c0f7e LocationManagerService: Fix bug removing proximity alerts. 
Alerts were not being removed from the mProximitiesEntered array.

Signed-off-by: Mike Lockwood <lockwood@android.com>
 2010-01-19 14:00:48 -05:00
Andreas Huber
f1fe064d73 Avoid unnecessary buffer copying if at all possible, detect if running in the mediaserver process. 2010-01-19 10:57:57 -08:00
Andreas Huber
0a2d8709e4 Merge "Squashed commit of the following:" 2010-01-19 10:51:33 -08:00
Andreas Huber
0d41be3a29 Merge "Remove totally unused code from OMX.cpp" 2010-01-19 10:50:54 -08:00
San Mehat
873f214594 framework: Introduce INetworkManagementService for communicating with netd 
This is the framework-exposed interface for the (future) management of
all Android network management functions. Initial support is for providing
tethering.

Updated: Integrate feedback from review; clean up naming

Updated: Switch from add/remove/list to get/set for DNS forwarders
         - allows prioritization / ordering of DNS servers

Updated: Refactor NAT api

Updated: Refactor NAT api (last time sorry)

Signed-off-by: San Mehat <san@google.com>
 2010-01-19 10:47:52 -08:00
Bjorn Bringert
51bfd683fe Merge "Fix WEB_SEARCH handler whitelist" 2010-01-19 10:47:30 -08:00
Bjorn Bringert
cf3b73569b Fix WEB_SEARCH handler whitelist 
Change-Id: I9450ac1554ed062cc3f833b0986157e54165e8f1
 2010-01-19 18:45:14 +00:00
Andreas Huber
1faa92a1e9 Squashed commit of the following: 
commit 6689350d7e4dad6d873c1ed95f0a356e3bfd79d1
Author: Andreas Huber <andih@google.com>
Date:   Tue Jan 19 09:23:02 2010 -0800

    Some tweaks to the SampleIterator.

commit 5638bff6d31442a219806445c3106d47b081fcab
Author: Andreas Huber <andih@google.com>
Date:   Fri Jan 15 14:46:29 2010 -0800

    A much improved implementation of MPEG4 sample table operations through an iterator.
 2010-01-19 10:39:21 -08:00
Andreas Huber
fed1a1c9c0 Remove totally unused code from OMX.cpp 2010-01-19 10:36:35 -08:00
Andreas Huber
3c79a4abf8 Merge "Upgrade for the stagefright commandline tool to support extracting thumbnails and to optionally prefer software codecs." 2010-01-19 10:25:13 -08:00
Andreas Huber
5a12413331 Merge "Make sure the seek test attempts to seek on the very first iteration, as this appears to be a special case that decoders frequently get wrong." 2010-01-19 10:24:58 -08:00
Bjorn Bringert
97d1195832 Merge "Make SearchManager.getGlobalSearchActivity() public but hidden" 2010-01-19 00:58:39 -08:00
Xavier Ducrohet
28039a6f74 am 1da2735c: am f73bd14a: Merge "ADT/Layoutlib: implement Canvas.concat(Matrix)" into eclair 
Merge commit '1da2735c5862d48712706c2052a34e10e3dea43b'

* commit '1da2735c5862d48712706c2052a34e10e3dea43b':
  ADT/Layoutlib: implement Canvas.concat(Matrix)
 2010-01-19 00:02:15 -08:00
Adam Powell
3e22d199a0 am b5a5a397: am 56a17690: Merge "TransformGestureDetector is now ScaleGestureDetector - scope reduced. N1 screen can\'t reliably handle translation and scaling at the same time." into eclair 
Merge commit 'b5a5a39716502be2cd325a6f9b393e155c0636ee'

* commit 'b5a5a39716502be2cd325a6f9b393e155c0636ee':
  TransformGestureDetector is now ScaleGestureDetector - scope reduced.
 2010-01-19 00:02:00 -08:00
Xavier Ducrohet
05bc8d7397 am cff6c845: am ae4bd059: ADT/Layoutlib: Reimplement parts of BitmapFactory 
Merge commit 'cff6c8459ca05f3fee2d2999989d07a7176f955c'

* commit 'cff6c8459ca05f3fee2d2999989d07a7176f955c':
  ADT/Layoutlib: Reimplement parts of BitmapFactory
 2010-01-19 00:01:32 -08:00
Grace Kloba
76c29e633f am f167c4bf: DO NOT MERGE 
Merge commit 'f167c4bfca57b5467f40f6cf25e10fb12183a9f3' into eclair-plus-aosp

* commit 'f167c4bfca57b5467f40f6cf25e10fb12183a9f3':
  DO NOT MERGE
 2010-01-18 23:43:37 -08:00
Grace Kloba
b869c59446 am 17b14bd3: DO NOT MERGE 
Merge commit '17b14bd36aba265ac6bffc2626d8db29713d7c45' into eclair-plus-aosp

* commit '17b14bd36aba265ac6bffc2626d8db29713d7c45':
  DO NOT MERGE
 2010-01-18 23:43:32 -08:00
Grace Kloba
55d791e74e am 5a0bf1f0: DO NOT MERGE 
Merge commit '5a0bf1f03e5f62449ea2520edb79ea868e6f06e7' into eclair-plus-aosp

* commit '5a0bf1f03e5f62449ea2520edb79ea868e6f06e7':
  DO NOT MERGE
 2010-01-18 23:43:27 -08:00
Grace Kloba
8d4baa7893 am d79d1c72: Merge "If ZoomButttonsController detects more than one pointer, give up the control. This should enable the View behind it, like WebView, will always get the multi-pointer events even when ZoomButtonsController is up." into eclair 
Merge commit 'd79d1c72991e587294432e80d091e3ae26a0c103' into eclair-plus-aosp

* commit 'd79d1c72991e587294432e80d091e3ae26a0c103':
  If ZoomButttonsController detects more than one pointer,
 2010-01-18 23:43:20 -08:00
Grace Kloba
3648f949ef am f080a5ad: Merge "DO NOT MERGE" into eclair 
Merge commit 'f080a5adf6d59bade46815ee605a3829e5c3ab89' into eclair-plus-aosp

* commit 'f080a5adf6d59bade46815ee605a3829e5c3ab89':
  DO NOT MERGE
 2010-01-18 23:43:14 -08:00
Jim Miller
84928fa93c am 813d2d86: Merge "Fix for 2292713: Remove workaround that hides SlidingTab widget while internal state is inconsistent." into eclair 
Merge commit '813d2d86789d1c2e705c4d11d052ad649e6bac84' into eclair-plus-aosp

* commit '813d2d86789d1c2e705c4d11d052ad649e6bac84':
  Fix for 2292713: Remove workaround that hides SlidingTab widget while internal state is inconsistent.
 2010-01-18 23:43:01 -08:00
Xavier Ducrohet
da84d6a1b1 am 908a8111: Merge "ADT/Layoutlib: Add dash support to stroke." into eclair 
Merge commit '908a81119061092468067789acbec9b99d79ad5f' into eclair-plus-aosp

* commit '908a81119061092468067789acbec9b99d79ad5f':
  ADT/Layoutlib: Add dash support to stroke.
 2010-01-18 23:42:55 -08:00
Xavier Ducrohet
c0ea805c64 am 2b30a4a5: Merge "ADT/Layoutlib: properly handle stroke information." into eclair 
Merge commit '2b30a4a50e24080fdd8b796e4a64447f223d4522' into eclair-plus-aosp

* commit '2b30a4a50e24080fdd8b796e4a64447f223d4522':
  ADT/Layoutlib: properly handle stroke information.
 2010-01-18 23:42:28 -08:00
Grace Kloba
f167c4bfca DO NOT MERGE 
If pinched to overview mode, double tap should bring
it back to default instead of just setting the current
mode as overview mode.
 2010-01-18 15:30:59 -08:00
Grace Kloba
17b14bd36a DO NOT MERGE 
Make sure the mZoomOverviewWidth is as least as
wide as the current (adjusted) view width.

This should fix the weird state Bart got in with
m.wikipedia.org.
 2010-01-18 15:29:46 -08:00
Grace Kloba
5a0bf1f03e DO NOT MERGE 
Remove testing (enable plugin) code.

No reflow when zoom in, auto reflow when zoom out.

Fix http://b/issue?id=2375955
 2010-01-18 15:29:46 -08:00
Grace Kloba
d79d1c7299 Merge "If ZoomButttonsController detects more than one pointer, give up the control. This should enable the View behind it, like WebView, will always get the multi-pointer events even when ZoomButtonsController is up." into eclair 2010-01-18 15:21:38 -08:00
Grace Kloba
f080a5adf6 Merge "DO NOT MERGE" into eclair 2010-01-18 15:21:31 -08:00
Grace Kloba
d4d1d6eca0 If ZoomButttonsController detects more than one pointer, 
give up the control. This should enable the View behind
it, like WebView, will always get the multi-pointer
events even when ZoomButtonsController is up.
 2010-01-18 10:43:59 -08:00
San Mehat
2b7ff1c471 Merge "MountService: Add new 'unmountSecureContainer' API call" 2010-01-18 07:14:02 -08:00
San Mehat
9dba709d44 MountService: Add new 'unmountSecureContainer' API call 
Signed-off-by: San Mehat <san@google.com>
 2010-01-18 06:49:19 -08:00
Jack Palevich
840e958847 Decouple the EGL context lifetime from the EGL surface lifetime. 
The EGL context is now preserved when possible. Previously we would
destroy it whenever the EGL surface was destroyed. Preserving the
EGL context preserves loaded textures and VBO resources.
 2010-01-18 15:13:12 +08:00
Joe Onorato
63ce8e817c Make the space between the time and the AM/PM smaller by putting preceding whitespace inside the 
span.

Also cache the SimpleDateFormat object because those are relatively expensive.
 2010-01-17 19:09:35 -05:00
Daisuke Miyakawa
308596eda1 Merge "Make vCard importer support lower case params." 2010-01-17 15:32:02 -08:00