Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
77,459 Commits 3 Branches 0 Tags
ad4fc6f764bcd2bdbac726efbfbfb6f4ffe113b6
Commit Graph

24798 Commits

Author SHA1 Message Date
Chet Haase
ad4fc6f764 am 4a70bc72: am 26511012: Merge "Clear animations in DisplayLists when done" into jb-dev 
* commit '4a70bc72a87427115d9d64516145283dc96745f2':
  Clear animations in DisplayLists when done
 2012-05-14 07:26:23 -07:00
Romain Guy
d6a98aafab am 30b013bf: am d303dd3d: Merge "Prevent NPE in TextureView.getBitmap()" into jb-dev 
* commit '30b013bfbad60e20b7f812d0c5e41893fb7503fa':
  Prevent NPE in TextureView.getBitmap()
 2012-05-12 16:46:55 -07:00
Teng-Hui Zhu
cffefb7062 am 9895881b: am 9ac32040: Merge "Keep the controller when video ended." into jb-dev 
* commit '9895881b2ca944e57b625368df18f40d3feeeba8':
  Keep the controller when video ended.
 2012-05-12 16:46:44 -07:00
Teng-Hui Zhu
87084281ca am b5005a54: am 6df5ca08: Merge "Avoid inline->fullscreen reload for html5 video." into jb-dev 
* commit 'b5005a544f779a7df9bfe960003ac135257487ef':
  Avoid inline->fullscreen reload for html5 video.
 2012-05-12 16:46:40 -07:00
Chet Haase
4a70bc72a8 am 26511012: Merge "Clear animations in DisplayLists when done" into jb-dev 
* commit '26511012c40dbe704f4791654b28b9e0e05589d8':
  Clear animations in DisplayLists when done
 2012-05-11 10:59:53 -07:00
Chet Haase
26511012c4 Merge "Clear animations in DisplayLists when done" into jb-dev 2012-05-11 10:57:40 -07:00
Raph Levien
2ab6568046 resolved conflicts for merge of a9cc30ce to master 
Change-Id: I507bd7a4650f9a7bfe6a0ad7bb8dd4067adb6a8b
 2012-05-11 10:43:39 -07:00
Romain Guy
30b013bfba am d303dd3d: Merge "Prevent NPE in TextureView.getBitmap()" into jb-dev 
* commit 'd303dd3da2af272d0beaac956a12e145b8386f45':
  Prevent NPE in TextureView.getBitmap()
 2012-05-11 10:27:54 -07:00
Romain Guy
d303dd3da2 Merge "Prevent NPE in TextureView.getBitmap()" into jb-dev 2012-05-11 10:25:06 -07:00
Teng-Hui Zhu
9895881b2c am 9ac32040: Merge "Keep the controller when video ended." into jb-dev 
* commit '9ac320406bcd0212923bfc0b4068df0b022fd4f7':
  Keep the controller when video ended.
 2012-05-11 10:02:15 -07:00
Teng-Hui Zhu
b5005a544f am 6df5ca08: Merge "Avoid inline->fullscreen reload for html5 video." into jb-dev 
* commit '6df5ca08f192e2b831c6cf216f3a2cfe63456ad0':
  Avoid inline->fullscreen reload for html5 video.
 2012-05-11 10:02:12 -07:00
Romain Guy
78245f77d2 Prevent NPE in TextureView.getBitmap() 
This crash could occur when invoking setSurfaceTexture() then getBitmap()
before the View has a chance to be drawn.

Change-Id: I25c55df15750e59b9c916e8f750de2c89718d39e
 2012-05-11 10:01:42 -07:00
Teng-Hui Zhu
9ac320406b Merge "Keep the controller when video ended." into jb-dev 2012-05-11 10:00:06 -07:00
Teng-Hui Zhu
6df5ca08f1 Merge "Avoid inline->fullscreen reload for html5 video." into jb-dev 2012-05-11 09:59:57 -07:00
Raph Levien
a9cc30ce59 am 75ef98f8: Merge "Add fontFamily XML attribute to select font family by string" into jb-dev 
* commit '75ef98f8210fa1845d04a6e8206f4c7be5499052':
  Add fontFamily XML attribute to select font family by string
 2012-05-11 09:33:22 -07:00
Raph Levien
75ef98f821 Merge "Add fontFamily XML attribute to select font family by string" into jb-dev 2012-05-11 09:31:22 -07:00
satok
169f85c773 am da0ff4de: am bec154c5: Allow the spell checker to remove existing misspelled spans 
* commit 'da0ff4de3203c5e821bef9830d0404ad1ab30dbf':
  Allow the spell checker to remove existing misspelled spans
 2012-05-11 03:35:38 -07:00
satok
da0ff4de32 am bec154c5: Allow the spell checker to remove existing misspelled spans 
* commit 'bec154c50036bc70a37518dc93f6821209f58728':
  Allow the spell checker to remove existing misspelled spans
 2012-05-11 03:31:32 -07:00
satok
bec154c500 Allow the spell checker to remove existing misspelled spans 
Bug: 6451163
Change-Id: If018533e8855e9dc21ab2a09ae31aa80ef260b72
 2012-05-11 17:34:01 +09:00
Wink Saville
0f863886c8 am 85dc303f: am e9aa4b27: Merge "Add additional debug for time zone handling." into jb-dev 
* commit '85dc303f80d141d70af9ba2e105c1af49bf9a7ad':
  Add additional debug for time zone handling.
 2012-05-10 23:19:57 -07:00
satok
be602f6722 am 0b8d272e: am 37e169cd: Add a safety net to set range span in the spell checker 
* commit '0b8d272eed3d342fbdafffd88be25db664a4e053':
  Add a safety net to set range span in the spell checker
 2012-05-10 23:19:55 -07:00
Wink Saville
85dc303f80 am e9aa4b27: Merge "Add additional debug for time zone handling." into jb-dev 
* commit 'e9aa4b27af4fe68b999f906aea80847fa1f4b0d8':
  Add additional debug for time zone handling.
 2012-05-10 23:15:59 -07:00
satok
0b8d272eed am 37e169cd: Add a safety net to set range span in the spell checker 
* commit '37e169cd1429c76a0223d8fdd77622ead718bbff':
  Add a safety net to set range span in the spell checker
 2012-05-10 23:15:57 -07:00
Dianne Hackborn
0ecbdb3c16 resolved conflicts for merge of ef9876a6 to master 
Change-Id: Ib047baa2f6746f2a069ce9ff1be2d71c450a0932
 2012-05-10 23:10:32 -07:00
Wink Saville
e9aa4b27af Merge "Add additional debug for time zone handling." into jb-dev 2012-05-10 23:05:54 -07:00
satok
37e169cd14 Add a safety net to set range span in the spell checker 
Bug: 6476578
Change-Id: I60ad82f80770dcb67fd9663dac64dc81634d7014
 2012-05-11 12:56:13 +09:00
Dianne Hackborn
ef9876a651 am fa61f0b2: JellyBean is now 4.1. 
* commit 'fa61f0b2e25382d3a8ea35024dd227606151e87a':
  JellyBean is now 4.1.
 2012-05-10 19:10:36 -07:00
Dianne Hackborn
fa61f0b2e2 JellyBean is now 4.1. 
Change-Id: Ie37a7c4356d593010686d5dc7d6e715d30099e1e
 2012-05-10 19:02:19 -07:00
Teng-Hui Zhu
4dd9dc8204 Keep the controller when video ended. 
Use the media controller as a reminder to the user when the video ended.
We don't quit the video here b/c user may want to replay the video.

bug:5340224
Change-Id: I6d5fdb54bb614277b75e1a18ebe0a7dadd47017e
 2012-05-10 17:23:24 -07:00
Jim Miller
76f1d7cea1 am 556d48f5: am fef47f42: Merge "Fix 6398209: Improve MultiWaveView animations and interaction" into jb-dev 
* commit '556d48f5a3dac3b530015db9f8306f915bea31b2':
  Fix 6398209: Improve MultiWaveView animations and interaction
 2012-05-10 16:48:16 -07:00
Teng-Hui Zhu
c2b06d5a83 Avoid inline->fullscreen reload for html5 video. 
Now when a user start inline play and then switch to full screen, there is no
reload any more.
Basically, we change mediaplayer as a static member, and detect possible
situation to skip the prepare work.

bug:5710646

Change-Id: Ida34cf2e919a6cc8e0d52cd1175d51b5f5d527f7
 2012-05-10 16:46:51 -07:00
Jim Miller
556d48f5a3 am fef47f42: Merge "Fix 6398209: Improve MultiWaveView animations and interaction" into jb-dev 
* commit 'fef47f422aef44a69aa1a417ef671d6934c5ed1f':
  Fix 6398209: Improve MultiWaveView animations and interaction
 2012-05-10 16:43:48 -07:00
Jim Miller
fef47f422a Merge "Fix 6398209: Improve MultiWaveView animations and interaction" into jb-dev 2012-05-10 16:41:55 -07:00
Dianne Hackborn
5c2a9ddcf2 am 00389a51: am b1b55e6c: Fix build. 
* commit '00389a5198d17a650b00b981b5a9174dbb88fc9f':
  Fix build.
 2012-05-10 16:34:33 -07:00
Dianne Hackborn
00389a5198 am b1b55e6c: Fix build. 
* commit 'b1b55e6c6b079d75c13dcc23ca3ebce847bb42f8':
  Fix build.
 2012-05-10 16:30:54 -07:00
Dianne Hackborn
b1b55e6c6b Fix build. 
Change-Id: Ie255c93442d0b62032ac25e6de97f2c03e5df3ba
 2012-05-10 16:25:54 -07:00
Wink Saville
26e1a02ba3 Add additional debug for time zone handling. 
Change-Id: Ie46bba7e0ef7737a865f7efadbf963c2d14e488f
 2012-05-10 16:23:39 -07:00
Jim Miller
10c66afbd0 Fix 6398209: Improve MultiWaveView animations and interaction 
TargetDrawables now have a "home" position they can be scaled about.
Added new "focused" state to TargetDrawable.  This is used to distinguish between highlight and selection.
Updated target icons to use new focused state. Currently re-uses "activated" icon.
Change to event handling to allow cancel events when a target is highlighted to cause a selection.
Cleaned up MultiWaveView initialization code.

MultiWaveView animation improvements:
 - new scale animation when center handle is touched.
 - switched to using indices instead of foreach loops in critical path code to avoid creating temporary objects.
 - updated and simplified animation code.

Change-Id: I593c021475f1644c73bdb9f84855e6a9fec7c0ab
 2012-05-10 15:59:03 -07:00
Daniel Sandler
e1713afb6c am 6ad11058: am f54bfcf5: Merge "Restyling action buttons." into jb-dev 
* commit '6ad1105806232b540848a84050c5106a895d694b':
  Restyling action buttons.
 2012-05-10 15:50:20 -07:00
Daniel Sandler
6ad1105806 am f54bfcf5: Merge "Restyling action buttons." into jb-dev 
* commit 'f54bfcf5a3594d7d8423391be68d9b982ea6c4fa':
  Restyling action buttons.
 2012-05-10 15:46:11 -07:00
Daniel Sandler
f54bfcf5a3 Merge "Restyling action buttons." into jb-dev 2012-05-10 15:44:16 -07:00
Dianne Hackborn
50d9921502 am de888fec: am 255d1e15: Merge "Fix issue #6475693: OnSystemUiVisibilityChangeListener reporting..." into jb-dev 
* commit 'de888fec6b7c2f2c9a32a7e9faf38083f67da4d8':
  Fix issue #6475693: OnSystemUiVisibilityChangeListener reporting...
 2012-05-10 15:40:35 -07:00
Dianne Hackborn
de888fec6b am 255d1e15: Merge "Fix issue #6475693: OnSystemUiVisibilityChangeListener reporting..." into jb-dev 
* commit '255d1e1540833fb1980791b2e340cad4cb18b3b7':
  Fix issue #6475693: OnSystemUiVisibilityChangeListener reporting...
 2012-05-10 15:36:12 -07:00
Dianne Hackborn
255d1e1540 Merge "Fix issue #6475693: OnSystemUiVisibilityChangeListener reporting..." into jb-dev 2012-05-10 15:32:32 -07:00
Dianne Hackborn
cf67578c7f Fix issue #6475693: OnSystemUiVisibilityChangeListener reporting... 
...incorrect visibility when the ActionBar overflow menu is opened

Don't report layout flags in system UI visibility callback.  Update
docs to reflect this.

Change-Id: Icfa411b5537de037cafbcac04991101e8b9138c4
 2012-05-10 15:07:24 -07:00
Kenny Root
e4fd3d50c7 am 42a419b4: am 718af32a: Merge "Use long instead of int for file offsets" into jb-dev 
* commit '42a419b4c0e7d16145e336ceec709dcefbdcf894':
  Use long instead of int for file offsets
 2012-05-10 15:00:32 -07:00
Kenny Root
42a419b4c0 am 718af32a: Merge "Use long instead of int for file offsets" into jb-dev 
* commit '718af32a191066822262ad05cdd525a09c66094f':
  Use long instead of int for file offsets
 2012-05-10 14:57:34 -07:00
Kenny Root
718af32a19 Merge "Use long instead of int for file offsets" into jb-dev 2012-05-10 14:55:35 -07:00
Chet Haase
afd5c3ee60 Clear animations in DisplayLists when done 
The matrix calculated by Animations is pushed down to the native
DisplayList object, and is then used when the DL is issued to the
GL renderer. This works while the animation is running, but the end
of animations is not handled correctly. In particular, we never clear the
animation, so whatever the last frame of the animation calculated will
persist on that DisplayList object until it is recreated.

The fix is to note when we used to be animating and are no longer
doing so, taking that opportunity to push the cleared state down
to the DisplayList.

Issue #6448993 action bar -- including settings menu -- disappears on Nakasi

Change-Id: I73cdadaef40d87ccbc1beb02599c4d70506ea42b
 2012-05-10 14:16:44 -07:00
Daniel Sandler
e551884b09 Restyling action buttons. 
Bug: 6418617
Change-Id: I843352fbd167aeb6cc7beb0172b7416aabd5856a
 2012-05-10 16:45:48 -04:00