Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Unverified Commit 9b9cf335 authored by qqq3's avatar qqq3
Browse files

Update minSdk. Android 3.0 (HONEYCOMB) no longer suppoted

parent 3b30bc79

app/build.gradle

+1 −1
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ android { 
    buildToolsVersion '23.0.3'

    defaultConfig {

        applicationId "org.asdtm.goodweather"

        minSdkVersion 11

        minSdkVersion 14

        targetSdkVersion 24

        versionCode 5

        versionName "2.0"

app/src/main/java/org/asdtm/goodweather/SearchActivity.java

+2 −3
Original line number Diff line number Diff line
@@ -175,9 +175,8 @@ public class SearchActivity extends AppCompatActivity implements SearchView.OnQu 


        searchView.setSearchableInfo(searchManager.getSearchableInfo(getComponentName()));

        searchView.setIconified(false);

        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.ICE_CREAM_SANDWICH) {

        searchView.onActionViewExpanded();

        }



        int searchPlateId = searchView.getContext().getResources().getIdentifier(

                "android:id/search_plate", null, null);

        View searchPlateView = searchView.findViewById(searchPlateId);

app/src/main/java/org/asdtm/goodweather/SettingsActivity.java

+0 −3
Original line number Diff line number Diff line 
package org.asdtm.goodweather;



import android.annotation.TargetApi;

import android.content.SharedPreferences;

import android.os.Build;

import android.os.Bundle;

import android.preference.ListPreference;

import android.preference.Preference;
@@ -42,7 +40,6 @@ public class SettingsActivity extends AppCompatPreferenceActivity { 
                || GeneralPreferenceFragment.class.getName().equals(fragmentName);

    }



    @TargetApi(Build.VERSION_CODES.HONEYCOMB)

    public static class GeneralPreferenceFragment extends PreferenceFragment implements

            SharedPreferences.OnSharedPreferenceChangeListener {

app/src/main/res/xml-v14/pref_general.xml

deleted100644 → 0
+0 −31
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">

    <ListPreference

        android:defaultValue="metric"

        android:dialogTitle="@string/pref_title_temperature"

        android:entries="@array/pref_temperature_entries"

        android:entryValues="@array/pref_temperature_values"

        android:key="temperature_pref_key"

        android:title="@string/pref_title_temperature"/>

    <PreferenceCategory

        android:key="notification_category_pref_key"

        android:title="@string/pref_title_category_notification">

        <SwitchPreference

            android:defaultValue="false"

            android:key="notification_pref_key"

            android:title="@string/pref_title_notification"/>

        <ListPreference

            android:defaultValue="60"

            android:dependency="notification_pref_key"

            android:dialogTitle="@string/pref_title_notification_refresh_interval"

            android:entries="@array/notification_refresh_intervals_entries"

            android:entryValues="@array/notification_refresh_interval_values"

            android:key="notification_interval_pref_key"

            android:title="@string/pref_title_notification_refresh_interval"/>

        <SwitchPreference

            android:defaultValue="false"

            android:dependency="notification_pref_key"

            android:key="notification_vibrate_pref_key"

            android:title="@string/pref_title_vibrate"/>

    </PreferenceCategory>

</PreferenceScreen>
 
 No newline at end of file

app/src/main/res/xml/pref_general.xml

+2 −2
Original line number Diff line number Diff line
@@ -10,7 +10,7 @@ 
    <PreferenceCategory

        android:key="notification_category_pref_key"

        android:title="@string/pref_title_category_notification">

        <CheckBoxPreference

        <SwitchPreference

            android:defaultValue="false"

            android:key="notification_pref_key"

            android:title="@string/pref_title_notification"/>
@@ -22,7 +22,7 @@ 
            android:entryValues="@array/notification_refresh_interval_values"

            android:key="notification_interval_pref_key"

            android:title="@string/pref_title_notification_refresh_interval"/>

        <CheckBoxPreference

        <SwitchPreference

            android:defaultValue="false"

            android:dependency="notification_pref_key"

            android:key="notification_vibrate_pref_key"