Pandora

.gitmodules

@@ -7,3 +7,12 @@
 [submodule "HDLocker/submodules/CardLibrary"]
 	path = HDLocker/submodules/CardLibrary
 	url = [email protected]:Mrzy/CardLibrary.git
+[submodule "HDLocker/submodules/SupportCardView"]
+	path = HDLocker/submodules/SupportCardView
+	url = [email protected]:Mrzy/supportCardView.git
+[submodule "HDLocker/submodules/MaterialDialogs"]
+	path = HDLocker/submodules/MaterialDialogs
+	url = [email protected]:Mrzy/MaterialDialogsLibrary.git
+[submodule "HDLocker/submodules/support-v7-appcompat"]
+	path = HDLocker/submodules/support-v7-appcompat
+	url = [email protected]:Mrzy/appcompat-v7.git

HDLocker/.project

@@ -3,6 +3,7 @@
 	<name>HDLocker</name>
 	<comment></comment>
 	<projects>
+		<project>android-support-v7-appcompat</project>
 	</projects>
 	<buildSpec>
 		<buildCommand>

HDLocker/.settings/org.eclipse.jdt.core.prefs

@@ -1,4 +1,11 @@
 eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
 org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
+org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
 org.eclipse.jdt.core.compiler.compliance=1.6
+org.eclipse.jdt.core.compiler.debug.lineNumber=generate
+org.eclipse.jdt.core.compiler.debug.localVariable=generate
+org.eclipse.jdt.core.compiler.debug.sourceFile=generate
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
 org.eclipse.jdt.core.compiler.source=1.6

HDLocker/AndroidManifest.xml

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="cn.zmdx.kaka.locker"
-    android:versionCode="90"
-    android:versionName="1.4.1" >
+    android:versionCode="110"
+    android:versionName="2.1.7" >
 
     <uses-sdk
         android:minSdkVersion="14"
@@ -15,7 +15,6 @@
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
     <uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW" />
     <uses-permission android:name="android.permission.DISABLE_KEYGUARD" />
-    <uses-permission android:name="android.permission.READ_PHONE_STATE" />
     <uses-permission android:name="android.permission.VIBRATE" />
     <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
     <uses-permission android:name="android.permission.MOUNT_UNMOUNT_FILESYSTEMS" />
@@ -26,126 +25,153 @@
     <uses-permission android:name="android.permission.USE_CREDENTIALS" />
     <uses-permission android:name="android.permission.MANAGE_ACCOUNTS" />
     <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
+    <uses-permission android:name="android.permission.WAKE_LOCK" />
+    <uses-permission android:name="android.permission.WRITE_SETTINGS" />
+    <uses-permission android:name="android.permission.READ_LOGS" />
+    <uses-permission android:name="android.permission.SET_WALLPAPER" />
+    <uses-permission android:name="android.permission.SET_WALLPAPER_HINTS" />
+    <uses-permission android:name="android.permission.REORDER_TASKS" />
 
     <application
         android:name=".HDApplication"
         android:allowBackup="true"
         android:icon="@drawable/ic_launcher"
-        android:label="@string/app_name"
-        android:largeHeap="true" >
+        android:label="@string/app_name" >
+        <service
+            android:name="com.baidu.location.f"
+            android:enabled="true"
+            android:process=":remote" >
+            <intent-filter>
+                <action android:name="com.baidu.location.service_v2.2" >
+                </action>
+            </intent-filter>
+        </service>
+
+        <meta-data
+            android:name="com.baidu.lbsapi.API_KEY"
+            android:value="GWH4pNl2HLAvdpEqwd22hGM7" />
+
         <activity
-            android:name=".splash.SplashActivity"
+            android:name=".settings.MainSettingActivity"
             android:excludeFromRecents="true"
-            android:launchMode="singleTask"
             android:screenOrientation="portrait"
-            android:theme="@android:style/Theme.NoTitleBar" >
+            android:theme="@style/Theme.AppCompat" >
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
 
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
+
+        <service android:name=".service.PandoraService" />
+        <!-- umeng -->
+        <service
+            android:name="com.umeng.update.net.DownloadingService"
+            android:process=":DownloadingService" >
+        </service>
+        <service
+            android:name="cn.zmdx.kaka.locker.notification.PandoraNotificationService"
+            android:label="@string/notification_service_name"
+            android:permission="android.permission.BIND_NOTIFICATION_LISTENER_SERVICE" >
+            <intent-filter>
+                <action android:name="android.service.notification.NotificationListenerService" />
+            </intent-filter>
+        </service>
+
+        <receiver android:name=".receiver.PandoraReceiver" >
+            <intent-filter android:priority="1000" >
+                <action android:name="android.intent.action.BOOT_COMPLETED" />
+                <action android:name="android.intent.action.USER_PRESENT" />
+            </intent-filter>
+        </receiver>
+
+        <!-- activitys -->
         <activity
-            android:name=".settings.MainSettingsActivity"
+            android:name=".settings.FAQActivity"
             android:exported="false"
-            android:launchMode="singleTask"
+            android:label="@string/pandora_setting_general_faq"
             android:screenOrientation="portrait"
-            android:theme="@android:style/Theme.NoTitleBar" >
-        </activity>
+            android:theme="@style/Theme.AppCompat" />
         <activity
-            android:name=".settings.BaseActivity"
+            android:name=".settings.FeedbackActivity"
             android:exported="false"
-            android:launchMode="singleTask"
+            android:label="@string/pandora_setting_general_feedback"
             android:screenOrientation="portrait"
-            android:theme="@android:style/Theme.NoTitleBar" >
-        </activity>
+            android:theme="@style/Theme.AppCompat" />
         <activity
-            android:name=".guide.GuideActivity"
-            android:exported="false"
-            android:screenOrientation="portrait" >
-        </activity>
-        <activity
-            android:name=".settings.InitSettingActivity"
+            android:name=".settings.AboutActivity"
             android:exported="false"
-            android:screenOrientation="portrait" >
-        </activity>
-        <activity
-            android:name=".settings.InitPromptActivity"
+            android:label="@string/pandora_setting_general_about"
             android:screenOrientation="portrait"
-            android:theme="@style/init_prompt_style" >
-        </activity>
+            android:theme="@style/Theme.AppCompat" />
         <activity
-            android:name=".settings.WallPaperActivity"
+            android:name=".settings.NotifyManagerActivity"
             android:exported="false"
-            android:screenOrientation="portrait" >
-        </activity>
+            android:label="@string/pandora_setting_notify_manage"
+            android:screenOrientation="portrait"
+            android:theme="@style/Theme.AppCompat"
+            android:windowSoftInputMode="adjustPan" />
         <activity
-            android:name=".settings.CropImageActivity"
+            android:name=".settings.WallpaperDetailActivity"
             android:exported="false"
+            android:launchMode="singleTask"
             android:screenOrientation="portrait"
-            android:theme="@android:style/Theme.Black.NoTitleBar.Fullscreen" >
-        </activity>
+            android:theme="@style/wallpaper_detail_style" />
         <activity
-            android:name=".settings.MAboutActivity"
+            android:name=".settings.CropImageActivity"
             android:exported="false"
-            android:screenOrientation="portrait" >
-        </activity>
+            android:screenOrientation="portrait" />
         <activity
             android:name=".FakeActivity"
             android:excludeFromRecents="true"
             android:exported="false"
             android:launchMode="singleInstance"
             android:screenOrientation="portrait"
-            android:theme="@android:style/Theme.Translucent.NoTitleBar" />
+            android:theme="@android:style/Theme.Translucent.NoTitleBar.Fullscreen" />
         <activity
-            android:name=".settings.IndividualizationActivity"
-            android:exported="false"
-            android:launchMode="singleTask"
-            android:screenOrientation="portrait" >
-        </activity>
+            android:name=".settings.InitPromptActivity"
+            android:launchMode="singleInstance"
+            android:screenOrientation="portrait"
+            android:theme="@style/init_prompt_style" />
         <activity
-            android:name=".settings.LockerPasswordActivity"
-            android:exported="false"
-            android:launchMode="singleTask"
-            android:screenOrientation="portrait" >
-        </activity>
+            android:name=".layout.PandoraLayoutActivity"
+            android:label="@string/pandora_setting_wallpaper_layout_prompt"
+            android:screenOrientation="portrait"
+            android:theme="@style/Theme.AppCompat" />
         <activity
-            android:name=".settings.LockerPasswordTypeActivity"
+            android:name=".wxapi.WXEntryActivity"
             android:exported="false"
             android:screenOrientation="portrait"
-            android:theme="@style/locker_password_dialog_theme" >
-        </activity>
+            android:theme="@android:style/Theme.Translucent.NoTitleBar" />
         <activity
-            android:name=".settings.FeedbackActivity"
+            android:name=".settings.InitSettingActivity"
             android:exported="false"
-            android:screenOrientation="portrait" />
-
-        <service android:name=".service.PandoraService" />
-        <!-- umeng -->
-        <service
-            android:name="com.umeng.update.net.DownloadingService"
-            android:process=":DownloadingService" >
-        </service>
-        <service
-            android:name="cn.zmdx.kaka.locker.notification.PandoraNotificationService"
-            android:label="@string/notification_service_name"
-            android:permission="android.permission.BIND_NOTIFICATION_LISTENER_SERVICE" >
-            <intent-filter>
-                <action android:name="android.service.notification.NotificationListenerService" />
-            </intent-filter>
-        </service>
-
+            android:label="@string/init_setting_title"
+            android:screenOrientation="portrait"
+            android:theme="@style/Theme.AppCompat" />
+        <activity
+            android:name=".settings.PasswordPromptActivity"
+            android:screenOrientation="portrait"
+            android:theme="@style/password_prompt_style" />
+        <activity
+            android:name=".settings.ChooseCityActivity"
+            android:label="@string/pandora_setting_weather_choose_city"
+            android:screenOrientation="portrait"
+            android:theme="@style/Theme.AppCompat" />
+        <activity
+            android:name=".splash.SplashActivity"
+            android:screenOrientation="portrait"
+            android:theme="@android:style/Theme.Black.NoTitleBar" />
+        <!-- 分享 -->
+        <activity
+            android:name="cn.sharesdk.framework.ShareSDKUIShell"
+            android:configChanges="keyboardHidden|orientation|screenSize"
+            android:screenOrientation="portrait"
+            android:theme="@android:style/Theme.Translucent.NoTitleBar"
+            android:windowSoftInputMode="stateHidden|adjustResize" />
         <activity
             android:name="com.umeng.update.UpdateDialogActivity"
-            android:theme="@android:style/Theme.Translucent.NoTitleBar" >
-        </activity>
-
-        <receiver android:name=".receiver.PandoraReceiver" >
-            <intent-filter android:priority="1000" >
-                <action android:name="android.intent.action.BOOT_COMPLETED" />
-                <action android:name="android.intent.action.USER_PRESENT" />
-            </intent-filter>
-        </receiver>
+            android:theme="@android:style/Theme.Translucent.NoTitleBar" />
 
         <meta-data
             android:name="UMENG_APPKEY"
@@ -154,12 +180,6 @@
         <meta-data
             android:name="UMENG_CHANNEL"
             android:value="pandora" />
-
-        <activity
-            android:name="cn.zmdx.kaka.locker.settings.FavoritesActivity"
-            android:exported="false"
-            android:screenOrientation="portrait" >
-        </activity>
     </application>
 
 </manifest>