1.3.1 release

iFixit · Oct 12, 2012 · 448e376 · 448e376
1 parent 81924a2
commit 448e376
Show file tree

Hide file tree

Showing 29 changed files with 336 additions and 118 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -1,3 +1,3 @@
 [submodule "contrib/ActionBarSherlock"]
 	path = contrib/ActionBarSherlock
-	url = git://github.com/ChristopheVersieux/ActionBarSherlock.git
+	url = git://github.com/JakeWharton/ActionBarSherlock.git
diff --git a/builder/base.xml b/builder/base.xml
@@ -51,7 +51,6 @@
     <item name="spinnerItemStyle">@style/Holo.TextView.SpinnerItem</item>
     <item name="spinnerDropDownItemStyle">@style/Holo.TextView.SpinnerItem.DropDown</item>
     <item name="android:popupWindowStyle">@style/Holo.PopupWindow</item>
-    <item name="android:popupBackground">@drawable/dialog_full_holo_dark</item>
     <item name="listPopupWindowStyle">@style/Holo.ListPopupWindow</item>
     <item name="dropDownListViewStyle">@style/Holo.ListView.DropDown</item>
     <item name="autoCompleteTextViewStyle">@style/Holo.AutoCompleteTextView</item>
@@ -76,7 +75,6 @@
     <item name="spinnerItemStyle">@style/Holo.TextView.SpinnerItem.Light</item>
     <item name="spinnerDropDownItemStyle">@style/Holo.TextView.SpinnerItem.DropDown.Light</item>
     <item name="android:popupWindowStyle">@style/Holo.PopupWindow.Light</item>
-    <item name="android:popupBackground">@drawable/dialog_full_holo_light</item>
     <item name="listPopupWindowStyle">@style/Holo.ListPopupWindow.Light</item>
     <item name="dropDownListViewStyle">@style/Holo.ListView.DropDown.Light</item>
     <item name="autoCompleteTextViewStyle">@style/Holo.AutoCompleteTextView.Light</item>

diff --git a/builder/styles.xml b/builder/styles.xml
@@ -464,12 +464,9 @@
     <item name="internalLayout">@layout/time_picker_holo</item>
   </style>
   <style name="Holo.PopupWindow">
-    <item name="android:popupBackground">@drawable/dialog_full_holo_dark</item>
     <item name="android:popupAnimationStyle">@style/Holo.Animation.PopupWindow</item>
   </style>
-  <style name="Holo.PopupWindow.Light">
-    <item name="android:popupBackground">@drawable/dialog_full_holo_light</item>
-  </style>
+  <style name="Holo.PopupWindow.Light" />
   <style name="Holo.ListPopupWindow">
     <item name="android:dropDownSelector">@drawable/list_selector_holo_dark</item>
     <item name="android:popupBackground">@drawable/menu_dropdown_panel_holo_dark</item>

diff --git a/demo/AndroidManifest.xml b/demo/AndroidManifest.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
 	package="com.WazaBe.HoloDemo"
-	android:versionCode="20"
-	android:versionName="1.3" >
+	android:versionCode="21"
+	android:versionName="1.3.1" >
 	<uses-sdk
 		android:minSdkVersion="4"
 		android:targetSdkVersion="16" />
@@ -20,4 +20,4 @@
 			</intent-filter>
 		</activity>
 	</application>
-</manifest>
+</manifest>
diff --git a/demo/pom.xml b/demo/pom.xml
@@ -9,7 +9,7 @@
 	<parent>
 		<groupId>com.github.christopheversieux</groupId>
 		<artifactId>holoeverywhere-parent</artifactId>
-		<version>1.3-SNAPSHOT</version>
+		<version>1.3.1-SNAPSHOT</version>
 	</parent>
 
 	<dependencies>
@@ -21,7 +21,7 @@
 		<dependency>
 			<groupId>com.github.christopheversieux</groupId>
 			<artifactId>holoeverywhere-library</artifactId>
-			<version>1.3-SNAPSHOT</version>
+			<version>1.3.1-SNAPSHOT</version>
 			<type>apklib</type>
 		</dependency>
 	</dependencies>
@@ -128,4 +128,4 @@
             </build>
         </profile>
     </profiles>
-</project>
+</project>
diff --git a/demo/res/layout/main.xml b/demo/res/layout/main.xml
@@ -264,13 +264,20 @@
 			android:layout_height="wrap_content"
 			android:layout_weight="1"
 			android:onClick="setDarkTheme"
-			android:text="Holo Dark" />
+			android:text="Dark" />
 		<Button
 			style="?buttonBarButtonStyle"
 			android:layout_width="0dp"
 			android:layout_height="wrap_content"
 			android:layout_weight="1"
 			android:onClick="setLightTheme"
-			android:text="Holo Light" />
+			android:text="Light" />
+		<Button
+			style="?buttonBarButtonStyle"
+			android:layout_width="0dp"
+			android:layout_height="wrap_content"
+			android:layout_weight="1"
+			android:onClick="setMixedTheme"
+			android:text="Mixed" />
 	</LinearLayout>
 </LinearLayout>
diff --git a/demo/res/layout/popup_window.xml b/demo/res/layout/popup_window.xml
@@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
 	android:layout_width="match_parent"
-	android:layout_height="match_parent"
-	android:background="?android:popupBackground" >
+	android:layout_height="match_parent" >
 	<ImageButton
 		android:id="@+id/imageButton"
 		android:layout_width="match_parent"

diff --git a/demo/src/com/WazaBe/HoloDemo/Application.java b/demo/src/com/WazaBe/HoloDemo/Application.java
@@ -5,10 +5,11 @@
 import com.WazaBe.HoloEverywhere.ThemeManager;
 
 public class Application extends com.WazaBe.HoloEverywhere.app.Application {
-	public Application() {
+	static {
 		LayoutInflater.putToMap("com.WazaBe.HoloDemo.widget",
 				"WidgetContainer", "OtherButton");
 		Settings.setUseThemeManager(true);
-		ThemeManager.THEME_DEFAULT |= ThemeManager.FULLSCREEN;
+		Settings.setUseParentTheme(true);
+		ThemeManager.modifyDefaultTheme(ThemeManager.FULLSCREEN);
 	}
 }
diff --git a/demo/src/com/WazaBe/HoloDemo/DemoActivity.java b/demo/src/com/WazaBe/HoloDemo/DemoActivity.java
@@ -118,14 +118,20 @@ public void setLightTheme(View v) {
 				| ThemeManager.FULLSCREEN);
 	}
 
+	public void setMixedTheme(View v) {
+		ThemeManager.restartWithTheme(this,
+				ThemeManager.LIGHT_WITH_DARK_ACTION_BAR
+						| ThemeManager.FULLSCREEN);
+	}
+
 	public void showAbout(View v) {
 		replaceFragment(android.R.id.content, new AboutFragment(), "about");
 	}
 
 	public void showAlertDialog(View v) {
 		AlertDialog.Builder builder = new AlertDialog.Builder(this);
 		builder.setTitle("AlertDialog");
-		builder.setIcon(R.drawable.icon);
+		builder.setIcon(R.drawable.alert_dialog);
 		builder.setMessage("Is fully-working port of AlertDialog from Android Jelly Bean\n"
 				+ "Yes, I know it's a long text. At the same time check that part.");
 		builder.setPositiveButton("Positive", null);
@@ -177,6 +183,9 @@ public void showPopupWindow(View v) {
 		View content = LayoutInflater.inflate(this, R.layout.popup_window);
 		final PopupWindow w = new PopupWindow(content,
 				LayoutParams.MATCH_PARENT, LayoutParams.MATCH_PARENT);
+		w.setBackgroundDrawable(getResources().getDrawable(
+				ThemeManager.isLight(this) ? R.drawable.dialog_full_holo_light
+						: R.drawable.dialog_full_holo_dark));
 		content.findViewById(R.id.imageButton).setOnClickListener(
 				new OnClickListener() {
 					@Override

diff --git a/library/AndroidManifest.xml b/library/AndroidManifest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
 	package="com.WazaBe.HoloEverywhere"
-	android:versionCode="20"
-	android:versionName="1.3" >
+	android:versionCode="21"
+	android:versionName="1.3.1" >
 	<uses-sdk
 		android:minSdkVersion="4"
 		android:targetSdkVersion="16" />
-</manifest>
+</manifest>
diff --git a/library/pom.xml b/library/pom.xml
@@ -9,7 +9,7 @@
 	<parent>
 		<groupId>com.github.christopheversieux</groupId>
 		<artifactId>holoeverywhere-parent</artifactId>
-		<version>1.3-SNAPSHOT</version>
+		<version>1.3.1-SNAPSHOT</version>
 	</parent>
 
 	<dependencies>
@@ -114,4 +114,4 @@
             </build>
         </profile>
     </profiles>
-</project>
+</project>
diff --git a/library/res/values-v14/styles.xml b/library/res/values-v14/styles.xml
@@ -49,7 +49,6 @@
         <item name="spinnerItemStyle">@style/Holo.TextView.SpinnerItem</item>
         <item name="spinnerDropDownItemStyle">@style/Holo.TextView.SpinnerItem.DropDown</item>
         <item name="android:popupWindowStyle">@style/Holo.PopupWindow</item>
-        <item name="android:popupBackground">@drawable/dialog_full_holo_dark</item>
         <item name="listPopupWindowStyle">@style/Holo.ListPopupWindow</item>
         <item name="dropDownListViewStyle">@style/Holo.ListView.DropDown</item>
         <item name="autoCompleteTextViewStyle">@style/Holo.AutoCompleteTextView</item>
@@ -106,7 +105,6 @@
         <item name="spinnerItemStyle">@style/Holo.TextView.SpinnerItem.Light</item>
         <item name="spinnerDropDownItemStyle">@style/Holo.TextView.SpinnerItem.DropDown.Light</item>
         <item name="android:popupWindowStyle">@style/Holo.PopupWindow.Light</item>
-        <item name="android:popupBackground">@drawable/dialog_full_holo_light</item>
         <item name="listPopupWindowStyle">@style/Holo.ListPopupWindow.Light</item>
         <item name="dropDownListViewStyle">@style/Holo.ListView.DropDown.Light</item>
         <item name="autoCompleteTextViewStyle">@style/Holo.AutoCompleteTextView.Light</item>
@@ -161,7 +159,6 @@
         <item name="spinnerItemStyle">@style/Holo.TextView.SpinnerItem.Light</item>
         <item name="spinnerDropDownItemStyle">@style/Holo.TextView.SpinnerItem.DropDown.Light</item>
         <item name="android:popupWindowStyle">@style/Holo.PopupWindow.Light</item>
-        <item name="android:popupBackground">@drawable/dialog_full_holo_light</item>
         <item name="listPopupWindowStyle">@style/Holo.ListPopupWindow.Light</item>
         <item name="dropDownListViewStyle">@style/Holo.ListView.DropDown.Light</item>
         <item name="autoCompleteTextViewStyle">@style/Holo.AutoCompleteTextView.Light</item>

diff --git a/library/res/values/styles.xml b/library/res/values/styles.xml
@@ -463,12 +463,9 @@
         <item name="internalLayout">@layout/time_picker_holo</item>
     </style>
     <style name="Holo.PopupWindow">
-        <item name="android:popupBackground">@drawable/dialog_full_holo_dark</item>
         <item name="android:popupAnimationStyle">@style/Holo.Animation.PopupWindow</item>
     </style>
-    <style name="Holo.PopupWindow.Light">
-        <item name="android:popupBackground">@drawable/dialog_full_holo_light</item>
-    </style>
+    <style name="Holo.PopupWindow.Light"/>
     <style name="Holo.ListPopupWindow">
         <item name="android:dropDownSelector">@drawable/list_selector_holo_dark</item>
         <item name="android:popupBackground">@drawable/menu_dropdown_panel_holo_dark</item>
@@ -591,7 +588,6 @@
         <item name="spinnerItemStyle">@style/Holo.TextView.SpinnerItem</item>
         <item name="spinnerDropDownItemStyle">@style/Holo.TextView.SpinnerItem.DropDown</item>
         <item name="android:popupWindowStyle">@style/Holo.PopupWindow</item>
-        <item name="android:popupBackground">@drawable/dialog_full_holo_dark</item>
         <item name="listPopupWindowStyle">@style/Holo.ListPopupWindow</item>
         <item name="dropDownListViewStyle">@style/Holo.ListView.DropDown</item>
         <item name="autoCompleteTextViewStyle">@style/Holo.AutoCompleteTextView</item>
@@ -722,7 +718,6 @@
         <item name="spinnerItemStyle">@style/Holo.TextView.SpinnerItem.Light</item>
         <item name="spinnerDropDownItemStyle">@style/Holo.TextView.SpinnerItem.DropDown.Light</item>
         <item name="android:popupWindowStyle">@style/Holo.PopupWindow.Light</item>
-        <item name="android:popupBackground">@drawable/dialog_full_holo_light</item>
         <item name="listPopupWindowStyle">@style/Holo.ListPopupWindow.Light</item>
         <item name="dropDownListViewStyle">@style/Holo.ListView.DropDown.Light</item>
         <item name="autoCompleteTextViewStyle">@style/Holo.AutoCompleteTextView.Light</item>
@@ -853,7 +848,6 @@
         <item name="spinnerItemStyle">@style/Holo.TextView.SpinnerItem.Light</item>
         <item name="spinnerDropDownItemStyle">@style/Holo.TextView.SpinnerItem.DropDown.Light</item>
         <item name="android:popupWindowStyle">@style/Holo.PopupWindow.Light</item>
-        <item name="android:popupBackground">@drawable/dialog_full_holo_light</item>
         <item name="listPopupWindowStyle">@style/Holo.ListPopupWindow.Light</item>
         <item name="dropDownListViewStyle">@style/Holo.ListView.DropDown.Light</item>
         <item name="autoCompleteTextViewStyle">@style/Holo.AutoCompleteTextView.Light</item>
@@ -985,7 +979,6 @@
         <item name="spinnerItemStyle">@style/Holo.TextView.SpinnerItem</item>
         <item name="spinnerDropDownItemStyle">@style/Holo.TextView.SpinnerItem.DropDown</item>
         <item name="android:popupWindowStyle">@style/Holo.PopupWindow</item>
-        <item name="android:popupBackground">@drawable/dialog_full_holo_dark</item>
         <item name="listPopupWindowStyle">@style/Holo.ListPopupWindow</item>
         <item name="dropDownListViewStyle">@style/Holo.ListView.DropDown</item>
         <item name="autoCompleteTextViewStyle">@style/Holo.AutoCompleteTextView</item>
@@ -1116,7 +1109,6 @@
         <item name="spinnerItemStyle">@style/Holo.TextView.SpinnerItem.Light</item>
         <item name="spinnerDropDownItemStyle">@style/Holo.TextView.SpinnerItem.DropDown.Light</item>
         <item name="android:popupWindowStyle">@style/Holo.PopupWindow.Light</item>
-        <item name="android:popupBackground">@drawable/dialog_full_holo_light</item>
         <item name="listPopupWindowStyle">@style/Holo.ListPopupWindow.Light</item>
         <item name="dropDownListViewStyle">@style/Holo.ListView.DropDown.Light</item>
         <item name="autoCompleteTextViewStyle">@style/Holo.AutoCompleteTextView.Light</item>

diff --git a/library/src/com/WazaBe/HoloEverywhere/FontLoader.java b/library/src/com/WazaBe/HoloEverywhere/FontLoader.java
@@ -10,7 +10,6 @@
 import android.content.res.Resources;
 import android.graphics.Typeface;
 import android.os.Build.VERSION;
-import android.os.Environment;
 import android.util.Log;
 import android.util.SparseArray;
 import android.view.View;
@@ -147,8 +146,8 @@ public static View inflate(Context context, int res, ViewGroup parent) {
 	public static Typeface loadTypeface(Context context, int font) {
 		if (fontArray.get(font) == null) {
 			try {
-				File file = new File(Environment.getDataDirectory(), "data/"
-						+ context.getPackageName() + "/fonts");
+				File file = new File(context.getApplicationInfo().dataDir
+						+ "/fonts");
 				if (!file.exists()) {
 					file.mkdirs();
 				}