diff options
| author | Alexander Marchuk <alexm@maps.me> | 2015-08-31 21:25:43 +0300 |
|---|---|---|
| committer | Alexander Marchuk <alexm@maps.me> | 2015-10-20 12:05:44 +0300 |
| commit | d9d140efb49dcdf97f15f04a7f71d6d38775e4a0 (patch) | |
| tree | 181a1b78fec9edc6f9b68425ac4ddc47d643df7a /android/AndroidManifest.xml | |
| parent | f068da2417e0214ef4502ca0d05d107af8c6b5df (diff) | |
[android] refactor: Settings rewritten using native PreferenceFragment`s.
refactor: Config reworked.
Diffstat (limited to 'android/AndroidManifest.xml')
| -rw-r--r-- | android/AndroidManifest.xml | 24 |
1 files changed, 6 insertions, 18 deletions
diff --git a/android/AndroidManifest.xml b/android/AndroidManifest.xml index 07a169bee6..b036ee2bb0 100644 --- a/android/AndroidManifest.xml +++ b/android/AndroidManifest.xml @@ -170,7 +170,7 @@ <activity android:name="com.mapswithme.maps.MwmActivity" android:launchMode="singleTask" - android:theme="@style/MwmTheme.Map" + android:theme="@style/MwmTheme.MainActivity" android:windowSoftInputMode="stateAlwaysHidden|adjustPan"> </activity> @@ -200,7 +200,7 @@ <activity android:name="com.mapswithme.maps.settings.SettingsActivity" android:configChanges="orientation|screenLayout|screenSize" - android:label="@string/settings_and_more" + android:label="@string/settings" android:parentActivityName="com.mapswithme.maps.MwmActivity"> <!-- The meta-data element is needed for versions lower than 4.1 --> <meta-data @@ -222,7 +222,7 @@ <activity android:name="com.mapswithme.maps.bookmarks.BookmarkCategoriesActivity" android:configChanges="orientation|screenLayout|screenSize" - android:label="@string/bookmarks" + android:label="@string/bookmark_sets" android:parentActivityName="com.mapswithme.maps.MwmActivity"> <!-- The meta-data element is needed for versions lower than 4.1 --> <meta-data @@ -258,8 +258,7 @@ <service android:name="com.mapswithme.maps.background.WorkerService" - android:exported="false"> - </service> + android:exported="false"/> <!-- our custom receiver, that will call Aloha & other handlers --> <receiver @@ -314,24 +313,13 @@ </intent-filter> </receiver> - <!-- Catches app upgraded intent. - Different receivers are used due to MY_PACKAGE_REPLACED was added in Honeycomb_MR1--> - <receiver android:name=".background.UpgradeReceiver" - android:enabled="@bool/isNewerThanHoneycombMr1"> + <!-- Catches app upgraded intent --> + <receiver android:name=".background.UpgradeReceiver"> <intent-filter> <action android:name="android.intent.action.MY_PACKAGE_REPLACED"/> </intent-filter> </receiver> - <receiver android:name=".background.UpgradeReceiverCompat" - android:enabled="@bool/isOlderThanHoneycombMr1"> - <intent-filter> - <action android:name="android.intent.action.PACKAGE_REPLACED"/> - - <data android:scheme="package"/> - </intent-filter> - </receiver> - </application> </manifest> |