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

76416 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jim Miller
07e1f12350 am a482f942: Merge "Fix 6397736: Fix issue with MultiWaveView in incoming call screen." into jb-dev 
* commit 'a482f942dae90211540c856664ca71ba29297309':
  Fix 6397736: Fix issue with MultiWaveView in incoming call screen.
 2012-05-07 14:51:19 -07:00
Jim Miller
a482f942da Merge "Fix 6397736: Fix issue with MultiWaveView in incoming call screen." into jb-dev 2012-05-07 14:48:19 -07:00
Matthew Xie
87d7c1d740 am ac8a61b6: Merge "When turning off, broadcast STATE_OFF in the last HotOff state" into jb-dev 
* commit 'ac8a61b6d47e737794b2aaeaf629d87e493413b8':
  When turning off, broadcast STATE_OFF in the last HotOff state
 2012-05-07 14:41:41 -07:00
Jim Miller
72b26c1fa2 Fix 6397736: Fix issue with MultiWaveView in incoming call screen. 
This fixes a bug where the incoming call screen sometimes had
misplaced icons. The code previously relied on an additional layout
pass that doesn't happen in the incoming call screen in some cases.

Change-Id: If7c39994c1bdadbd3e97f4b9ebb45f68893fd9bd
 2012-05-07 14:39:31 -07:00
Matthew Xie
ac8a61b6d4 Merge "When turning off, broadcast STATE_OFF in the last HotOff state" into jb-dev 2012-05-07 14:38:42 -07:00
Jim Miller
8676726dcf am 06e8d664: Merge "Fix 6397736: Swipe up to search layout fixes" into jb-dev 
* commit '06e8d6647db54aa76dda92a5a785737e66d262de':
  Fix 6397736: Swipe up to search layout fixes
 2012-05-07 14:37:39 -07:00
Jim Miller
06e8d6647d Merge "Fix 6397736: Swipe up to search layout fixes" into jb-dev 2012-05-07 14:34:00 -07:00
Jeff Sharkey
83abfb3cab am 476b03b0: Merge "Handle silent ringtone, title without permission." into jb-dev 
* commit '476b03b0c0d5cae4d1b114c6f80858d59ba36cad':
  Handle silent ringtone, title without permission.
 2012-05-07 13:46:24 -07:00
Jeff Sharkey
476b03b0c0 Merge "Handle silent ringtone, title without permission." into jb-dev 2012-05-07 13:43:04 -07:00
Robert Greenwalt
d760beb735 am 2321301f: Merge "Bring up the ethernet interface when detected" into jb-dev 
* commit '2321301fe75f945b002372d6d35c597191564452':
  Bring up the ethernet interface when detected
 2012-05-07 13:42:53 -07:00
Robert Greenwalt
2321301fe7 Merge "Bring up the ethernet interface when detected" into jb-dev 2012-05-07 13:39:34 -07:00
Eric Fischer
3b08f16da2 am 7833e5f5: Merge "Import translations. DO NOT MERGE" into jb-dev 
* commit '7833e5f53228dd3f34c0f41550fea8564ed3222a':
  Import translations. DO NOT MERGE
 2012-05-07 13:30:19 -07:00
Jeff Sharkey
1d8e5c5880 Handle silent ringtone, title without permission. 
Silent ringtones have a valid Uri, but isn't openable by MediaPlayer,
so treat as no-op playback instead of throwing.  Also handle missing
permissions when resolving title.

Bug: 6448074, 6447538
Change-Id: I656675d7fc2e78a6ba05824e13bdd43193fcfdf2
 2012-05-07 13:30:10 -07:00
Eric Fischer
26c2c6010b am 0253c059: Merge "Import translations. DO NOT MERGE" into jb-dev 
* commit '0253c05962027607e38d7f9c49be1174edf892c9':
  Import translations. DO NOT MERGE
 2012-05-07 13:26:49 -07:00
Eric Fischer
7833e5f532 Merge "Import translations. DO NOT MERGE" into jb-dev 2012-05-07 13:26:12 -07:00
Eric Fischer
0253c05962 Merge "Import translations. DO NOT MERGE" into jb-dev 2012-05-07 13:25:09 -07:00
Chet Haase
48fa471742 am 4bbcae7e: Merge "Fix issue where scale-animating text would jump temporarily a few pixels" into jb-dev 
* commit '4bbcae7eb80704d919d8115d523196798e208439':
  Fix issue where scale-animating text would jump temporarily a few pixels
 2012-05-07 13:21:52 -07:00
Chet Haase
4bbcae7eb8 Merge "Fix issue where scale-animating text would jump temporarily a few pixels" into jb-dev 2012-05-07 13:20:00 -07:00
Craig Mautner
22135e46b1 am d8efe424: Merge "Change DimAnimator to reflect rotations." into jb-dev 
* commit 'd8efe42496806b483bbacea28d2456e8b2eac4fb':
  Change DimAnimator to reflect rotations.
 2012-05-07 13:13:26 -07:00
Craig Mautner
d8efe42496 Merge "Change DimAnimator to reflect rotations." into jb-dev 2012-05-07 13:10:08 -07:00
Marco Nelissen
7bd44d97f7 am b3482ffb: Merge "Fix crash when decoding bitmap" into jb-dev 
* commit 'b3482ffbeee30650359e6ab8f3950a83e06963b4':
  Fix crash when decoding bitmap
 2012-05-07 13:09:17 -07:00
Philip Milne
2a52d26c0b am 7bb66c9c: Hide optical bounds feature for JB. 
* commit '7bb66c9cae7847e3d58f412a73d54ee5d4bcaba0':
  Hide optical bounds feature for JB.
 2012-05-07 13:09:14 -07:00
Eric Fischer
b9f0cf1c73 Import translations. DO NOT MERGE 
Change-Id: Icee68860c27c90d2ef41c0e29660fcda35ec658d
 2012-05-07 13:07:46 -07:00
Eric Fischer
2f851a4bce Import translations. DO NOT MERGE 
Change-Id: Id186acbe0e1b24f840ca3fdeb73c94d0c3d2aaa6
 2012-05-07 12:51:17 -07:00
Robert Greenwalt
198bc11d09 Bring up the ethernet interface when detected 
We don't get link status info if it's down.  If the device has been configured
for ethernet and we see the interface appear, we should make it active.

bug:6444395
Change-Id: Ibc233ab12942b069d7db9c0671936798c5161659
 2012-05-07 12:34:26 -07:00
Chet Haase
d3efd6920e Fix issue where scale-animating text would jump temporarily a few pixels 
Some logic in the native matrix code would determine that a matrix was
'pureTranslate' based on the scale values of a matrix being close-enough to 1,
which was within a very small epsilon. This works in general, because screen space
coordinates make that epsilon value irrelevant, so close-enough really is close-enough.

However, TextView, when centering text, works in a coordinate system that is quite
huge, with left/right values about 500,000. These numbers multiplied times that small
epsilon value would give a result that was significant, and would cause a miscalculation
of up to 4-5 pixels, causing the snap that we'd see for a couple of frames as the
scale got "close enough" to 1.

The fix is to remove the optimization of "close enough". What we really need the matrix to
do is to identify itself as being translate-only when no scale as been set (which is the
default). For the purposes of that check, it is good enough to simply check the values against
1 directly. Similarly, the bounds-check logic needs to check against 0 and 1 directly.

Issue #6452687: Glitch when changing scale of a view containing text

Change-Id: I167fb45d02201fb879deea0e5a7ca95e38128e17
 2012-05-07 12:18:19 -07:00
Marco Nelissen
b3482ffbee Merge "Fix crash when decoding bitmap" into jb-dev 2012-05-07 12:09:02 -07:00
Philip Milne
7bb66c9cae Hide optical bounds feature for JB. 
Change-Id: I1fe38e9c64515acd550baa930ebc0af4c139bf40
 2012-05-07 11:42:57 -07:00
Amith Yamasani
503b2e5ae1 am 44e3f88f: Merge "Javadoc improvements in SearchView per API review." into jb-dev 
* commit '44e3f88f2f80c7dfbe36c22878d129251ba13165':
  Javadoc improvements in SearchView per API review.
 2012-05-07 11:35:47 -07:00
John Reck
462ee95ff0 am a09b06ef: Merge "Remove heldMotionless disabling native scroll mode" into jb-dev 
* commit 'a09b06effff87f9c073cdc7729884adc41286fe1':
  Remove heldMotionless disabling native scroll mode
 2012-05-07 11:35:44 -07:00
Amith Yamasani
44e3f88f2f Merge "Javadoc improvements in SearchView per API review." into jb-dev 2012-05-07 11:33:16 -07:00
John Reck
a09b06efff Merge "Remove heldMotionless disabling native scroll mode" into jb-dev 2012-05-07 11:33:13 -07:00
Marco Nelissen
b2fe3be4ff Fix crash when decoding bitmap 
Externally reported crash when decoding corrupted .wmf file.
b/5048623

Change-Id: I1df0861cd36983cb4d1460caa221c54d3fc240af
 2012-05-07 11:24:13 -07:00
Gilles Debunne
8779c022b4 am 0caf421e: Merge "Final fix in SpannableStringBuilder." into jb-dev 
* commit '0caf421e3aacea928f2ce0e99e101a6584127527':
  Final fix in SpannableStringBuilder.
 2012-05-07 11:22:26 -07:00
Craig Mautner
3a67f35f5e Change DimAnimator to reflect rotations. 
Enlarge DimAnimator to cover corners when frozen surface rotates.
Update DimAnimator size following rotation to reflect new dimensions.

Fixes bug 6449788.
Fixes bug 6449035.

Change-Id: I217d7c96af940e6affc395b79dc665d00318b18c
 2012-05-07 11:21:33 -07:00
Jeff Sharkey
e4b703b7ea am fb0caad4: Merge "Ack, wrap advisePersistThreshold() in lock." into jb-dev 
* commit 'fb0caad42353687e63cd560dc7fb028b8439edde':
  Ack, wrap advisePersistThreshold() in lock.
 2012-05-07 11:19:25 -07:00
Gilles Debunne
0caf421e3a Merge "Final fix in SpannableStringBuilder." into jb-dev 2012-05-07 11:17:38 -07:00
Jeff Sharkey
fb0caad423 Merge "Ack, wrap advisePersistThreshold() in lock." into jb-dev 2012-05-07 11:16:01 -07:00
Jeff Sharkey
5801597a90 Ack, wrap advisePersistThreshold() in lock. 
Bug: 6449725
Change-Id: I702dc2ff9d4b237c46d89bcae41289bc3e9ef2f8
 2012-05-07 11:08:49 -07:00
Matthew Xie
b12d6bc3a5 When turning off, broadcast STATE_OFF in the last HotOff state 
This is because we do HotOff -> PowerOff -> HotOff for USER_TURN_OFF
Donot do poweroff for perprocess turn off.
Add small time delays for calls into stack to reset dbus timing.
bug 6438556

Change-Id: Iae8bdd24e41824ed4bc34aca96d082f9284f169c
 2012-05-07 11:01:23 -07:00
Selim Gurun
5d13e8ef83 am ee00b31a: Merge "Use private key context when necessary" into jb-dev 
* commit 'ee00b31a54cc186cb53fe30d7834361791baab20':
  Use private key context when necessary
 2012-05-07 10:56:48 -07:00
Selim Gurun
ee00b31a54 Merge "Use private key context when necessary" into jb-dev 2012-05-07 10:54:24 -07:00
Daisuke Miyakawa
12ec18bdb0 am cacba459: Merge "Use callable-filter capability when updating call log" into jb-dev 
* commit 'cacba4599381e7bebbe7aa9e450e3b5baf5fd425':
  Use callable-filter capability when updating call log
 2012-05-07 10:48:28 -07:00
Daisuke Miyakawa
cacba45993 Merge "Use callable-filter capability when updating call log" into jb-dev 2012-05-07 10:46:26 -07:00
Romain Guy
9929b59ac5 am 9d7bbcb8: Merge "Log more frame data when profiling GL apps" into jb-dev 
* commit '9d7bbcb89a3f14331c55ed2bbdcf768a4aa91cc1':
  Log more frame data when profiling GL apps
 2012-05-07 10:25:43 -07:00
Romain Guy
9d7bbcb89a Merge "Log more frame data when profiling GL apps" into jb-dev 2012-05-07 10:23:14 -07:00
Romain Guy
a21f877434 Log more frame data when profiling GL apps 
Change-Id: Ib7377c22a2258aa6510677d80df34bb7e73dc714
 2012-05-07 10:20:52 -07:00
John Reck
079623bedf am ff0e8cd8: Merge "Drain any pending touch events immediately if possible" into jb-dev 
* commit 'ff0e8cd8b60aa8372b06edecb2e754b0905c4d31':
  Drain any pending touch events immediately if possible
 2012-05-07 10:07:33 -07:00
John Reck
ff0e8cd8b6 Merge "Drain any pending touch events immediately if possible" into jb-dev 2012-05-07 10:05:00 -07:00
Daniel Sandler
1f86ff5ac7 am 908c7dcf: Merge "Restore do-not-disturb mode on tablets." into jb-dev 
* commit '908c7dcf8292aae1067a946f12af88a9677a1878':
  Restore do-not-disturb mode on tablets.
 2012-05-07 06:03:44 -07:00