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

24817 Commits

Author SHA1 Message Date
John Reck
e6d1d4d4bb am 51688c51: am dee9d9ab: Merge "Prevent updateStateTrackers from being affected by preventDefault()" into jb-dev 
* commit '51688c51c14e7e92bc6d6139a099cf701b1608b0':
  Prevent updateStateTrackers from being affected by preventDefault()
 2012-05-14 07:48:44 -07:00
Jeff Brown
d4bef4b786 am 47272c93: am b12b6b51: Merge "Minor refactoring before starting on velocity tracker changes." into jb-dev 
* commit '47272c932ab6157022aaefd015e5d1df9dc5bd2f':
  Minor refactoring before starting on velocity tracker changes.
 2012-05-14 07:48:31 -07:00
Teng-Hui Zhu
e947752c0f am 08df9eac: am ef279363: Merge "Fix a crash." into jb-dev 
* commit '08df9eac6e7ef246afb5ccd9d7cccadcb131e7b2':
  Fix a crash.
 2012-05-14 07:48:21 -07:00
Chet Haase
7008d7b7f3 am fd086b95: am 76f08218: Merge "Fix quickReject logic for transformed views" into jb-dev 
* commit 'fd086b95103e8c7fbe853f5702aaa7d04f2141f0':
  Fix quickReject logic for transformed views
 2012-05-14 07:47:59 -07:00
Jeff Brown
179817387b am f4df93ce: am 2f095760: Rename kcm attribute to keyboardLayout. 
* commit 'f4df93cec62861e3f185979612360c27dd80e043':
  Rename kcm attribute to keyboardLayout.
 2012-05-14 07:47:52 -07:00
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
John Reck
51688c51c1 am dee9d9ab: Merge "Prevent updateStateTrackers from being affected by preventDefault()" into jb-dev 
* commit 'dee9d9ab9f8843bdbc1fc5d29e92c12a2d0407b2':
  Prevent updateStateTrackers from being affected by preventDefault()
 2012-05-11 14:25:55 -07:00
John Reck
dee9d9ab9f Merge "Prevent updateStateTrackers from being affected by preventDefault()" into jb-dev 2012-05-11 14:23:18 -07:00
Jeff Brown
47272c932a am b12b6b51: Merge "Minor refactoring before starting on velocity tracker changes." into jb-dev 
* commit 'b12b6b5116e3d76474296b45f570693bb10d6c99':
  Minor refactoring before starting on velocity tracker changes.
 2012-05-11 14:06:30 -07:00
Jeff Brown
b12b6b5116 Merge "Minor refactoring before starting on velocity tracker changes." into jb-dev 2012-05-11 14:03:38 -07:00
John Reck
387c2e8d42 Prevent updateStateTrackers from being affected by preventDefault() 
Bug: 6477996
 Calling e.preventDefault() on a javascript touch handler is apparantly
 not supposed to prevent the default gesture detector, who knew?

Change-Id: I6ee36e2fbc485b289b6dbb3464d8562c88e3be49
 2012-05-11 13:50:57 -07:00
Teng-Hui Zhu
08df9eac6e am ef279363: Merge "Fix a crash." into jb-dev 
* commit 'ef279363716706192b4da543fcae3e92cc14d27e':
  Fix a crash.
 2012-05-11 13:47:38 -07:00
Teng-Hui Zhu
ef27936371 Merge "Fix a crash." into jb-dev 2012-05-11 13:45:13 -07:00
Chet Haase
fd086b9510 am 76f08218: Merge "Fix quickReject logic for transformed views" into jb-dev 
* commit '76f082189ec451433d942fcee5ca2913f4132e6b':
  Fix quickReject logic for transformed views
 2012-05-11 13:02:43 -07:00
Teng-Hui Zhu
422400f92d Fix a crash. 
End can happen when error happens, but media controller may be not ready yet.

bug:5340224
Change-Id: I94607dfdf26d2dc4c7bbc9c2a62f98deccb8d198
 2012-05-11 13:00:03 -07:00
Chet Haase
76f082189e Merge "Fix quickReject logic for transformed views" into jb-dev 2012-05-11 12:59:41 -07:00
Jeff Brown
f4df93cec6 am 2f095760: Rename kcm attribute to keyboardLayout. 
* commit '2f0957607411b99810226ad38d59cf18718b86d0':
  Rename kcm attribute to keyboardLayout.
 2012-05-11 12:59:32 -07:00
Jeff Brown
8a90e6e317 Minor refactoring before starting on velocity tracker changes. 
Bug: 6413587
Change-Id: I5eba2bb57193bff78cb3740de5f87aca0b31d154
 2012-05-11 12:32:56 -07:00
Jeff Brown
2f09576074 Rename kcm attribute to keyboardLayout. 
Bug: 6478076
Change-Id: I7fc0d8eb36d03a628d070f8fd6ea1e1464b1a163
 2012-05-11 12:32:56 -07:00
Chet Haase
1a3ab175b0 Fix quickReject logic for transformed views 
When a parent draws its child views, each child's bounds is checked
against the current dirty region. If the view falls outside of that
region is is rejected and doesn't enter into the parent's DisplayList.

This works in general, for both transformed and untransformed views
(because we skip this check if the view is transformed). But it breaks down
when the transform properties of the view change later, since DisplayList
properties simply push these values down to the view's DisplayList without
invalidating the parent. If a view is rejected when untransformed, then there
is nothing to cause it to be considered again until something causes an
invalidate of the parent.

The fix is to note when a view is rejected and record that information.
Later, when one of the transform-related properties change, we invalidate the parent
to force the check to happen again, which will cause the view to get drawn
if it's visible.

Issue #6477730 quickRejected views must recreate their DisplayLists on transform changes

Change-Id: I70caf198005cd7e424a37bccc6ae050e09880a6c
 2012-05-11 11:03:12 -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