Custom edits
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index a52fb96..e708513 100755
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -15,7 +15,7 @@
android:allowBackup="true"
android:icon="@drawable/ic_launcher"
android:label="@string/app_name"
- android:theme="@android:style/Theme.Holo.Light.DarkActionBar" >
+ android:theme="@style/AppTheme" >
<activity
android:name="com.paranoid.halo.MainActivity"
android:configChanges="orientation|keyboardHidden"
diff --git a/res/drawable-hdpi/ab_background.png b/res/drawable-hdpi/ab_background.png
deleted file mode 100755
index 886b89b..0000000
--- a/res/drawable-hdpi/ab_background.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-inverted/action_bar_bg.xml b/res/drawable-inverted/action_bar_bg.xml
new file mode 100644
index 0000000..bc91129
--- /dev/null
+++ b/res/drawable-inverted/action_bar_bg.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2010 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.
+-->
+
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+ <gradient
+ android:startColor="#ff000000"
+ android:endColor="#ff000000"
+ android:angle="270" />
+</shape>
diff --git a/res/drawable-xhdpi/ab_background.png b/res/drawable-xhdpi/ab_background.png
deleted file mode 100755
index 886b89b..0000000
--- a/res/drawable-xhdpi/ab_background.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable/action_bar_bg.xml b/res/drawable/action_bar_bg.xml
new file mode 100644
index 0000000..e5c39b5
--- /dev/null
+++ b/res/drawable/action_bar_bg.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2010 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.
+-->
+
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+ <gradient
+ android:startColor="#ff0d0d0d"
+ android:endColor="#ff0d0d0d"
+ android:angle="270" />
+</shape>
diff --git a/res/values/colors.xml b/res/values/colors.xml
new file mode 100644
index 0000000..7f347a6
--- /dev/null
+++ b/res/values/colors.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+ <color name="cr_background">#ff181818</color>
+
+</resources>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index b5fe3ad..e1abac0 100755
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -36,9 +36,10 @@
<string name="note">Note</string>
<string name="empty">Empty note</string>
- <string name="no_pa_rom_title">Your are not running a compatible ROM!</string>
+ <string name="no_rom_title">Your are not running a compatible ROM!</string>
<string name="no_pa_rom_content">HALO))) is explicitly designed to work on ParanoidAndroid ROMs. You will not be able to unleash the full potential of the application!</string>
- <string name="no_pa_rom_ok">Ok</string>
+ <string name="no_cr_rom_content">HALO))) is explicitly designed to work on Carbon ROMs. You will not be able to unleash the full potential of the application!</string>
+ <string name="no_rom_ok">OK</string>
<string name="description_1">Helper 1</string>
<string name="description_2">Helper 2</string>
@@ -51,4 +52,5 @@
<string name="pin_applications_summary">You can keep your applications pinned on HALO, for quicker access</string>
<string name="start_service">Start service</string>
<string name="start_service_summary">You can show or hide your pinned apps by just a tap</string>
-</resources>
\ No newline at end of file
+
+</resources>
diff --git a/res/values/styles.xml b/res/values/styles.xml
index f57aee4..02da573 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
<resources>
<style name="ShowcaseButton">
@@ -38,4 +39,12 @@
<item name="sv_backgroundColor">#C8000000</item>
</style>
-</resources>
\ No newline at end of file
+ <style name="action_bar_style" parent="android:Widget.Holo.ActionBar" >
+ <item name="android:background">@drawable/action_bar_bg</item>
+ </style>
+
+ <style name="text_view_style" parent="android:Widget.Holo.TextView">
+ <item name="android:fontFamily">sans-serif-condensed</item>
+ </style>
+
+</resources>
diff --git a/res/values/themes.xml b/res/values/themes.xml
new file mode 100644
index 0000000..0fe985f
--- /dev/null
+++ b/res/values/themes.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 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.
+-->
+<resources xmlns:android="http://schemas.android.com/apk/res/android">
+
+ <style name="AppTheme" parent="android:Theme.Holo" >
+ <item name="android:actionBarStyle">@style/action_bar_style</item>
+ <item name="android:textViewStyle">@style/text_view_style</item>
+ <item name="android:windowBackground">@color/cr_background</item>
+ </style>
+
+</resources>
diff --git a/src/com/paranoid/halo/MainActivity.java b/src/com/paranoid/halo/MainActivity.java
index 463e670..144dc57 100755
--- a/src/com/paranoid/halo/MainActivity.java
+++ b/src/com/paranoid/halo/MainActivity.java
@@ -104,10 +104,6 @@
mContext = this;
ActionBar bar = getActionBar();
- BitmapDrawable background = new BitmapDrawable(BitmapFactory
- .decodeResource(getResources(), R.drawable.ab_background));
- background.setTileModeX(Shader.TileMode.CLAMP);
- bar.setBackgroundDrawable(background);
bar.setDisplayShowTitleEnabled(false);
mNotificationManager =
@@ -332,20 +328,18 @@
SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(this);
boolean firstRun = prefs.getBoolean(FIRST_RUN, true);
+ /**
if (firstRun) {
if (!Utils.isParanoidRom()) {
AlertDialog.Builder builder = new AlertDialog.Builder(MainActivity.this);
-
builder.setMessage(R.string.no_pa_rom_content)
- .setTitle(R.string.no_pa_rom_title)
- .setPositiveButton(R.string.no_pa_rom_ok, null);
-
+ .setTitle(R.string.no_rom_title)
+ .setPositiveButton(R.string.no_rom_ok, null);
AlertDialog dialog = builder.create();
dialog.show();
}
SharedPreferences.Editor editor = prefs.edit();
editor.putBoolean(FIRST_RUN, false).commit();
- }
+ } **/
}
-
}
diff --git a/src/com/paranoid/halo/NotesActivity.java b/src/com/paranoid/halo/NotesActivity.java
index de65e43..106386c 100644
--- a/src/com/paranoid/halo/NotesActivity.java
+++ b/src/com/paranoid/halo/NotesActivity.java
@@ -18,6 +18,7 @@
*/
package com.paranoid.halo;
+import android.app.ActionBar;
import android.content.SharedPreferences;
import android.content.SharedPreferences.OnSharedPreferenceChangeListener;
import android.os.Bundle;
@@ -37,6 +38,9 @@
@Override
public void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
+ ActionBar bar = getActionBar();
+ bar.setDisplayShowTitleEnabled(false);
+
PreferenceScreen preferenceScreen = getPreferenceManager().createPreferenceScreen(this);
setPreferenceScreen(preferenceScreen);
@@ -66,4 +70,4 @@
String note = prefs.getString(key, null);
preference.setSummary(note == null || note.isEmpty() ? getString(R.string.empty) : note);
}
-}
\ No newline at end of file
+}
diff --git a/src/com/paranoid/halo/utils/Utils.java b/src/com/paranoid/halo/utils/Utils.java
index c5ad09a..5e3875c 100644
--- a/src/com/paranoid/halo/utils/Utils.java
+++ b/src/com/paranoid/halo/utils/Utils.java
@@ -47,6 +47,7 @@
public class Utils {
+ private static final String CARBON_PROPERTY = "ro.carbon";
private static final String PA_PROPERTY = "ro.pa";
private static final String ITEMS = "items";