30988 Commits

Author SHA1 Message Date
Kenny Root
5d8b320428 am 1361a5bd: am 07a9e8d3: Merge changes Ie3648509,I53db73c3 into gingerbread
Merge commit '1361a5bd1eba1cae16c301622324153c3d50b84c'

* commit '1361a5bd1eba1cae16c301622324153c3d50b84c':
  Move native library removal function to helper
  Initialize native library path in PackageSetting
2010-09-12 18:06:07 -07:00
Kenny Root
1361a5bd1e am 07a9e8d3: Merge changes Ie3648509,I53db73c3 into gingerbread
Merge commit '07a9e8d39f818e54f0feccff10c99b9629007a64' into gingerbread-plus-aosp

* commit '07a9e8d39f818e54f0feccff10c99b9629007a64':
  Move native library removal function to helper
  Initialize native library path in PackageSetting
2010-09-12 18:02:47 -07:00
Jeff Brown
abeea05b30 Undo API patch due to field pulled up to superclass.
Earlier we extracted a common superclass InputEvent from KeyEvent
and MotionEvent.  During this process, getDeviceId() and mDeviceId
were moved to the superclass.  The API change tracking was unable
to automatically figure out that the method had just been moved up
to the superclass (still binary compatible) so we patched up 9.xml
manually to fool it.  Unfortunately mDeviceId slipped in there
when it should not have since it should have been marked with @hide.
This change just removes mDeviceId.

Change-Id: I5fca14c8dc6f98952b8afbdb6e034824a22bdb1d
2010-09-12 18:01:28 -07:00
Dianne Hackborn
7f01c01a67 Merge "Some fragment stuff:" 2010-09-12 18:00:25 -07:00
Kenny Root
07a9e8d39f Merge changes Ie3648509,I53db73c3 into gingerbread
* changes:
  Move native library removal function to helper
  Initialize native library path in PackageSetting
2010-09-12 17:59:41 -07:00
Romain Guy
2bffd268f1 Fix text rendering issue with text scaling.
Change-Id: I1f3ae40025697e8f8ca0616ee6550fe215cadcc8
2010-09-12 17:59:13 -07:00
Jeff Brown
eb851c4ecf am e740dd0c: am 69206512: Fix some API discrepancies in InputEvent.
Merge commit 'e740dd0c8fde910066f9ddf83b4ab094ed95eaf9'

* commit 'e740dd0c8fde910066f9ddf83b4ab094ed95eaf9':
  Fix some API discrepancies in InputEvent.
2010-09-12 17:24:29 -07:00
Jeff Brown
e740dd0c8f am 69206512: Fix some API discrepancies in InputEvent.
Merge commit '692065128e66de77470de2c50ead2bef0452952a' into gingerbread-plus-aosp

* commit '692065128e66de77470de2c50ead2bef0452952a':
  Fix some API discrepancies in InputEvent.
2010-09-12 17:21:18 -07:00
Jeff Brown
692065128e Fix some API discrepancies in InputEvent.
Change-Id: I8e33e125e10075d6f256a1eb3dd46990f35074d6
2010-09-12 17:17:30 -07:00
Jeff Brown
b3787d57ff am 0f0541e4: am b88102f5: Input dispatcher ANR handling enhancements.
Merge commit '0f0541e40cfef51eb5c3769e53c1aa853b53aaf6'

* commit '0f0541e40cfef51eb5c3769e53c1aa853b53aaf6':
  Input dispatcher ANR handling enhancements.
2010-09-12 17:15:19 -07:00
Dianne Hackborn
3e449ce00e Some fragment stuff:
Fix issue #2975886: Make getTargetFragment() survive rotation events with
retained fragments.  We now fix up the fragment pointer when restoring state.

Fix issue #2919928: In PreferenceFragment, addPreferencesFromResources() is
not effective when called after onActivityCreated().  Note to self: do not use
a what code of 0.  Maybe that should be documented (I'll do it in gingerbread).

Hopefully implement #2992753: DialogFragment.dismiss will NPE if called too soon
(before attached to activity).  We now keep track of the FragmentManager
separately from the activity, and set that as soon as the fragment is part of a
transaction.

Investigate issue #2988876: NPE when device orientation is changed.  The NPE is
because of the app trying to do a fragment transaction in onPause().  This is
fundamentally not viable, since (a) the activity will be gone before we ever
have a chance to process the message to commit the transaction, and (b) even if
we did try to commit the transaction earlier, this would be done after
onSaveInstanceState() and thus not work in cases where the activity gets killed
in the background.  So instead, we'll just throw an immediate exception if you
try to do this.

Change-Id: Iea62b50eb79f066af2471fce86836d073398f4f7
2010-09-12 17:10:04 -07:00
Jeff Brown
0f0541e40c am b88102f5: Input dispatcher ANR handling enhancements.
Merge commit 'b88102f5b7e51552a3576cf197b4c8cf96f193d1' into gingerbread-plus-aosp

* commit 'b88102f5b7e51552a3576cf197b4c8cf96f193d1':
  Input dispatcher ANR handling enhancements.
2010-09-12 17:05:38 -07:00
Daisuke Miyakawa
2f76176045 Fix typo.
onnSaveInstanceState -> onSaveInstanceState

Change-Id: I34981dd10fce4eaad6e1f6bba3d569e1e35e3c2a
2010-09-12 16:53:17 -07:00
Jeff Brown
b88102f5b7 Input dispatcher ANR handling enhancements.
This change is essentially a rewrite of the main input dispatcher loop
with the target identification folded in.  Since the input dispatcher now
has all of the window state, it can make better decisions about
when to ANR.

Added a .5 second deadline for processing app switch keys.  This behavior
predates Gingerbread but had not previously been ported.

Fixed some timing inaccuracies in the ANR accounting that could cause
applications to ANR sooner than they should have.

Added a mechanism for tracking key and motion events that have been
dispatched to a window so that appropriate cancelation events can be
synthesized when recovering from ANR.  This change helps to keep
applications in sync so they don't end up with stuck buttons upon
recovery from ANRs.

Added more comments to describe the tricky parts of PollLoop.

Change-Id: I13dffca27acb436fc383980db536abc4d8b9e6f1
2010-09-12 16:52:03 -07:00
Adam Powell
2a5a53709e Fix broken ActionMode close button styling
Change-Id: I425df1433d43c1b2bd392464ed10142532640f81
2010-09-12 15:51:18 -07:00
Adam Powell
c7b29fbb3e Merge "Fix a bug that could cause improper detection of long press selection mode in WebView after a scale gesture" 2010-09-12 14:19:46 -07:00
Adam Powell
0a8bf86413 Fix a bug that could cause improper detection of long press selection mode in WebView after a scale gesture
Change-Id: I171ccad91ddc7e7983664dbf52d3104508493538
2010-09-12 14:17:46 -07:00
Joe Onorato
c66f16ec41 Merge "Connect my plumbing to dsandler's awesome lights out mode." 2010-09-12 14:07:04 -07:00
Joe Onorato
f63b0f44eb Connect my plumbing to dsandler's awesome lights out mode.
It took a little bit of refactoring to move the authoritative state
about whether the lights are on or not into the StatusBarManagerService,
so that if the system ui process crashes, the bar comes up in the
right mode.

Change-Id: I95cfaf8f78ca4443ded5262272ea755d44dc5d17
2010-09-12 17:06:01 -04:00
Romain Guy
e4e0a4bca0 am 7d5c0e66: am 15f0a79a: Merge "fix typo in comment @beamsOverlap"
Merge commit '7d5c0e660e52888f986acef2cecde8ddc9ca26c8'

* commit '7d5c0e660e52888f986acef2cecde8ddc9ca26c8':
  fix typo in comment @beamsOverlap
2010-09-12 14:01:08 -07:00
Brad Fitzpatrick
42a5ed2015 resolved conflicts for merge of 171c83f4 to master
Change-Id: I56a4c1838b17cf40d96763f95df3c84fc86359eb
2010-09-12 13:55:18 -07:00
Adam Powell
806b717bf5 Merge "resolved conflicts for merge of 12e08f3a to master" 2010-09-12 13:14:16 -07:00
Romain Guy
6d000d4eb7 Merge "Optimize calls to glCopyTexImage2D()." 2010-09-12 13:03:42 -07:00
Romain Guy
8694230ff2 Optimize calls to glCopyTexImage2D().
Change-Id: I34ee87bd4472864f440916e03a2894fae24bbe4a
2010-09-12 13:02:16 -07:00
Adam Powell
be36668499 resolved conflicts for merge of 12e08f3a to master
Change-Id: Ic691ec7716d5c450406717d3748847cb9c6b7e82
2010-09-12 12:47:04 -07:00
Romain Guy
ae44d554b7 Merge "Correct implementation of saveLayer()." 2010-09-12 12:25:13 -07:00
Romain Guy
f607bdc167 Correct implementation of saveLayer().
Change-Id: I5375126636913e0a84f2d6bbd0ebe40d2e4f2763
2010-09-12 12:24:12 -07:00
Romain Guy
7d5c0e660e am 15f0a79a: Merge "fix typo in comment @beamsOverlap"
Merge commit '15f0a79a81fd18211603587bcd46eee0e37ced4d' into gingerbread-plus-aosp

* commit '15f0a79a81fd18211603587bcd46eee0e37ced4d':
  fix typo in comment @beamsOverlap
2010-09-12 12:01:54 -07:00
Romain Guy
15f0a79a81 Merge "fix typo in comment @beamsOverlap" 2010-09-12 11:42:49 -07:00
Brad Fitzpatrick
171c83f47d am 11fe181e: Add faster TextUtil function for searching delimited lists.
Merge commit '11fe181e16501103d7c0f70344661ea2ef5d3df9' into gingerbread-plus-aosp

* commit '11fe181e16501103d7c0f70344661ea2ef5d3df9':
  Add faster TextUtil function for searching delimited lists.
2010-09-12 11:03:48 -07:00
Brad Fitzpatrick
11fe181e16 Add faster TextUtil function for searching delimited lists.
The previous version in Settings allocated memory.

Change-Id: I0f821112dc8f830689489f201ce268195f9e6cbd
2010-09-12 10:58:38 -07:00
Adam Powell
12e08f3a88 am 26cab064: Merge "Allow two finger pan and scale on touchscreens with FEATURE_TOUCHSCREEN_MULTITOUCH_DISTINCT." into gingerbread
Merge commit '26cab06472badee374ac854f5a210991c37c4493' into gingerbread-plus-aosp

* commit '26cab06472badee374ac854f5a210991c37c4493':
  Allow two finger pan and scale on touchscreens with
2010-09-12 10:28:50 -07:00
Adam Powell
26cab06472 Merge "Allow two finger pan and scale on touchscreens with FEATURE_TOUCHSCREEN_MULTITOUCH_DISTINCT." into gingerbread 2010-09-12 10:25:55 -07:00
Joe Onorato
9305647eb6 Plumb lights out mode through from the window manager to the status bar running in the system ui process.
Lights out mode itself isn't implemented.

Change-Id: Ieeef0eb9ae5be23000f770e74e8ee66472f4c673
2010-09-12 13:25:06 -04:00
madan ankapura
44e8ec7197 fix typo in comment @beamsOverlap
Change-Id: I7c7f8e94391ed71a54b65badea164286281df7e3
2010-09-12 09:09:05 -07:00
Kenny Root
8f7cc02c7c Move native library removal function to helper
Moves the remoteNativeLibrariesLI call to NativeLibraryHelper to prepare
for being able to symlink the /data/data/<package>/lib dir to the ASEC
container.

Change-Id: Ie3648509c6b6293a8d9bdd815610ab408df5047f
2010-09-12 09:04:56 -07:00
Kenny Root
806cc13a08 Initialize native library path in PackageSetting
During boot-up we weren't paying attention to the nativeLibraryPath that
was read from the package settings XML file which reset the path to the
default /data/data/<package>/lib directory.

This adds nativeLibraryPath as an argument to the PackageSettings
constructor and related functions that will pull that value in from the
settings file.

It also removes the call to nativeLibraryDir.mkdir() which installd does
by itself.

Change-Id: I53db73c3b1bc90997a4a73f7f2fbaee125e6f67e
2010-09-12 09:04:48 -07:00
Jean-Baptiste Queru
5af8c63e48 am ec06144c: am 36edb202: Merge "Make DRM libraries optional"
Merge commit 'ec06144c9ddd5eb06ab77b885bc5312e74b38415'

* commit 'ec06144c9ddd5eb06ab77b885bc5312e74b38415':
  Make DRM libraries optional
2010-09-12 08:59:29 -07:00
Jean-Baptiste Queru
ec06144c9d am 36edb202: Merge "Make DRM libraries optional"
Merge commit '36edb2028acf9f876a288a49a66bc749b28e64c1' into gingerbread-plus-aosp

* commit '36edb2028acf9f876a288a49a66bc749b28e64c1':
  Make DRM libraries optional
2010-09-12 08:57:07 -07:00
Romain Guy
0ce6c0f82d am 405f537a: am 89e05fd5: Merge "Fix the layouting of the checkbox."
Merge commit '405f537a47df7ea0c2ef95fd83dee0142eb0c108'

* commit '405f537a47df7ea0c2ef95fd83dee0142eb0c108':
  Fix the layouting of the checkbox.
2010-09-12 08:47:40 -07:00
Romain Guy
405f537a47 am 89e05fd5: Merge "Fix the layouting of the checkbox."
Merge commit '89e05fd560e3347070a55260b7aaec3db5647442' into gingerbread-plus-aosp

* commit '89e05fd560e3347070a55260b7aaec3db5647442':
  Fix the layouting of the checkbox.
2010-09-12 08:44:37 -07:00
Jean-Baptiste Queru
daa23af13b am fe1d52d5: resolved conflicts for merge of 01937f63 to gingerbread-plus-aosp
Merge commit 'fe1d52d572a750d548d7f573b3e4cac8cc08712f'

* commit 'fe1d52d572a750d548d7f573b3e4cac8cc08712f':
  Memory leak in TextKeyListener.
2010-09-12 08:43:53 -07:00
Jean-Baptiste Queru
36edb2028a Merge "Make DRM libraries optional" 2010-09-12 08:42:48 -07:00
Jean-Baptiste Queru
fe1d52d572 resolved conflicts for merge of 01937f63 to gingerbread-plus-aosp
Change-Id: If4e427d87538477c90f43be7a9733adb8da1c617
2010-09-12 08:35:04 -07:00
Romain Guy
89e05fd560 Merge "Fix the layouting of the checkbox." 2010-09-11 14:06:07 -07:00
Romain Guy
01937f63dc Merge "Memory leak in TextKeyListener." 2010-09-11 14:03:11 -07:00
Kristian Monsen
9b3f11408b Merge WebKit at r66666 : Update User Agent string with new webkit version.
Change-Id: Id3f9748b806e58f9a8d79553ceff8859eda7c49f
2010-09-11 12:10:00 +01:00
Nipun Kwatra
522632cde5 Exposing specific profile levels + hasProfile().
- Exposing the specific resolution profile levels
  QUALITY_{QCIF,CIF,480P,720P,1080P} and the new time lapse profiles
  QUALITY_TIME_LAPSE_{LOW,HIGH,QCIF,CIF,480P,720P,1080P}
- Unhiding the hasProfile() function used to test if a given profile exists.

Change-Id: I5d8b9e1ba61718f304235e76d85244e428e68643
2010-09-10 18:01:46 -07:00
Chet Haase
5976d24d6f Merge "Make fragment animations work when fragments go away" 2010-09-10 17:45:03 -07:00
Chet Haase
b20db3ec34 Make fragment animations work when fragments go away
Change-Id: I136de6ef910cc02b8181fcfa065bdb0770841396
2010-09-10 17:43:04 -07:00