Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

not too fond of the about page

  • Loading branch information...
commit 4bf64f7a34deb460c2c505f7be3c8bd458176c74 1 parent 20db233
@Xlythe authored
View
1  AndroidManifest.xml
@@ -27,7 +27,6 @@
</intent-filter>
</activity>
<activity android:name=".Preferences" android:label="@string/settings" />
- <activity android:name=".About" android:label="@string/activity_about" />
<receiver android:name=".CalculatorWidget" >
<intent-filter>
<action android:name="android.appwidget.action.APPWIDGET_UPDATE" />
View
12 res/layout/about.xml
@@ -1,12 +0,0 @@
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
- android:layout_width="match_parent"
- android:layout_height="match_parent">
-
- <TextView
- android:id="@+id/about"
- android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:autoLink="web|email"
- android:padding="20dp" />
-
-</LinearLayout>
View
3  res/values/strings.xml
@@ -204,7 +204,4 @@
<string name="cling_dismiss">OK</string>
<string name="easter_egg">Magikarp used Splash but nothing happened.</string>
-
- <string name="activity_about">About</string>
- <string name="about">Maintainer: Will Harmon (Xlythe)\nUniversity: University of Waterloo\nContact Details: xlythe@gmail.com\nVersion Number: %s\nCountry: Canada\nLast Updated: Feb 14, 2013\nSource Code: https://github.com/Xlythe/android_packages_apps_Calculator\nOther Apps: https://play.google.com/store/apps/developer?id=Xlythe</string>
</resources>
View
27 src/com/android2/calculator3/About.java
@@ -1,27 +0,0 @@
-package com.android2.calculator3;
-
-import android.app.Activity;
-import android.content.pm.PackageManager.NameNotFoundException;
-import android.os.Bundle;
-import android.text.method.LinkMovementMethod;
-import android.widget.TextView;
-
-/**
- * @author Will Harmon
- **/
-public class About extends Activity {
- @Override
- protected void onCreate(Bundle savedInstanceState) {
- super.onCreate(savedInstanceState);
- setContentView(R.layout.about);
- try {
- String aboutDesc = String.format(getString(R.string.about), getPackageManager().getPackageInfo(getPackageName(), 0).versionName);
- TextView about = (TextView) findViewById(R.id.about);
- about.setText(aboutDesc);
- about.setMovementMethod(LinkMovementMethod.getInstance());
- }
- catch(NameNotFoundException e) {
- e.printStackTrace();
- }
- }
-}
View
10 src/com/android2/calculator3/view/PreferencesFragment.java
@@ -1,13 +1,10 @@
package com.android2.calculator3.view;
-import android.content.Intent;
import android.content.pm.PackageManager.NameNotFoundException;
import android.os.Bundle;
import android.preference.Preference;
-import android.preference.Preference.OnPreferenceClickListener;
import android.preference.PreferenceFragment;
-import com.android2.calculator3.About;
import com.android2.calculator3.R;
public class PreferencesFragment extends PreferenceFragment {
@@ -24,13 +21,6 @@ public void onCreate(Bundle savedInstanceState) {
catch(NameNotFoundException e) {
e.printStackTrace();
}
- about.setOnPreferenceClickListener(new OnPreferenceClickListener() {
- @Override
- public boolean onPreferenceClick(Preference preference) {
- startActivity(new Intent(getActivity(), About.class));
- return false;
- }
- });
about.setTitle(about.getTitle() + " " + versionName);
}
}
Please sign in to comment.
Something went wrong with that request. Please try again.