TheArchive/session-android
1
0
Fork 0
mirror of https://github.com/oxen-io/session-android.git synced 2024-12-25 01:07:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

Workaround LG-related menu issues, pt. 2

Browse Source 
fixes #2444
// FREEBIE
This commit is contained in:
Jake McGinty 2015-02-10 15:33:57 -08:00
parent b1bf33b13b
commit 3a9d521ffe
2 changed files with 41 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
src/org/thoughtcrime/securesms/BaseActionBarActivity.java
View File

@ -1,22 +1,53 @@
package org.thoughtcrime.securesms; package org.thoughtcrime.securesms;
import android.os.Bundle;
import android.support.annotation.NonNull; import android.support.annotation.NonNull;
import android.support.v7.app.ActionBarActivity; import android.support.v7.app.ActionBarActivity;
import android.util.Log;
import android.view.KeyEvent; import android.view.KeyEvent;
import android.view.ViewConfiguration;
import java.lang.reflect.Field;
public abstract class BaseActionBarActivity extends ActionBarActivity { public abstract class BaseActionBarActivity extends ActionBarActivity {
private static final String TAG = BaseActionBarActivity.class.getSimpleName();
@Override
protected void onCreate(Bundle savedInstanceState) {
if (BaseActivity.isMenuWorkaroundRequired()) {
forceOverflowMenu();
}
super.onCreate(savedInstanceState);
}
@Override @Override
public boolean onKeyDown(int keyCode, KeyEvent event) { public boolean onKeyDown(int keyCode, KeyEvent event) {
return BaseActivity.isKeyCodeWorkaroundRequired(keyCode) || super.onKeyDown(keyCode, event); return (keyCode == KeyEvent.KEYCODE_MENU && BaseActivity.isMenuWorkaroundRequired()) || super.onKeyDown(keyCode, event);
} }
@Override @Override
public boolean onKeyUp(int keyCode, @NonNull KeyEvent event) { public boolean onKeyUp(int keyCode, @NonNull KeyEvent event) {
if (BaseActivity.isKeyCodeWorkaroundRequired(keyCode)) { if (keyCode == KeyEvent.KEYCODE_MENU && BaseActivity.isMenuWorkaroundRequired()) {
openOptionsMenu(); openOptionsMenu();
return true; return true;
} }
return super.onKeyUp(keyCode, event); return super.onKeyUp(keyCode, event);
} }
/**
* Modified from: http://stackoverflow.com/a/13098824
*/
private void forceOverflowMenu() {
try {
ViewConfiguration config = ViewConfiguration.get(this);
Field menuKeyField = ViewConfiguration.class.getDeclaredField("sHasPermanentMenuKey");
if(menuKeyField != null) {
menuKeyField.setAccessible(true);
menuKeyField.setBoolean(config, false);
}
} catch (IllegalAccessException | NoSuchFieldException e) {
Log.w(TAG, "Failed to force overflow menu.");
}
}
} }

14
src/org/thoughtcrime/securesms/BaseActivity.java
View File

@ -1,6 +1,8 @@
package org.thoughtcrime.securesms; package org.thoughtcrime.securesms;
import android.os.Build; import android.os.Build;
import android.os.Build.VERSION;
import android.os.Build.VERSION_CODES;
import android.support.annotation.NonNull; import android.support.annotation.NonNull;
import android.support.v4.app.FragmentActivity; import android.support.v4.app.FragmentActivity;
import android.view.KeyEvent; import android.view.KeyEvent;
@ -8,21 +10,21 @@ import android.view.KeyEvent;
public abstract class BaseActivity extends FragmentActivity { public abstract class BaseActivity extends FragmentActivity {
@Override @Override
public boolean onKeyDown(int keyCode, KeyEvent event) { public boolean onKeyDown(int keyCode, KeyEvent event) {
return isKeyCodeWorkaroundRequired(keyCode) || super.onKeyDown(keyCode, event); return (keyCode == KeyEvent.KEYCODE_MENU && isMenuWorkaroundRequired()) || super.onKeyDown(keyCode, event);
} }
@Override @Override
public boolean onKeyUp(int keyCode, @NonNull KeyEvent event) { public boolean onKeyUp(int keyCode, @NonNull KeyEvent event) {
if (isKeyCodeWorkaroundRequired(keyCode)) { if (keyCode == KeyEvent.KEYCODE_MENU && isMenuWorkaroundRequired()) {
openOptionsMenu(); openOptionsMenu();
return true; return true;
} }
return super.onKeyUp(keyCode, event); return super.onKeyUp(keyCode, event);
} }
public static boolean isKeyCodeWorkaroundRequired(int keyCode) { public static boolean isMenuWorkaroundRequired() {
return (keyCode == KeyEvent.KEYCODE_MENU) && return VERSION.SDK_INT <= VERSION_CODES.JELLY_BEAN &&
(Build.VERSION.SDK_INT == 16) && VERSION.SDK_INT > VERSION_CODES.GINGERBREAD_MR1 &&
("LGE".equalsIgnoreCase(Build.MANUFACTURER)); ("LGE".equalsIgnoreCase(Build.MANUFACTURER) || "E6710".equalsIgnoreCase(Build.DEVICE));
} }
} }