diff --git a/metadata/fr.simon.marquis.preferencesmanager.txt b/metadata/fr.simon.marquis.preferencesmanager.txt index 276ee96edb..1a48e0719e 100644 --- a/metadata/fr.simon.marquis.preferencesmanager.txt +++ b/metadata/fr.simon.marquis.preferencesmanager.txt @@ -16,8 +16,18 @@ Requires Root:Yes Repo Type:git Repo:https://github.com/SimonMarquis/Android-PreferencesManager.git +Build:1.4,15 + commit=b3d8533ace17 + subdir=PreferencesManager + target=android-18 + rm=PreferencesManager/assets;Resources;PreferencesManager/libs/rootfw.jar + srclibs=1:Support-v7@android-4.3_r2.1;2:RootFW@2_0.3.2;3:StickyListHeaders-tots@62be7e8a7e547 + patch=fonts_15.patch + prebuild=mv libs/android-support-v4.jar $$Support-v7$$/libs/ + Build:1.5,16 commit=d4b752b + disable=crashes: android.view.InflateException: Binary XML file line #49: Error inflating class fr.simon.marquis.preferencesmanager.roboto.RobotoTextView subdir=PreferencesManager rm=PreferencesManager/assets;Resources;PreferencesManager/libs/rootfw.jar srclibs=1:Support-v7@android-4.3_r2.1;2:RootFW@2_0.3.2;3:StickyListHeaders-tots@62be7e8a7e547 diff --git a/metadata/fr.simon.marquis.preferencesmanager/fonts_15.patch b/metadata/fr.simon.marquis.preferencesmanager/fonts_15.patch new file mode 100644 index 0000000000..c279bb6f7b --- /dev/null +++ b/metadata/fr.simon.marquis.preferencesmanager/fonts_15.patch @@ -0,0 +1,742 @@ +diff --git a/PreferencesManager/project.properties b/PreferencesManager/project.properties +index 568922b..c0cbb95 100644 +--- a/PreferencesManager/project.properties ++++ b/PreferencesManager/project.properties +@@ -11,7 +11,6 @@ + #proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt + + # Project target. +-target=android-18 +-android.library.reference.1=..\\..\\..\\..\\..\\adt-bundle-windows\\sdk\\extras\\android\\support\\v7\\appcompat +-android.library.reference.3=../../StickyListHeaders-master/library +-android.library.reference.2=../../Roboto ++target=android-18 ++android.library.reference.1=../../srclib/Support-v7/v7/appcompat ++android.library.reference.2=../../srclib/StickyListHeaders-tots/library +diff --git a/PreferencesManager/res/layout-v14/dialog_pref_boolean_add.xml b/PreferencesManager/res/layout-v14/dialog_pref_boolean_add.xml +index 94caed1..aa61951 100644 +--- a/PreferencesManager/res/layout-v14/dialog_pref_boolean_add.xml ++++ b/PreferencesManager/res/layout-v14/dialog_pref_boolean_add.xml +@@ -16,11 +16,11 @@ + + +- + +- + +diff --git a/PreferencesManager/res/layout-v14/dialog_pref_boolean_edit.xml b/PreferencesManager/res/layout-v14/dialog_pref_boolean_edit.xml +index 72c8a71..8dc1965 100644 +--- a/PreferencesManager/res/layout-v14/dialog_pref_boolean_edit.xml ++++ b/PreferencesManager/res/layout-v14/dialog_pref_boolean_edit.xml +@@ -16,11 +16,11 @@ + + +- + +- + +diff --git a/PreferencesManager/res/layout/activity_app_list.xml b/PreferencesManager/res/layout/activity_app_list.xml +index 8be67bc..927c233 100644 +--- a/PreferencesManager/res/layout/activity_app_list.xml ++++ b/PreferencesManager/res/layout/activity_app_list.xml +@@ -46,14 +46,14 @@ + android:layout_height="wrap_content" + android:layout_marginBottom="10dp" /> + +- ++ /> + + + + +- ++ /> + + +- +\ No newline at end of file ++ +diff --git a/PreferencesManager/res/layout/activity_file_editor.xml b/PreferencesManager/res/layout/activity_file_editor.xml +index 80fd815..a6b4d13 100644 +--- a/PreferencesManager/res/layout/activity_file_editor.xml ++++ b/PreferencesManager/res/layout/activity_file_editor.xml +@@ -19,7 +19,7 @@ + android:layout_width="match_parent" + android:layout_height="match_parent" > + +- ++ /> + +- +\ No newline at end of file ++ +diff --git a/PreferencesManager/res/layout/activity_preferences.xml b/PreferencesManager/res/layout/activity_preferences.xml +index 6d47634..e433ac3 100644 +--- a/PreferencesManager/res/layout/activity_preferences.xml ++++ b/PreferencesManager/res/layout/activity_preferences.xml +@@ -56,14 +56,14 @@ + android:layout_marginBottom="10dp" + android:src="@drawable/empty_view" /> + +- ++ /> + + + + +- ++ /> + + +- +\ No newline at end of file ++ +diff --git a/PreferencesManager/res/layout/dialog_about.xml b/PreferencesManager/res/layout/dialog_about.xml +index 7caf943..b0adb1b 100644 +--- a/PreferencesManager/res/layout/dialog_about.xml ++++ b/PreferencesManager/res/layout/dialog_about.xml +@@ -21,7 +21,7 @@ + android:orientation="vertical" + android:showDividers="middle" > + +- ++ /> + + + +- ++ /> + + +- +\ No newline at end of file ++ +diff --git a/PreferencesManager/res/layout/dialog_pref_boolean_add.xml b/PreferencesManager/res/layout/dialog_pref_boolean_add.xml +index 02497be..a6e127b 100644 +--- a/PreferencesManager/res/layout/dialog_pref_boolean_add.xml ++++ b/PreferencesManager/res/layout/dialog_pref_boolean_add.xml +@@ -16,11 +16,11 @@ + + +- + +- + +diff --git a/PreferencesManager/res/layout/dialog_pref_boolean_edit.xml b/PreferencesManager/res/layout/dialog_pref_boolean_edit.xml +index 3d863c9..11eeece 100644 +--- a/PreferencesManager/res/layout/dialog_pref_boolean_edit.xml ++++ b/PreferencesManager/res/layout/dialog_pref_boolean_edit.xml +@@ -16,11 +16,11 @@ + + +- + +- + +diff --git a/PreferencesManager/res/layout/dialog_pref_btn_bar_add.xml b/PreferencesManager/res/layout/dialog_pref_btn_bar_add.xml +index 9a7a066..eb624b2 100644 +--- a/PreferencesManager/res/layout/dialog_pref_btn_bar_add.xml ++++ b/PreferencesManager/res/layout/dialog_pref_btn_bar_add.xml +@@ -22,12 +22,12 @@ + android:layout_height="wrap_content" + android:orientation="horizontal" > + +- + +- +diff --git a/PreferencesManager/res/layout/dialog_pref_btn_bar_edit.xml b/PreferencesManager/res/layout/dialog_pref_btn_bar_edit.xml +index 935b6fb..47a9bf7 100644 +--- a/PreferencesManager/res/layout/dialog_pref_btn_bar_edit.xml ++++ b/PreferencesManager/res/layout/dialog_pref_btn_bar_edit.xml +@@ -22,17 +22,17 @@ + android:layout_height="wrap_content" + android:orientation="horizontal" > + +- + +- + +- +diff --git a/PreferencesManager/res/layout/dialog_pref_float_add.xml b/PreferencesManager/res/layout/dialog_pref_float_add.xml +index 617f512..4cd2a3f 100644 +--- a/PreferencesManager/res/layout/dialog_pref_float_add.xml ++++ b/PreferencesManager/res/layout/dialog_pref_float_add.xml +@@ -16,15 +16,15 @@ + + +- + +- + +- +diff --git a/PreferencesManager/res/layout/dialog_pref_float_edit.xml b/PreferencesManager/res/layout/dialog_pref_float_edit.xml +index f68eb16..cd5d651 100644 +--- a/PreferencesManager/res/layout/dialog_pref_float_edit.xml ++++ b/PreferencesManager/res/layout/dialog_pref_float_edit.xml +@@ -16,15 +16,15 @@ + + +- + +- + +- +diff --git a/PreferencesManager/res/layout/dialog_pref_integer_add.xml b/PreferencesManager/res/layout/dialog_pref_integer_add.xml +index 290e342..84755b5 100644 +--- a/PreferencesManager/res/layout/dialog_pref_integer_add.xml ++++ b/PreferencesManager/res/layout/dialog_pref_integer_add.xml +@@ -16,15 +16,15 @@ + + +- + +- + +- +diff --git a/PreferencesManager/res/layout/dialog_pref_integer_edit.xml b/PreferencesManager/res/layout/dialog_pref_integer_edit.xml +index fad0607..af228d5 100644 +--- a/PreferencesManager/res/layout/dialog_pref_integer_edit.xml ++++ b/PreferencesManager/res/layout/dialog_pref_integer_edit.xml +@@ -16,15 +16,15 @@ + + +- + +- + +- +diff --git a/PreferencesManager/res/layout/dialog_pref_string_add.xml b/PreferencesManager/res/layout/dialog_pref_string_add.xml +index 69e1a9f..ed60ad3 100644 +--- a/PreferencesManager/res/layout/dialog_pref_string_add.xml ++++ b/PreferencesManager/res/layout/dialog_pref_string_add.xml +@@ -16,15 +16,15 @@ + + +- + +- + +- + +- + +- + +- + +- + +- + +@@ -39,7 +39,7 @@ + + + +- ++ /> + + + +- +\ No newline at end of file ++ +diff --git a/PreferencesManager/res/layout/dialog_pref_stringset_edit.xml b/PreferencesManager/res/layout/dialog_pref_stringset_edit.xml +index e6a350f..7de1f17 100644 +--- a/PreferencesManager/res/layout/dialog_pref_stringset_edit.xml ++++ b/PreferencesManager/res/layout/dialog_pref_stringset_edit.xml +@@ -17,11 +17,11 @@ + xmlns:app="http://schemas.android.com/apk/res-auto" + style="@style/PreferenceDialogContainer" > + +- + +- + +@@ -39,7 +39,7 @@ + + + +- ++ /> + + + +- +\ No newline at end of file ++ +diff --git a/PreferencesManager/res/layout/fragment_preferences.xml b/PreferencesManager/res/layout/fragment_preferences.xml +index dcad159..55ba48b 100644 +--- a/PreferencesManager/res/layout/fragment_preferences.xml ++++ b/PreferencesManager/res/layout/fragment_preferences.xml +@@ -52,7 +52,7 @@ + android:layout_marginBottom="10dp" + android:src="@drawable/empty_view" /> + +- ++ /> + + + + +- +\ No newline at end of file ++ +diff --git a/PreferencesManager/res/layout/row_application.xml b/PreferencesManager/res/layout/row_application.xml +index f22cc6d..a7ac2d3 100644 +--- a/PreferencesManager/res/layout/row_application.xml ++++ b/PreferencesManager/res/layout/row_application.xml +@@ -25,7 +25,7 @@ + android:layout_height="48dip" + android:padding="4dp" /> + +- ++ /> + +- +\ No newline at end of file ++ +diff --git a/PreferencesManager/res/layout/row_header.xml b/PreferencesManager/res/layout/row_header.xml +index 64a0c64..27769e0 100644 +--- a/PreferencesManager/res/layout/row_header.xml ++++ b/PreferencesManager/res/layout/row_header.xml +@@ -13,7 +13,7 @@ + See the License for the specific language governing permissions and + limitations under the License. + --> +- +\ No newline at end of file ++ /> +diff --git a/PreferencesManager/res/layout/row_preference.xml b/PreferencesManager/res/layout/row_preference.xml +index 60d0694..c5e34b5 100644 +--- a/PreferencesManager/res/layout/row_preference.xml ++++ b/PreferencesManager/res/layout/row_preference.xml +@@ -27,7 +27,7 @@ + android:background="@drawable/abc_list_selector_holo_light" + android:orientation="vertical" > + +- ++ /> + +- ++ /> + + +- +\ No newline at end of file ++ +diff --git a/PreferencesManager/res/layout/row_stringset.xml b/PreferencesManager/res/layout/row_stringset.xml +index e89a4c6..45d07de 100644 +--- a/PreferencesManager/res/layout/row_stringset.xml ++++ b/PreferencesManager/res/layout/row_stringset.xml +@@ -19,7 +19,7 @@ + android:layout_height="wrap_content" + android:orientation="horizontal" > + +- ++ /> + + + +- +\ No newline at end of file ++ +diff --git a/PreferencesManager/res/values/styles.xml b/PreferencesManager/res/values/styles.xml +index 213092c..3a88864 100644 +--- a/PreferencesManager/res/values/styles.xml ++++ b/PreferencesManager/res/values/styles.xml +@@ -45,7 +45,6 @@ + wrap_content + 10dp + ?android:attr/textAppearanceLarge +- robotoslab_light + + + + + + + + +- +\ No newline at end of file ++ +diff --git a/PreferencesManager/src/fr/simon/marquis/preferencesmanager/ui/AppListActivity.java b/PreferencesManager/src/fr/simon/marquis/preferencesmanager/ui/AppListActivity.java +index 8b9b255..2bc4960 100644 +--- a/PreferencesManager/src/fr/simon/marquis/preferencesmanager/ui/AppListActivity.java ++++ b/PreferencesManager/src/fr/simon/marquis/preferencesmanager/ui/AppListActivity.java +@@ -79,7 +79,6 @@ public class AppListActivity extends ActionBarActivity implements OnQueryTextLis + } + } + }); +- getActionBar().setTitle(Utils.applyCustomTypeFace(getString(R.string.app_name), this)); + if (savedInstanceState == null || Utils.getPreviousApps() == null) { + startTask(); + } else { +diff --git a/PreferencesManager/src/fr/simon/marquis/preferencesmanager/ui/FileEditorActivity.java b/PreferencesManager/src/fr/simon/marquis/preferencesmanager/ui/FileEditorActivity.java +index ccc8cf8..714b3cb 100644 +--- a/PreferencesManager/src/fr/simon/marquis/preferencesmanager/ui/FileEditorActivity.java ++++ b/PreferencesManager/src/fr/simon/marquis/preferencesmanager/ui/FileEditorActivity.java +@@ -269,7 +269,6 @@ public class FileEditorActivity extends ActionBarActivity implements TextWatcher + + private void updateTitle() { + Spanned str = Html.fromHtml((mHasContentChanged ? " " : "") + mName); +- getActionBar().setTitle(Utils.applyCustomTypeFace(str, this)); + } + + private void clearSpans(Spannable source) { +diff --git a/PreferencesManager/src/fr/simon/marquis/preferencesmanager/ui/PreferencesActivity.java b/PreferencesManager/src/fr/simon/marquis/preferencesmanager/ui/PreferencesActivity.java +index 09f75ea..b422f8a 100644 +--- a/PreferencesManager/src/fr/simon/marquis/preferencesmanager/ui/PreferencesActivity.java ++++ b/PreferencesManager/src/fr/simon/marquis/preferencesmanager/ui/PreferencesActivity.java +@@ -78,8 +78,6 @@ public class PreferencesActivity extends ActionBarActivity implements OnFragment + + packageName = b.getString("PACKAGE_NAME"); + +- getActionBar().setTitle(Utils.applyCustomTypeFace(b.getString("TITLE"), this)); +- getActionBar().setSubtitle(Utils.applyCustomTypeFace(packageName, this)); + Drawable drawable = Utils.findDrawable(packageName, this); + if (drawable != null) { + getSupportActionBar().setIcon(drawable); +@@ -151,11 +149,7 @@ public class PreferencesActivity extends ActionBarActivity implements OnFragment + public int getCount() { + return files.size(); + } +- +- @Override +- public CharSequence getPageTitle(int position) { +- return Utils.applyCustomTypeFace(files.get(position).getName(), PreferencesActivity.this); +- } ++ + } + + @Override +diff --git a/PreferencesManager/src/fr/simon/marquis/preferencesmanager/util/Utils.java b/PreferencesManager/src/fr/simon/marquis/preferencesmanager/util/Utils.java +index f37c917..a66e91a 100644 +--- a/PreferencesManager/src/fr/simon/marquis/preferencesmanager/util/Utils.java ++++ b/PreferencesManager/src/fr/simon/marquis/preferencesmanager/util/Utils.java +@@ -47,7 +47,6 @@ import android.util.Log; + import android.view.View; + import android.view.inputmethod.InputMethodManager; + +-import com.roboto.RobotoTypefaceManager; + import com.spazedog.lib.rootfw.container.FileStat; + + import fr.simon.marquis.preferencesmanager.model.AppEntry; +@@ -218,13 +217,6 @@ public class Utils { + imm.hideSoftInputFromWindow(view.getWindowToken(), 0); + } + +- public static SpannableString applyCustomTypeFace(CharSequence src, Context ctx) { +- SpannableString span = new SpannableString(src); +- +- span.setSpan(new CustomTypefaceSpan("", RobotoTypefaceManager.obtaintTypeface(ctx, RobotoTypefaceManager.ROBOTOSLAB_REGULAR)), 0, +- span.length(), Spannable.SPAN_EXCLUSIVE_EXCLUSIVE); +- return span; +- } + + public static Drawable findDrawable(String packageName, Context ctx) { + if (TextUtils.isEmpty(packageName)) {