Started using ActionBarSherlock

3 files changed, 2 insertions, 85 deletions

diff --git a/org_apg/res/values/colors.xml b/org_apg/res/values/colors.xml
deleted file mode 100644
index 11d0564f0..000000000
--- a/org_apg/res/values/colors.xml
+++ /dev/null
@@ -1,82 +0,0 @@
-<!--
-  Copyright 2011 Google Inc.
-
-  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.
--->
-<resources>
-
-<!--     <color name="textColorIconOverlay">#fff</color> -->
-<!--     <color name="textColorIconOverlayShadow">#000</color> -->
-<!--     <color name="shortcut_overlay_text_background">#7f000000</color> -->
-<!--     <color name="quickcontact_list_divider">#ffcdcdcd</color> -->
-<!--     <color name="quickcontact_list_background">#ffe2e2e2</color> -->
-<!--     <color name="quickcontact_tab_indicator">#ff33b5e6</color> -->
-
-    <color name="background_primary">#FFFFFF</color>
-    
-    <color name="text_primary">#333</color>
-    
-<!--     <color name="background_social_updates">#ffeeeeee</color> -->
-
-    <!-- Color used for the letter in the A-Z section header -->
-    <color name="section_header_text_color">#ff999999</color>
-
-<!--     Color of the text in the updates tab in the tab carousel on the contact detail page -->
-<!--     <color name="detail_update_tab_text_color">#777777</color> -->
-
-<!--     Color of the text describing an unconsumed missed call. -->
-<!--     <color name="call_log_missed_call_highlight_color">#FF0000</color> -->
-
-<!--     Color of the text describing an unconsumed voicemail. -->
-<!--     <color name="call_log_voicemail_highlight_color">#33b5e5</color> -->
-
-<!--     Colour background for the voicemail playback ui. -->
-<!--     <color name="voicemail_playback_ui_background">@android:color/black</color> -->
-
-<!--     Colour of voicemail progress bar to the right of position indicator. -->
-<!--     <color name="voicemail_playback_seek_bar_yet_to_play">#44ffffff</color> -->
-
-<!--     Colour of voicemail progress bar to the left of position indicator. -->
-<!--     <color name="voicemail_playback_seek_bar_already_played">#ccffffff</color> -->
-
-<!--     Colour of text that appears on the voicemail ui. -->
-<!--     <color name="voicemail_playback_ui_text">#cc696969</color> -->
-
-<!--     Color of the theme of the People app -->
-<!--     <color name="people_app_theme_color">#33B5E5</color> -->
-
-<!--     Secondary text color in the Phone app -->
-<!--     <color name="dialtacts_secondary_text_color">#888888</color> -->
-
-<!--     Colors in the contact browser list -->
-<!--     <color name="contact_count_text_color">#AAAAAA</color> -->
-
-<!--     Color of the text of the tab carousel in the contact details -->
-<!--     <color name="detail_tab_carousel_tab_label_color">#EEEEEE</color> -->
-
-<!--     Color of the text for buttons in the action bar -->
-<!--     <color name="action_bar_button_text_color">#FFFFFF</color> -->
-
-<!--     Color of the status message for starred contacts in the People app -->
-<!--     <color name="people_contact_tile_status_color">#CCCCCC</color> -->
-
-<!--     Color of the semi-transparent shadow box on contact tiles -->
-<!--     <color name="contact_tile_shadow_box_color">#7F000000</color> -->
-
-<!--     Color of the vertical stripe that goes on the left of a block quote inside a stream item -->
-<!--     <color name="stream_item_stripe_color">#CCCCCC</color> -->
-
-<!--     Color of image view placeholder. -->
-<!--     <color name="image_placeholder">#DDDDDD</color> -->
-
-</resources>
\ No newline at end of file
diff --git a/org_apg/res/values/strings.xml b/org_apg/res/values/strings.xml
index c071d041c..23574f808 100644
--- a/org_apg/res/values/strings.xml
+++ b/org_apg/res/values/strings.xml
@@ -331,8 +331,8 @@
     <!-- Dashboard -->
     <string name="dashboard_manage_keys">Manage Keys</string>
     <string name="dashboard_my_keys">My Keys</string>
-    <string name="dashboard_encrypt_decrypt_file">Encrypt File</string>
-    <string name="dashboard_encrypt_decrypt_text">Encrypt Text</string>
+    <string name="dashboard_encrypt_decrypt_file">Encrypt/Decrypt File</string>
+    <string name="dashboard_encrypt_decrypt_text">Encrypt/Decrypt Text</string>
     <string name="dashboard_help">Help</string>
 
 </resources>
\ No newline at end of file
diff --git a/org_apg/res/values/styles.xml b/org_apg/res/values/styles.xml
index b1c282cd2..7e4572c31 100644
--- a/org_apg/res/values/styles.xml
+++ b/org_apg/res/values/styles.xml
@@ -35,7 +35,6 @@
         <item name="android:drawablePadding">2dp</item>
         <item name="android:textSize">14sp</item>
         <item name="android:textStyle">bold</item>
-        <item name="android:textColor">@color/text_primary</item>
         <item name="android:background">@android:color/transparent</item>
     </style>