Permalink
Browse files

remove pages

  • Loading branch information...
1 parent fe56374 commit c0cc4684b05d36cb88dbe4f1ad1894620c9fb3ea @Xlythe committed Aug 21, 2012
View
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.android2.calculator3"
- android:versionCode="6"
- android:versionName="1.3.1"
+ android:versionCode="7"
+ android:versionName="1.4"
android:installLocation="auto">
<uses-sdk android:minSdkVersion="14" android:targetSdkVersion="16"/>
@@ -19,5 +19,6 @@
<category android:name="android.intent.category.APP_CALCULATOR" />
</intent-filter>
</activity>
+ <activity android:label="@string/settings" android:name=".Preferences" />
</application>
</manifest>
Binary file not shown.
View
Binary file not shown.
View
Binary file not shown.
View
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="utf-8"?>
+<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
+ <PreferenceCategory>
+ <CheckBoxPreference
+ android:title="@string/graph"
+ android:key="GRAPH"
+ android:defaultValue="true" />
+ <CheckBoxPreference
+ android:title="@string/function"
+ android:key="FUNCTION"
+ android:defaultValue="true" />
+ <CheckBoxPreference
+ android:title="@string/hexPanel"
+ android:key="HEX"
+ android:defaultValue="true" />
+ <CheckBoxPreference
+ android:title="@string/basic"
+ android:key="BASIC"
+ android:defaultValue="true" />
+ <CheckBoxPreference
+ android:title="@string/advanced"
+ android:key="ADVANCED"
+ android:defaultValue="true" />
+ <CheckBoxPreference
+ android:title="@string/matrix"
+ android:key="MATRIX"
+ android:defaultValue="true" />
+ </PreferenceCategory>
+</PreferenceScreen>
View
@@ -29,29 +29,33 @@
android:icon="@drawable/matrix"
android:title="@string/matrix"/>
- <item android:id="@+id/graph"
+ <item android:id="@+id/advanced"
android:showAsAction="ifRoom|withText"
- android:icon="@drawable/graph"
- android:title="@string/graph"/>
+ android:icon="@drawable/advanced"
+ android:title="@string/advanced"/>
+
+ <item android:id="@+id/basic"
+ android:showAsAction="ifRoom|withText"
+ android:icon="@drawable/simple"
+ android:title="@string/basic"/>
<item android:id="@+id/hex"
android:showAsAction="ifRoom|withText"
- android:icon="@drawable/function"
+ android:icon="@drawable/simple"
android:title="@string/hexPanel"/>
<item android:id="@+id/function"
android:showAsAction="ifRoom|withText"
android:icon="@drawable/function"
android:title="@string/function"/>
-
- <item android:id="@+id/advanced"
+
+ <item android:id="@+id/graph"
android:showAsAction="ifRoom|withText"
- android:icon="@drawable/advanced"
- android:title="@string/advanced"/>
+ android:icon="@drawable/graph"
+ android:title="@string/graph"/>
- <item android:id="@+id/basic"
+ <item android:id="@+id/settings"
android:showAsAction="ifRoom|withText"
android:icon="@drawable/simple"
- android:title="@string/basic"/>
-
+ android:title="@string/settings"/>
</menu>
View
@@ -141,4 +141,4 @@
<string name="determinantDesc">Determinant</string>
<string name="eigenvalueDesc">Eigen Values</string>
- <string name="testingHistory">test\n\n\n\n\n\n\n\n\n\n\n\ntest\n\n\n\n\n\n\n\n\n\n\n\ntest\n\n\n\n\n\n\n\n\n\n\n\ntest\n\n\n\n\n\n\n\n\n\n\n\ntest\n\n\n\n\n\n\n\n\n\n\n\ntest\n\n\n\n\n\n\n\n\n\n\n\ntest\n\n\n\n\n\n\n\n\n\n\n\ntest\n\n\n\n\n\n\n\n\n\n\n\ntest</string></resources>
+ <string name="settings">Settings</string></resources>
Oops, something went wrong.

0 comments on commit c0cc468

Please sign in to comment.