mirror of
https://github.com/moparisthebest/k-9
synced 2025-02-12 05:00:20 -05:00
Make the setEmbeddedTitleBar fall-back work on pre-API16, too
This commit is contained in:
parent
de6d271d58
commit
e08b5d2edf
@ -58,7 +58,7 @@ public class TitleBarWebView extends WebView {
|
|||||||
if(!mTouchInTitleBar) {
|
if(!mTouchInTitleBar) {
|
||||||
return false;
|
return false;
|
||||||
} else {
|
} else {
|
||||||
switch(ev.getActionMasked()) {
|
switch(ev.getAction() & MotionEvent.ACTION_MASK) {
|
||||||
case MotionEvent.ACTION_UP:
|
case MotionEvent.ACTION_UP:
|
||||||
case MotionEvent.ACTION_CANCEL:
|
case MotionEvent.ACTION_CANCEL:
|
||||||
mTouchInTitleBar = false;
|
mTouchInTitleBar = false;
|
||||||
@ -110,7 +110,7 @@ public class TitleBarWebView extends WebView {
|
|||||||
final float x = event.getX();
|
final float x = event.getX();
|
||||||
float y = event.getY();
|
float y = event.getY();
|
||||||
|
|
||||||
switch(event.getActionMasked()) {
|
switch(event.getAction() & MotionEvent.ACTION_MASK) {
|
||||||
case MotionEvent.ACTION_DOWN:
|
case MotionEvent.ACTION_DOWN:
|
||||||
if(y <= visTitleHeight) {
|
if(y <= visTitleHeight) {
|
||||||
mTouchInTitleBar = true;
|
mTouchInTitleBar = true;
|
||||||
@ -305,16 +305,12 @@ public class TitleBarWebView extends WebView {
|
|||||||
ViewGroup.LayoutParams.MATCH_PARENT,
|
ViewGroup.LayoutParams.MATCH_PARENT,
|
||||||
ViewGroup.LayoutParams.WRAP_CONTENT, 0, 0);
|
ViewGroup.LayoutParams.WRAP_CONTENT, 0, 0);
|
||||||
|
|
||||||
if(Build.VERSION.SDK_INT >= 16) {
|
|
||||||
TouchBlockView tbv = new TouchBlockView(getContext());
|
TouchBlockView tbv = new TouchBlockView(getContext());
|
||||||
FrameLayout.LayoutParams tbvParams = new FrameLayout.LayoutParams(
|
FrameLayout.LayoutParams tbvParams = new FrameLayout.LayoutParams(
|
||||||
LayoutParams.MATCH_PARENT, LayoutParams.WRAP_CONTENT);
|
LayoutParams.MATCH_PARENT, LayoutParams.WRAP_CONTENT);
|
||||||
tbv.addView(v, tbvParams);
|
tbv.addView(v, tbvParams);
|
||||||
addView(tbv, vParams);
|
addView(tbv, vParams);
|
||||||
v = tbv;
|
v = tbv;
|
||||||
} else {
|
|
||||||
addView(v, vParams);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
mTitleBar = v;
|
mTitleBar = v;
|
||||||
|
Loading…
Reference in New Issue
Block a user