-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
[RG,MK]{refactoring} R3 - edited action bar in settings screen.
- Loading branch information
1 parent
b3f8c45
commit 2143116
Showing
3 changed files
with
298 additions
and
285 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,60 +1,61 @@ | ||
| <?xml version="1.0" encoding="utf-8"?> | ||
| <manifest xmlns:android="http://schemas.android.com/apk/res/android" | ||
| package="com.sw.nam" | ||
| android:versionCode="1" | ||
| android:versionName="1.0" > | ||
|
|
||
| <uses-sdk | ||
| android:minSdkVersion="9" | ||
| android:targetSdkVersion="19" /> | ||
|
|
||
| <permission | ||
| android:name="com.sw.nam.permission.C2D_MESSAGE" | ||
| android:protectionLevel="signature" /> | ||
|
|
||
| <uses-permission android:name="com.sw.nam.permission.C2D_MESSAGE" /> | ||
| <uses-permission android:name="android.permission.INTERNET" /> | ||
| <uses-permission android:name="android.permission.GET_ACCOUNTS" /> | ||
| <uses-permission android:name="android.permission.WAKE_LOCK" /> | ||
| <uses-permission android:name="com.google.android.c2dm.permission.RECEIVE" /> | ||
| <uses-permission android:name="android.permission.READ_CONTACTS" /> | ||
| <uses-permission android:name="android.permission.VIBRATE"/> | ||
|
|
||
| <application | ||
| android:name="com.sw.nam.Common" | ||
| android:allowBackup="true" | ||
| android:icon="@drawable/ic_launcher" | ||
| android:label="@string/app_name" | ||
| android:theme="@style/AppTheme" > | ||
| <activity android:name="com.sw.nam.MainActivity" > | ||
| <intent-filter> | ||
| <action android:name="android.intent.action.MAIN" /> | ||
|
|
||
| <category android:name="android.intent.category.LAUNCHER" /> | ||
| </intent-filter> | ||
| </activity> | ||
| <activity android:name="com.sw.nam.ChatActivity" | ||
| /> | ||
| <activity | ||
| android:name="com.sw.nam.SettingsActivity" | ||
| android:label="@string/title_activity_settings" | ||
| /> | ||
|
|
||
| <receiver | ||
| android:name="com.sw.nam.client.GcmBroadcastReceiver" | ||
| android:permission="com.google.android.c2dm.permission.SEND" > | ||
| <intent-filter> | ||
| <action android:name="com.google.android.c2dm.intent.RECEIVE" /> | ||
|
|
||
| <category android:name="com.sw.nam" /> | ||
| </intent-filter> | ||
| </receiver> | ||
|
|
||
| <provider | ||
| android:name="com.sw.nam.DataProvider" | ||
| android:authorities="com.sw.nam.provider" | ||
| android:exported="false" > | ||
| </provider> | ||
| </application> | ||
|
|
||
| <?xml version="1.0" encoding="utf-8"?> | ||
| <manifest xmlns:android="http://schemas.android.com/apk/res/android" | ||
| package="com.sw.nam" | ||
| android:versionCode="1" | ||
| android:versionName="1.0" > | ||
|
|
||
| <uses-sdk | ||
| android:minSdkVersion="9" | ||
| android:targetSdkVersion="19" /> | ||
|
|
||
| <permission | ||
| android:name="com.sw.nam.permission.C2D_MESSAGE" | ||
| android:protectionLevel="signature" /> | ||
|
|
||
| <uses-permission android:name="com.sw.nam.permission.C2D_MESSAGE" /> | ||
| <uses-permission android:name="android.permission.INTERNET" /> | ||
| <uses-permission android:name="android.permission.GET_ACCOUNTS" /> | ||
| <uses-permission android:name="android.permission.WAKE_LOCK" /> | ||
| <uses-permission android:name="com.google.android.c2dm.permission.RECEIVE" /> | ||
| <uses-permission android:name="android.permission.READ_CONTACTS" /> | ||
| <uses-permission android:name="android.permission.VIBRATE"/> | ||
|
|
||
| <application | ||
| android:name="com.sw.nam.Common" | ||
| android:allowBackup="true" | ||
| android:icon="@drawable/ic_launcher" | ||
| android:label="@string/app_name" | ||
| android:theme="@style/AppTheme" > | ||
| <activity android:name="com.sw.nam.MainActivity" > | ||
| <intent-filter> | ||
| <action android:name="android.intent.action.MAIN" /> | ||
|
|
||
| <category android:name="android.intent.category.LAUNCHER" /> | ||
| </intent-filter> | ||
| </activity> | ||
| <activity android:name="com.sw.nam.ChatActivity" | ||
| /> | ||
| <activity | ||
| android:name="com.sw.nam.SettingsActivity" | ||
| android:label="@string/title_activity_settings" | ||
| android:parentActivityName="com.sw.nam.MainActivity" | ||
| /> | ||
|
|
||
| <receiver | ||
| android:name="com.sw.nam.client.GcmBroadcastReceiver" | ||
| android:permission="com.google.android.c2dm.permission.SEND" > | ||
| <intent-filter> | ||
| <action android:name="com.google.android.c2dm.intent.RECEIVE" /> | ||
|
|
||
| <category android:name="com.sw.nam" /> | ||
| </intent-filter> | ||
| </receiver> | ||
|
|
||
| <provider | ||
| android:name="com.sw.nam.DataProvider" | ||
| android:authorities="com.sw.nam.provider" | ||
| android:exported="false" > | ||
| </provider> | ||
| </application> | ||
|
|
||
| </manifest> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,3 +1,4 @@ | ||
| <?xml version="1.0" encoding="UTF-8"?> | ||
| <lint> | ||
| <issue id="NewApi" severity="ignore" /> | ||
| </lint> |
Oops, something went wrong.