RC: Add navbar enablement for hw key devices

Change-Id: I0cd2c0a07992ca5dc278e798ec7ee6969b27c96f
Signed-off-by: Brandon McAnsh <brandon.mcansh@gmail.com>

5 files changed, 34 insertions, 7 deletions

diff --git a/res/layout/fragment_navbar_settings.xml b/res/layout/fragment_navbar_settings.xml
index ddf6537..6992e0e 100644
--- a/res/layout/fragment_navbar_settings.xml
+++ b/res/layout/fragment_navbar_settings.xml
@@ -7,6 +7,16 @@
 
     <LinearLayout style="@style/settingsFragmentStyle">
 
+         <com.aokp.romcontrol.settings.CheckboxSetting
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:id="@+id/setting_toggle_navbar"
+                android:title="@string/enable_navigation_bar_title"
+                android:summary="@string/enable_navigation_bar_summary"
+                android:key="enable_navigation_bar"
+                android:defaultValue="false"
+                />
+
         <com.aokp.romcontrol.settings.SingleChoiceSetting
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
diff --git a/res/menu/navbar_setup.xml b/res/menu/navbar_setup.xml
index 2c2ce4e..65aefcc 100644
--- a/res/menu/navbar_setup.xml
+++ b/res/menu/navbar_setup.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <menu xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:title="@string/add_button" android:id="@+id/menu_add_button" android:showAsAction="always|withText"/>
+    <item android:title="@string/add_button" android:icon="@android:drawable/ic_menu_add" android:id="@+id/menu_add_button" android:showAsAction="always|withText"/>
 </menu>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 08cedd2..0fb16fd 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -316,6 +316,10 @@
     <string name="toggle_screenshot_delay_title">Screenshot delay</string>
     <string name="toggle_screenshot_delay_summary">Delay for screenshot toggle to send intent to capture screen</string>
 
+    <!-- Navigation Bar -->
+    <string name="enable_navigation_bar_title">Enable navigation bar</string>
+    <string name="enable_navigation_bar_summary">Enable the on-screen navigation bar</string>
+
     <!-- Nav Ring Targets -->
     <string name="navbar_ring_cat">Navigation ring targets</string>
     <string name="navbar_ring">Custom ring targets</string>
diff --git a/src/com/aokp/romcontrol/fragments/navbar/ArrangeNavbarFragment.java b/src/com/aokp/romcontrol/fragments/navbar/ArrangeNavbarFragment.java
index 0a0818f..c795081 100644
--- a/src/com/aokp/romcontrol/fragments/navbar/ArrangeNavbarFragment.java
+++ b/src/com/aokp/romcontrol/fragments/navbar/ArrangeNavbarFragment.java
@@ -14,7 +14,6 @@ import android.os.Bundle;
 import android.os.Environment;
 import android.provider.MediaStore;
 import android.provider.Settings;
-import android.provider.Settings.AOKP;
 import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.Menu;
@@ -130,7 +129,6 @@ public class ArrangeNavbarFragment extends Fragment implements OnPickListener {
     public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
         super.onCreateOptionsMenu(menu, inflater);
         inflater.inflate(R.menu.navbar_setup, menu);
-
     }
 
     @Override
@@ -160,13 +158,10 @@ public class ArrangeNavbarFragment extends Fragment implements OnPickListener {
             mActions[i] = AwesomeConstants.getProperName(getActivity(),
                     mActionCodes[i]);
         }
-
         mPicker = new ShortcutPickerHelper(this, this);
         readUserConfig();
     }
 
-
-
     @Override
     public void onResume() {
         super.onResume();
@@ -527,7 +522,7 @@ public class ArrangeNavbarFragment extends Fragment implements OnPickListener {
                 s.append("|");
             }
         }
-        Settings.AOKP.putString(getActivity().getContentResolver(), AOKP.NAVIGATION_BAR_BUTTONS, s.toString());
+        Settings.AOKP.putString(getActivity().getContentResolver(), Settings.AOKP.NAVIGATION_BAR_BUTTONS, s.toString());
     }
 
     private void readUserConfig() {
diff --git a/src/com/aokp/romcontrol/fragments/navbar/NavbarSettingsFragment.java b/src/com/aokp/romcontrol/fragments/navbar/NavbarSettingsFragment.java
index 921931f..ed8f99a 100644
--- a/src/com/aokp/romcontrol/fragments/navbar/NavbarSettingsFragment.java
+++ b/src/com/aokp/romcontrol/fragments/navbar/NavbarSettingsFragment.java
@@ -3,6 +3,7 @@ package com.aokp.romcontrol.fragments.navbar;
 import android.app.Fragment;
 import android.content.Context;
 import android.os.Bundle;
+import android.provider.Settings;
 import android.util.DisplayMetrics;
 import android.view.LayoutInflater;
 import android.view.View;
@@ -10,6 +11,7 @@ import android.view.ViewGroup;
 import com.aokp.romcontrol.R;
 import com.aokp.romcontrol.settings.BaseSetting;
 import com.aokp.romcontrol.settings.BaseSetting.OnSettingChangedListener;
+import com.aokp.romcontrol.settings.CheckboxSetting;
 import com.aokp.romcontrol.settings.SingleChoiceSetting;
 
 
@@ -23,12 +25,28 @@ public class NavbarSettingsFragment extends Fragment implements OnSettingChanged
 
     }
 
+    CheckboxSetting mToggleNavbar;
+
+    boolean hasNavbar;
+
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+
+        hasNavbar = getActivity().getResources()
+                .getBoolean(com.android.internal.R.bool.config_showNavigationBar);
+    }
+
     @Override
     public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
         View v = inflater.inflate(R.layout.fragment_navbar_settings, container, false);
 
         mContext = getActivity();
 
+        mToggleNavbar = (CheckboxSetting) v.findViewById(R.id.setting_toggle_navbar);
+        mToggleNavbar.setChecked(Settings.AOKP.getBoolean(getActivity().getContentResolver(),
+                Settings.AOKP.ENABLE_NAVIGATION_BAR, hasNavbar));
+
         navbar_width = (SingleChoiceSetting) v.findViewById(R.id.navigation_bar_width);
         navbar_height = (SingleChoiceSetting) v.findViewById(R.id.navigation_bar_height);
         navbar_height_landscape = (SingleChoiceSetting) v.findViewById(R.id.navigation_bar_height_landscape);