diff options
| author | Justin Klaassen <justinklaassen@google.com> | 2014-05-27 17:53:10 -0700 |
|---|---|---|
| committer | Justin Klaassen <justinklaassen@google.com> | 2014-05-28 15:17:38 -0700 |
| commit | 4b3af0578b1a44038856bc56244aea8aaeac22d1 (patch) | |
| tree | 98685ecfd26c20e42bda03ae976e742c02478663 /AndroidManifest.xml | |
| parent | a1d84550f39728b7a68e3f9c85d7f757ea55f114 (diff) | |
| download | android_packages_apps_ExactCalculator-4b3af0578b1a44038856bc56244aea8aaeac22d1.tar.gz android_packages_apps_ExactCalculator-4b3af0578b1a44038856bc56244aea8aaeac22d1.tar.bz2 android_packages_apps_ExactCalculator-4b3af0578b1a44038856bc56244aea8aaeac22d1.zip | |
Overhaul Calculator UI.
Bug: 14418545
Bug: 14419084
Bug: 14419142
Bug: 14420277
Bug: 14466652
Bug: 14564559
Bug: 14564608
Bug: 14846724
Bug: 15090154
Bug: 15287699
Bug: 15289526
Bug: 15289616
Change-Id: I93e1530446d5bd6a4c3189f751c88ece1abc7767
Diffstat (limited to 'AndroidManifest.xml')
| -rw-r--r-- | AndroidManifest.xml | 34 |
1 files changed, 25 insertions, 9 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml index f610603..6218374 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -1,24 +1,40 @@ <?xml version="1.0" encoding="utf-8"?> -<manifest xmlns:android="http://schemas.android.com/apk/res/android" - package="com.android.calculator2" > +<!-- + Copyright (C) 2014 The Android Open Source Project - <original-package android:name="com.android.calculator2" /> + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + --> + +<manifest + xmlns:android="http://schemas.android.com/apk/res/android" + package="com.android.calculator2"> <application android:icon="@mipmap/ic_launcher_calculator" - android:label="@string/app_name" > + android:label="@string/app_name" + android:theme="@style/CalculatorTheme"> + <activity - android:name="Calculator" - android:theme="@style/AppTheme" - android:windowSoftInputMode="stateAlwaysHidden" > + android:name="com.android.calculator2.CalculatorActivity" + android:label="@string/app_name" + android:windowSoftInputMode="stateAlwaysHidden"> <intent-filter> <action android:name="android.intent.action.MAIN" /> - - <category android:name="android.intent.category.DEFAULT" /> <category android:name="android.intent.category.LAUNCHER" /> <category android:name="android.intent.category.APP_CALCULATOR" /> </intent-filter> </activity> + </application> </manifest> |