diff --git a/AndroidManifest.xml b/AndroidManifest.xml index e5efabc..b2e31d7 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -7,8 +7,8 @@ + android:minSdkVersion="14" + android:targetSdkVersion="21" /> @@ -33,7 +33,7 @@ android:allowBackup="true" android:icon="@drawable/ic_launcher" android:label="@string/app_name" - android:theme="@style/AppTheme" > + android:theme="@style/OcSmsTheme" > @@ -119,6 +119,10 @@ + + diff --git a/project.properties b/project.properties index c4a90bb..c452621 100644 --- a/project.properties +++ b/project.properties @@ -11,6 +11,5 @@ #proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt # Project target. -target=android-17 -android.library.reference.1=../appcompat_v7 -android.library.reference.2=../Owncloud-Android-Library +target=android-21 +android.library.reference.1=../Owncloud-Android-Library diff --git a/res/menu/main.xml b/res/menu/main.xml deleted file mode 100644 index 570ca32..0000000 --- a/res/menu/main.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - diff --git a/res/values-v11/styles.xml b/res/values-v11/styles.xml deleted file mode 100644 index a4a95bc..0000000 --- a/res/values-v11/styles.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - diff --git a/res/values-v14/styles.xml b/res/values-v14/styles.xml index 664f4f1..637bd54 100644 --- a/res/values-v14/styles.xml +++ b/res/values-v14/styles.xml @@ -5,8 +5,13 @@ AppBaseTheme from BOTH res/values/styles.xml and res/values-v11/styles.xml on API 14+ devices. --> - + + diff --git a/res/values/strings.xml b/res/values/strings.xml index ace3169..3948c72 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -115,7 +115,7 @@ https:// http:// - + Rate us ! Thanks to @@ -154,5 +154,6 @@ Section 2 Section 3 Hello world! + MainActivity2 diff --git a/res/values/styles.xml b/res/values/styles.xml index 845fb57..07c6643 100644 --- a/res/values/styles.xml +++ b/res/values/styles.xml @@ -3,8 +3,8 @@ - - + diff --git a/res/xml/pref_data_sync.xml b/res/xml/pref_data_sync.xml index 44080de..1ec4d80 100644 --- a/res/xml/pref_data_sync.xml +++ b/res/xml/pref_data_sync.xml @@ -9,13 +9,5 @@ android:negativeButtonText="@null" android:positiveButtonText="@null" android:title="@string/pref_title_sync_frequency" /> - diff --git a/src/fr/unix_experience/owncloud_sms/activities/MainActivity.java b/src/fr/unix_experience/owncloud_sms/activities/MainActivity.java index 55973f1..fdb86bf 100644 --- a/src/fr/unix_experience/owncloud_sms/activities/MainActivity.java +++ b/src/fr/unix_experience/owncloud_sms/activities/MainActivity.java @@ -29,25 +29,21 @@ import java.util.List; import java.util.Vector; import fr.unix_experience.owncloud_sms.R; -import fr.unix_experience.owncloud_sms.R.id; -import fr.unix_experience.owncloud_sms.R.layout; -import fr.unix_experience.owncloud_sms.R.menu; -import android.support.v7.app.ActionBarActivity; -import android.support.v4.app.Fragment; -import android.support.v4.app.FragmentManager; -import android.support.v4.app.FragmentPagerAdapter; +import android.app.Activity; +import android.app.Fragment; +import android.app.FragmentManager; import android.content.Intent; import android.net.Uri; import android.os.Bundle; import android.provider.Settings; +import android.support.v13.app.FragmentPagerAdapter; +import android.support.v4.view.PagerAdapter; import android.support.v4.view.ViewPager; import android.view.LayoutInflater; -import android.view.Menu; -import android.view.MenuItem; import android.view.View; import android.view.ViewGroup; -public class MainActivity extends ActionBarActivity { +public class MainActivity extends Activity { /** * The {@link android.support.v4.view.PagerAdapter} that will provide @@ -56,7 +52,7 @@ public class MainActivity extends ActionBarActivity { * becomes too memory intensive, it may be best to switch to a * {@link android.support.v4.app.FragmentStatePagerAdapter}. */ - MainPagerAdapter mPagerAdapter; + PagerAdapter mPagerAdapter; /** * The {@link ViewPager} that will host the section contents. @@ -81,32 +77,13 @@ public class MainActivity extends ActionBarActivity { fragments.add(Fragment.instantiate(this,SecondTestFragment.class.getName())); fragments.add(Fragment.instantiate(this,ThanksAndRateFragment.class.getName())); - mPagerAdapter = new MainPagerAdapter(getSupportFragmentManager(), fragments); + mPagerAdapter = new MainPagerAdapter(getFragmentManager(), fragments); // Set up the ViewPager with the sections adapter. mViewPager = (ViewPager) findViewById(R.id.pager); mViewPager.setAdapter(mPagerAdapter); } - @Override - public boolean onCreateOptionsMenu(Menu menu) { - // Inflate the menu; this adds items to the action bar if it is present. - getMenuInflater().inflate(R.menu.main, menu); - return true; - } - - @Override - public boolean onOptionsItemSelected(MenuItem item) { - // Handle action bar item clicks here. The action bar will - // automatically handle clicks on the Home/Up button, so long - // as you specify a parent activity in AndroidManifest.xml. - int id = item.getItemId(); - if (id == R.id.action_settings) { - return true; - } - return super.onOptionsItemSelected(item); - } - /** * A {@link FragmentPagerAdapter} that returns a fragment corresponding to * one of the sections/tabs/pages. @@ -115,12 +92,11 @@ public class MainActivity extends ActionBarActivity { private final List mFragments; - public MainPagerAdapter(FragmentManager fm, List fragments) { - super(fm); + public MainPagerAdapter(FragmentManager fragmentManager, List fragments) { + super(fragmentManager); mFragments = fragments; } - @Override public Fragment getItem(int position) { // getItem is called to instantiate the fragment for the given page. // Return a PlaceholderFragment (defined as a static inner class