Add power/volume up/volume down keys to service and home screen, add

connect bot shortcuts

4 files changed, 116 insertions, 3 deletions

diff --git a/res/layout/buttonids.xml b/res/layout/buttonids.xml
index 6a06552..05bea58 100644
--- a/res/layout/buttonids.xml
+++ b/res/layout/buttonids.xml
@@ -29,6 +29,11 @@
 	<ImageButton android:id="@+id/search" />
 	<ImageButton android:id="@+id/settings" />
 	<ImageButton android:id="@+id/exit" />
+	<ImageButton android:id="@+id/sleep" />
+	<ImageButton android:id="@+id/volume_up" />
+	<ImageButton android:id="@+id/volume_down" />
+	<ImageButton android:id="@+id/custom1" />
+	<ImageButton android:id="@+id/custom2" />
 	<ImageButton android:id="@+id/popper" />
 </LinearLayout>
 
diff --git a/res/values/arrays.xml b/res/values/arrays.xml
index 1d82e75..231e449 100644
--- a/res/values/arrays.xml
+++ b/res/values/arrays.xml
@@ -57,4 +57,20 @@
     <item>tiny</item>
   </string-array>
   
+  <string-array name="orientationNames">
+	<item>Horizontal, Adjustable</item>
+    <item>Horizontal, Locked</item>
+    <item>Vertical, Adjustable</item>
+    <item>Vertical, Locked</item>
+    <item>Last Orientation, Adjustable</item>
+  </string-array>
+
+  <string-array name="orientationValues">
+    <item>horizontal_adjust</item>
+    <item>horizontal</item>
+    <item>vertical_adjust</item>
+    <item>vertical</item>
+    <item>save_adjust</item>
+  </string-array>
+  
 </resources>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 412f8d2..dfea6a7 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -31,6 +31,17 @@
     <string name="pref_service_no_background_title">Transparent Background</string>
     <string name="pref_service_no_background_summary_on">Background is Transparent, Buttons are Floating</string>
     <string name="pref_service_no_background_summary_off">Normal Background Containing Buttons</string>
+    <string name="pref_service_orientation_title">Orientation</string>
+    <string name="pref_service_orientation_summary">Choose Vertical or Horizontal and if Long Press Toggles</string>
+    
+    <string name="pref_category_custom_keys_title">Extra Custom Keys</string>
+    <string name="pref_category_custom_keys_summary">Set Custom Keys Under D-Pad</string>
+    <string name="pref_custom_key1">Custom Key 1</string>
+    <string name="pref_custom_key2">Custom Key 2</string>
+    <string name="pref_custom_key3">Custom Key 3</string>
+    <string name="pref_custom_key4">Custom Key 4</string>
+    <string name="pref_custom_key5">Custom Key 5</string>
+    <string name="pref_custom_key6">Custom Key 6</string>
     
     <string name="pref_category_virtual_title">Virtual Home Button</string>
     <string name="pref_category_virtual_summary">Select Launcher</string>
@@ -75,6 +86,21 @@
     <string name="pref_choosebutton_title">Prefs Button</string>
     <string name="pref_choosebutton_summary_on">Show Prefs Button</string>
     <string name="pref_choosebutton_summary_off">Hide Prefs Button</string>
+    <string name="pref_volume_up_title">Volume Up Button</string>
+    <string name="pref_volume_up_summary_on">Show Volume Up Button</string>
+    <string name="pref_volume_up_summary_off">Hide Volume Up Button</string>
+    <string name="pref_volume_down_title">Volume Down Button</string>
+    <string name="pref_volume_down_summary_on">Show Volume Down Button</string>
+    <string name="pref_volume_down_summary_off">Hide Volume Down Button</string>
+    <string name="pref_sleep_title">Sleep Button</string>
+    <string name="pref_sleep_summary_on">Show Sleep Button</string>
+    <string name="pref_sleep_summary_off">Hide Sleep Button</string>
+    <string name="pref_extra_custom1_title">Custom 1 Button</string>
+    <string name="pref_extra_custom1_summary_on">Show Custom 1 Button</string>
+    <string name="pref_extra_custom1_summary_off">Hide Custom 1 Button</string>
+    <string name="pref_extra_custom2_title">Custom 2 Button</string>
+    <string name="pref_extra_custom2_summary_on">Show Custom 2 Button</string>
+    <string name="pref_extra_custom2_summary_off">Hide Custom 2 Button</string>
     
     <string name="pref_screen_reorder_title">Change Button Order</string>
     <string name="pref_order_menu_title">Menu Button Position</string>
diff --git a/res/xml/prefs.xml b/res/xml/prefs.xml
index 7a1b07b..fddc692 100644
--- a/res/xml/prefs.xml
+++ b/res/xml/prefs.xml
@@ -85,7 +85,51 @@
 		                        android:defaultValue="false"
 		                        android:key="service_no_background"
 		                        />
-		            
+
+                <ListPreference
+		                        android:title="@string/pref_service_orientation_title"
+		                        android:summaryOn="@string/pref_service_orientation_summary"
+		                        android:entries="@array/orientationNames"
+		                        android:entryValues="@array/orientationValues"
+		                        android:defaultValue="save_adjust"
+		                        android:key="service_orientation"
+		                        />
+
+	   <PreferenceScreen
+	   		android:title="@string/pref_category_custom_keys_title"
+	   		android:summary="@string/pref_category_custom_keys_summary">
+	                        
+	                <ListPreference
+	                        android:title="@string/pref_custom_key1"
+	                        android:key="service_extra_custom_keyid1"
+	                         />
+	                         
+	                <ListPreference
+	                        android:title="@string/pref_custom_key2"
+	                        android:key="service_extra_custom_keyid2"
+	                         />
+	                         
+	                <ListPreference
+	                        android:title="@string/pref_custom_key3"
+	                        android:key="service_extra_custom_keyid3"
+	                         />
+	                         
+	                <ListPreference
+	                        android:title="@string/pref_custom_key4"
+	                        android:key="service_extra_custom_keyid4"
+	                         />
+	                         
+	                <ListPreference
+	                        android:title="@string/pref_custom_key5"
+	                        android:key="service_extra_custom_keyid5"
+	                         />
+	                         
+	                <ListPreference
+	                        android:title="@string/pref_custom_key6"
+	                        android:key="service_extra_custom_keyid6"
+	                         />
+	                         
+		</PreferenceScreen>		            
 	</PreferenceScreen>
 	
    <PreferenceScreen
@@ -189,8 +233,30 @@
                         android:key="choosebutton"
                         />
                         
-                 
-				
+                 <CheckBoxPreference
+                        android:title="@string/pref_volume_up_title"
+                        android:summaryOn="@string/pref_volume_up_summary_on"
+                        android:summaryOff="@string/pref_volume_up_summary_off"
+                        android:defaultValue="false"
+                        android:key="show_volume_up"
+                        />
+                        
+                 <CheckBoxPreference
+                        android:title="@string/pref_volume_down_title"
+                        android:summaryOn="@string/pref_volume_down_summary_on"
+                        android:summaryOff="@string/pref_volume_down_summary_off"
+                        android:defaultValue="false"
+                        android:key="show_volume_down"
+                        />
+                        
+                 <CheckBoxPreference
+                        android:title="@string/pref_sleep_title"
+                        android:summaryOn="@string/pref_sleep_summary_on"
+                        android:summaryOff="@string/pref_sleep_summary_off"
+                        android:defaultValue="false"
+                        android:key="show_sleep"
+                        />
+
 		        <CheckBoxPreference
 		                        android:title="@string/pref_blur_behind_title"
 		                        android:summaryOn="@string/pref_blur_behind_summary_on"