moparisthebest
/
k-9
mirror of https://github.com/moparisthebest/k-9
1
0
Fork 0
Code Issues Releases Wiki Activity

Make the setEmbeddedTitleBar fall-back work on pre-API16, too

This commit is contained in:
cketti 2012-08-04 01:13:38 +02:00
parent de6d271d58
commit e08b5d2edf
1 changed files with 8 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/com/nobu_games/android/view/web/TitleBarWebView.java
View File

@ -58,7 +58,7 @@ public class TitleBarWebView extends WebView {
if(!mTouchInTitleBar) {
return false;
} else {
switch(ev.getActionMasked()) {
switch(ev.getAction() & MotionEvent.ACTION_MASK) {
case MotionEvent.ACTION_UP:
case MotionEvent.ACTION_CANCEL:
mTouchInTitleBar = false;
@ -110,7 +110,7 @@ public class TitleBarWebView extends WebView {
final float x = event.getX();
float y = event.getY();
switch(event.getActionMasked()) {
switch(event.getAction() & MotionEvent.ACTION_MASK) {
case MotionEvent.ACTION_DOWN:
if(y <= visTitleHeight) {
mTouchInTitleBar = true;
@ -305,16 +305,12 @@ public class TitleBarWebView extends WebView {
ViewGroup.LayoutParams.MATCH_PARENT,
ViewGroup.LayoutParams.WRAP_CONTENT, 0, 0);
if(Build.VERSION.SDK_INT >= 16) {
TouchBlockView tbv = new TouchBlockView(getContext());
FrameLayout.LayoutParams tbvParams = new FrameLayout.LayoutParams(
LayoutParams.MATCH_PARENT, LayoutParams.WRAP_CONTENT);
tbv.addView(v, tbvParams);
addView(tbv, vParams);
v = tbv;
} else {
addView(v, vParams);
}
TouchBlockView tbv = new TouchBlockView(getContext());
FrameLayout.LayoutParams tbvParams = new FrameLayout.LayoutParams(
LayoutParams.MATCH_PARENT, LayoutParams.WRAP_CONTENT);
tbv.addView(v, tbvParams);
addView(tbv, vParams);
v = tbv;
}
mTitleBar = v;