diff options
| author | Justin Klaassen <justinklaassen@google.com> | 2015-05-05 12:59:36 -0700 |
|---|---|---|
| committer | Justin Klaassen <justinklaassen@google.com> | 2015-05-05 12:59:36 -0700 |
| commit | d36d63e0b261d896e5bcfdab09e3aecb7e4d086c (patch) | |
| tree | f1beb58e4feb416156707aa016de950b19ffb628 /AndroidManifest.xml | |
| parent | ed9e67864d9d54ed58ddb339a15115250d48bd30 (diff) | |
| download | android_packages_apps_ExactCalculator-d36d63e0b261d896e5bcfdab09e3aecb7e4d086c.tar.gz android_packages_apps_ExactCalculator-d36d63e0b261d896e5bcfdab09e3aecb7e4d086c.tar.bz2 android_packages_apps_ExactCalculator-d36d63e0b261d896e5bcfdab09e3aecb7e4d086c.zip | |
Cleanup options menu and licenses UI
Bug: 20503109
- Open source licenses are now displayed as a standalone Licenses
activity.
- Show/hide result options instead of enabling/disabling them.
Change-Id: I7e1e43ac83d2417b2f59f90e6a1fc3e491c6ddc7
Diffstat (limited to 'AndroidManifest.xml')
| -rw-r--r-- | AndroidManifest.xml | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 3a03059..4f90e22 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -20,14 +20,14 @@ package="com.android.calculator2"> <application + android:allowBackup="false" android:icon="@mipmap/ic_launcher_calculator" - android:label="@string/app_name" - android:theme="@style/CalculatorTheme"> + android:label="@string/app_name"> <activity android:name=".Calculator" android:label="@string/app_name" - android:windowSoftInputMode="stateAlwaysHidden"> + android:theme="@style/Theme.Calculator"> <intent-filter> <action android:name="android.intent.action.MAIN" /> <category android:name="android.intent.category.LAUNCHER" /> @@ -35,6 +35,11 @@ </intent-filter> </activity> + <activity + android:name=".Licenses" + android:parentActivityName=".Calculator" + android:theme="@style/Theme.Licenses" /> + </application> </manifest> |