Remove duplicate code from ActionBarHelper. You can now set the drawables via the method calls

3 files changed, 0 insertions, 92 deletions

diff --git a/OpenPGP-Keychain/src/main/res/layout/actionbar_custom_view_save.xml b/OpenPGP-Keychain/src/main/res/layout/actionbar_custom_view_save.xml
deleted file mode 100644
index f0dcf177c..000000000
--- a/OpenPGP-Keychain/src/main/res/layout/actionbar_custom_view_save.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<!--
-      Copyright 2013 The Android Open Source Project
-
-      Licensed under the Apache License, Version 2.0 (the "License");
-      you may not use this file except in compliance with the License.
-      You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-      Unless required by applicable law or agreed to in writing, software
-      distributed under the License is distributed on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-      See the License for the specific language governing permissions and
-      limitations under the License.
--->
-
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:dividerPadding="12dp"
-    android:orientation="horizontal"
-    android:divider="@drawable/abc_list_divider_holo_light"
-    android:showDividers="end" >
-
-    <include layout="@layout/actionbar_include_save_button" />
-
-</LinearLayout>
\ No newline at end of file
diff --git a/OpenPGP-Keychain/src/main/res/layout/actionbar_custom_view_save_cancel.xml b/OpenPGP-Keychain/src/main/res/layout/actionbar_custom_view_save_cancel.xml
deleted file mode 100644
index ba08a7714..000000000
--- a/OpenPGP-Keychain/src/main/res/layout/actionbar_custom_view_save_cancel.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<!--
-      Copyright 2013 The Android Open Source Project
-
-      Licensed under the Apache License, Version 2.0 (the "License");
-      you may not use this file except in compliance with the License.
-      You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-      Unless required by applicable law or agreed to in writing, software
-      distributed under the License is distributed on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-      See the License for the specific language governing permissions and
-      limitations under the License.
--->
-
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:dividerPadding="12dp"
-    android:divider="@drawable/abc_list_divider_holo_light"
-    android:orientation="horizontal"
-    android:showDividers="middle">
-
-    <include layout="@layout/actionbar_include_cancel_button" />
-
-    <include layout="@layout/actionbar_include_save_button" />
-
-</LinearLayout>
\ No newline at end of file
diff --git a/OpenPGP-Keychain/src/main/res/layout/actionbar_include_save_button.xml b/OpenPGP-Keychain/src/main/res/layout/actionbar_include_save_button.xml
deleted file mode 100644
index 86c59dcc5..000000000
--- a/OpenPGP-Keychain/src/main/res/layout/actionbar_include_save_button.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<!--
-      Copyright 2013 The Android Open Source Project
-
-      Licensed under the Apache License, Version 2.0 (the "License");
-      you may not use this file except in compliance with the License.
-      You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-      Unless required by applicable law or agreed to in writing, software
-      distributed under the License is distributed on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-      See the License for the specific language governing permissions and
-      limitations under the License.
--->
-
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/actionbar_save"
-    style="@style/Widget.AppCompat.ActionButton"
-    android:layout_width="0dp"
-    android:layout_height="match_parent"
-    android:layout_weight="1">
-
-    <TextView
-        android:id="@+id/actionbar_save_text"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_gravity="center"
-        android:drawableLeft="@drawable/ic_action_save"
-        android:drawablePadding="8dp"
-        android:gravity="center_vertical"
-        android:paddingRight="20dp"
-        style="@style/Widget.AppCompat.Light.ActionBar.TabText"
-        android:text="Save (set in-code!)" />
-
-</FrameLayout>
\ No newline at end of file