summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorArnav Gupta <championswimmer@aokp.co>2014-01-04 04:59:14 +0530
committerLorDClockaN <davor@losinj.com>2014-05-21 14:31:31 +0200
commit43f62db21eaf72b9f91746baaf226fd71ecd4ca0 (patch)
treefa9511127d7e306f0058aaf0b0c3426b40acf524
parentc72229701cfb541193e093dc7841996784c1950a (diff)
RC: ad support for customizing camera hardware key
Change-Id: Ib800983b5971fbfe534fe39dae8b2ac728e630c2 Signed-off-by: Arnav Gupta <championswimmer@aokp.co>
-rw-r--r--res/layout/fragment_hardware_keys.xml10
-rw-r--r--res/values/strings.xml1
-rw-r--r--src/com/aokp/romcontrol/fragments/HardwareKeysFragment.java9
3 files changed, 18 insertions, 2 deletions
diff --git a/res/layout/fragment_hardware_keys.xml b/res/layout/fragment_hardware_keys.xml
index 4d75aad..bd38f1e 100644
--- a/res/layout/fragment_hardware_keys.xml
+++ b/res/layout/fragment_hardware_keys.xml
@@ -133,10 +133,18 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:id="@+id/setting_key_back_long_press"
-
android:title="@string/title_hardware_keys_back_long_press"
android:key="key_back_long_press_action"
+ android:entries="@array/setting_keyActionEntries"
+ android:entryValues="@array/setting_keyActionValues"
+ />
+ <com.aokp.romcontrol.settings.SingleChoiceSetting
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:id="@+id/setting_key_camera"
+ android:title="@string/title_hardware_keys_camera"
+ android:key="key_camera_action"
android:entries="@array/setting_keyActionEntries"
android:entryValues="@array/setting_keyActionValues"
/>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 10406ba..2573e65 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -152,6 +152,7 @@
<string name="title_hardware_keys_search_long_press">Search - long press</string>
<string name="title_hardware_keys_switch_app">Recents</string>
<string name="title_hardware_keys_switch_app_long_press">Recents - long press</string>
+ <string name="title_hardware_keys_camera">Camera</string>
<string name="title_setting_enable_custom_hardware_keys">Customize hardware keys</string>
<string name="summary_setting_enable_custom_hardware_keys">Enable to allow custom actions for the hardware keys to be set.</string>
diff --git a/src/com/aokp/romcontrol/fragments/HardwareKeysFragment.java b/src/com/aokp/romcontrol/fragments/HardwareKeysFragment.java
index d245444..2b4c229 100644
--- a/src/com/aokp/romcontrol/fragments/HardwareKeysFragment.java
+++ b/src/com/aokp/romcontrol/fragments/HardwareKeysFragment.java
@@ -41,9 +41,10 @@ public class HardwareKeysFragment extends Fragment {
SingleChoiceSetting setting_key_menu, setting_key_menu_long_press;
SingleChoiceSetting setting_key_search, setting_key_search_long_press;
SingleChoiceSetting setting_key_recents, setting_key_recents_long_press;
+ SingleChoiceSetting setting_key_camera;
int hardwareKeyMask;
- boolean mHasMenu, mHasBack, mHasHome, mHasAssist, mHasAppSwitch;
+ boolean mHasMenu, mHasBack, mHasHome, mHasAssist, mHasAppSwitch, mHasCamera;
@Override
public void onCreate(Bundle savedInstanceState) {
@@ -56,6 +57,7 @@ public class HardwareKeysFragment extends Fragment {
mHasHome = (hardwareKeyMask & KEY_MASK_HOME) != 0;
mHasAssist = (hardwareKeyMask & KEY_MASK_ASSIST) != 0;
mHasAppSwitch = (hardwareKeyMask & KEY_MASK_APP_SWITCH) != 0;
+ mHasCamera = (hardwareKeyMask & KEY_MASK_CAMERA) != 0;
}
@Override
@@ -106,6 +108,11 @@ public class HardwareKeysFragment extends Fragment {
setting_key_recents_long_press.setVisibility(View.GONE);
}
+ setting_key_camera = (SingleChoiceSetting) v.findViewById(R.id.setting_key_camera);
+ if (!mHasCamera) {
+ setting_key_camera.setVisibility(View.GONE);
+ }
+
return v;
}
}