Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b94725ca authored by Justin Klaassen's avatar Justin Klaassen
Browse files

Cleanup project files 

- Updated .gitignore to just contain standard files / paths.
- Remove unused messageformat dependency from Android.mk.
- Fixed formatting of AndroidManifest.xml.
- Removed unused build.gradle file.

Change-Id: I98a885540405de26e4147763db06c294f5aa41d9
parent 1a57a652

.gitignore

+7 −17
Original line number Diff line number Diff line 
.classpath

.gitignore

.gradle

.idea

.name

.project

bin

build

gen

lint.xml

local.properties

out

project.properties

*.DS_Store

*~

*.iml

*.swo

*.swp
 
.gradle

/local.properties

/.idea/workspace.xml

/.idea/libraries

.DS_Store

/build

/captures

Android.mk

+0 −2
Original line number Diff line number Diff line
@@ -29,7 +29,6 @@ LOCAL_OVERRIDES_PACKAGES := AlarmClock 
LOCAL_SRC_FILES := $(call all-java-files-under, src)



LOCAL_STATIC_JAVA_LIBRARIES := android-opt-datetimepicker

LOCAL_STATIC_JAVA_LIBRARIES += messageformat

LOCAL_STATIC_JAVA_LIBRARIES += android-support-design

LOCAL_STATIC_JAVA_LIBRARIES += android-support-v13

LOCAL_STATIC_JAVA_LIBRARIES += android-support-v14-preference
@@ -46,6 +45,5 @@ LOCAL_AAPT_FLAGS += --extra-packages android.support.v7.gridlayout 
LOCAL_AAPT_FLAGS += --extra-packages android.support.v7.preference

LOCAL_AAPT_FLAGS += --extra-packages android.support.v7.recyclerview

LOCAL_AAPT_FLAGS += --extra-packages com.android.datetimepicker

LOCAL_AAPT_FLAGS += --extra-packages com.android.messageformat



include $(BUILD_PACKAGE)

AndroidManifest.xml

+130 −117
Original line number Diff line number Diff line
@@ -15,9 +15,11 @@ 
  limitations under the License.

  -->



<manifest xmlns:android="http://schemas.android.com/apk/res/android"

<manifest

    xmlns:android="http://schemas.android.com/apk/res/android"

    package="com.android.deskclock"

        android:versionCode="410" android:versionName="4.1.0">

    android:versionCode="440"

    android:versionName="4.4.0">



    <original-package android:name="com.android.alarmclock" />

    <original-package android:name="com.android.deskclock" />
@@ -35,26 +37,28 @@ 
    <!-- READ_EXTERNAL_STORAGE is required to play custom ringtones from the SD card prior to M -->

    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />



    <application android:label="@string/app_label"

    <application

        android:name=".DeskClockApplication"

        android:allowBackup="true"

        android:backupAgent="DeskClockBackupAgent"

        android:fullBackupContent="@xml/backup_scheme"

        android:fullBackupOnly="true"

        android:icon="@mipmap/ic_launcher_alarmclock"

        android:label="@string/app_label"

        android:requiredForAllUsers="true"

        android:supportsRtl="true">



        <provider android:name=".provider.ClockProvider"

        <provider

            android:name=".provider.ClockProvider"

            android:authorities="com.android.deskclock"

            android:exported="false" />



        <activity android:name="DeskClock"

                android:label="@string/app_label"

                android:theme="@style/DeskClockTheme"

        <activity

            android:name=".DeskClock"

            android:icon="@mipmap/ic_launcher_alarmclock"

                android:launchMode="singleTask">



            android:label="@string/app_label"

            android:launchMode="singleTask"

            android:theme="@style/DeskClockTheme">

            <intent-filter>

                <action android:name="android.intent.action.MAIN" />

                <category android:name="android.intent.category.DEFAULT" />
@@ -62,14 +66,14 @@ 
            </intent-filter>

        </activity>



        <activity-alias android:name="DockClock"

                android:targetActivity="DeskClock"

                android:label="@string/app_label"

                android:theme="@style/DeskClockTheme"

        <activity-alias

            android:name=".DockClock"

            android:enabled="@bool/config_dockAppEnabled"

            android:icon="@mipmap/ic_launcher_alarmclock"

            android:label="@string/app_label"

            android:launchMode="singleTask"

                android:enabled="@bool/config_dockAppEnabled"

                >

            android:targetActivity="DeskClock"

            android:theme="@style/DeskClockTheme">

            <intent-filter>

                <action android:name="android.intent.action.MAIN" />

                <category android:name="android.intent.category.DEFAULT" />
@@ -77,54 +81,58 @@ 
            </intent-filter>

        </activity-alias>



        <activity android:name=".settings.SettingsActivity"

        <activity

            android:name=".settings.SettingsActivity"

            android:excludeFromRecents="true"

            android:label="@string/settings"

                android:theme="@style/SettingsTheme"

            android:taskAffinity=""

                android:excludeFromRecents="true"

                >

            android:theme="@style/SettingsTheme">

            <intent-filter>

                <action android:name="android.intent.action.MAIN" />

            </intent-filter>

        </activity>



        <activity android:name=".worldclock.CitySelectionActivity"

        <activity

            android:name=".worldclock.CitySelectionActivity"

            android:excludeFromRecents="true"

            android:label="@string/cities_activity_title"

                android:theme="@style/CitiesTheme"

            android:taskAffinity=""

                android:excludeFromRecents="true">

            android:theme="@style/CitiesTheme">

            <intent-filter>

                <action android:name="android.intent.action.MAIN" />

            </intent-filter>

        </activity>



        <activity android:name=".alarms.AlarmActivity"

                android:taskAffinity=""

        <activity

            android:name=".alarms.AlarmActivity"

            android:excludeFromRecents="true"

            android:showOnLockScreen="true"

            android:taskAffinity=""

            android:theme="@style/AlarmAlertFullScreenTheme"

                android:windowSoftInputMode="stateAlwaysHidden"

                android:showOnLockScreen="true" />

            android:windowSoftInputMode="stateAlwaysHidden" />



        <activity android:name="ScreensaverActivity"

        <activity

            android:name=".ScreensaverActivity"

            android:configChanges="orientation|screenSize|keyboardHidden|keyboard"

            android:excludeFromRecents="true"

            android:taskAffinity=""

                android:theme="@style/ScreensaverActivityTheme"

                android:configChanges="orientation|screenSize|keyboardHidden|keyboard" />

            android:theme="@style/ScreensaverActivityTheme" />



        <receiver android:name=".alarms.AlarmStateManager"

                  android:exported="false">

        </receiver>

        <receiver

            android:name=".alarms.AlarmStateManager"

            android:exported="false" />



        <service android:name=".alarms.AlarmService"

                 android:exported="false">

        </service>

        <service

            android:name=".alarms.AlarmService"

            android:exported="false" />



        <activity android:name="HandleApiCalls"

                android:theme="@android:style/Theme.NoDisplay"

        <activity

            android:name=".HandleApiCalls"

            android:excludeFromRecents="true"

            android:launchMode="singleTask"

            android:permission="com.android.alarm.permission.SET_ALARM"

                android:taskAffinity="">

            android:taskAffinity=""

            android:theme="@android:style/Theme.NoDisplay">

            <intent-filter>

                <action android:name="android.intent.action.SET_ALARM" />

                <category android:name="android.intent.category.DEFAULT" />
@@ -152,17 +160,18 @@ 
            </intent-filter>

        </activity>



        <activity-alias android:name="HandleSetAlarm"

            android:targetActivity=".HandleApiCalls"

            android:exported="true">

        </activity-alias>

        <activity-alias

            android:name="HandleSetAlarm"

            android:exported="true"

            android:targetActivity=".HandleApiCalls" />



        <activity android:name=".HandleDeskClockApiCalls"

            android:theme="@android:style/Theme.NoDisplay"

        <activity

            android:name=".HandleDeskClockApiCalls"

            android:excludeFromRecents="true"

            android:launchMode="singleTask"

            android:permission="com.android.alarm.permission.SET_ALARM"

            android:taskAffinity="">

            android:taskAffinity=""

            android:theme="@android:style/Theme.NoDisplay">

            <intent-filter>

                <action android:name="com.android.deskclock.action.SHOW_CLOCK" />

                <category android:name="android.intent.category.DEFAULT" />
@@ -230,7 +239,7 @@ 
            </intent-filter>

        </activity>



        <receiver android:name="AlarmInitReceiver">

        <receiver android:name=".AlarmInitReceiver">

            <intent-filter>

                <action android:name="android.intent.action.BOOT_COMPLETED" />

                <action android:name="android.intent.action.TIME_SET" />
@@ -276,12 +285,14 @@ 
                android:resource="@xml/digital_appwidget" />

        </receiver>



        <service android:name="com.android.alarmclock.DigitalAppWidgetService"

             android:permission="android.permission.BIND_REMOTEVIEWS"

             android:exported="false" />

        <service

            android:name="com.android.alarmclock.DigitalAppWidgetService"

            android:exported="false"

            android:permission="android.permission.BIND_REMOTEVIEWS" />



        <!-- Dream (screensaver) implementation -->

        <service android:name="Screensaver"

        <service

            android:name=".Screensaver"

            android:exported="true"

            android:label="@string/app_label"

            android:permission="android.permission.BIND_DREAM_SERVICE">
@@ -296,13 +307,13 @@ 
        </service>



        <!-- Settings activity for screensaver -->

        <activity android:name=".settings.ScreensaverSettingsActivity"

                android:label="@string/screensaver_settings"

                android:theme="@style/SettingsTheme"

                android:taskAffinity=""

        <activity

            android:name=".settings.ScreensaverSettingsActivity"

            android:excludeFromRecents="true"

            android:exported="true"

                >

            android:label="@string/screensaver_settings"

            android:taskAffinity=""

            android:theme="@style/SettingsTheme">

            <intent-filter>

                <action android:name="android.intent.action.MAIN" />

            </intent-filter>
@@ -316,22 +327,24 @@ 
        <!-- This activity displays only the timers that have expired with only a reset button

         present. This makes the activity appropriate for display above the lock screen so that

         users have the limited ability to silence expired timers but nothing else. -->

        <activity android:name=".timer.ExpiredTimersActivity"

        <activity

            android:name=".timer.ExpiredTimersActivity"

            android:configChanges="screenSize|keyboardHidden|keyboard|navigation"

            android:excludeFromRecents="true"

                android:theme="@style/ExpiredTimersActivityTheme"

            android:launchMode="singleInstance"

            android:showOnLockScreen="true"

            android:taskAffinity=""

                android:configChanges="screenSize|keyboardHidden|keyboard|navigation"/>

            android:theme="@style/ExpiredTimersActivityTheme" />



        <service android:name=".timer.TimerService"

                 android:exported="false"

                 android:description="@string/timer_service_desc">

        </service>

        <service

            android:name=".timer.TimerService"

            android:description="@string/timer_service_desc"

            android:exported="false" />



        <service

            android:name=".stopwatch.StopwatchService"

            android:description="@string/stopwatch_service_desc"

            android:exported="false" />



        <service android:name=".stopwatch.StopwatchService"

                android:exported="false"

                android:description="@string/stopwatch_service_desc">

        </service>

    </application>

</manifest>

build.gradle

deleted100644 → 0
+0 −48
Original line number Diff line number Diff line 
/*

* Copyright (C) 2015 The Android Open Source Project

*

* 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.

*/



apply plugin: "com.android.application"



android {

    sourceSets {

        main {

            manifest.srcFile "AndroidManifest.xml"

            java.srcDir "src"

            res.srcDir "res"

            assets.srcDir "assets"

        }

    }



    compileOptions {

        sourceCompatibility JavaVersion.VERSION_1_7

        targetCompatibility JavaVersion.VERSION_1_7

    }



    dependencies {

        compile (project(":android-opt-datetimepicker")) {

            exclude module: "support-v4"

        }

        compile project(":messageformat")

        compile project(":support-design")

        compile project(":support-v7-appcompat")

        compile project(":support-v7-gridlayout")

        compile project(":support-v7-recyclerview")

        compile project(":support-v13")

        compile (project(":support-v14-preference")) {

            exclude module: "support-v4"

        }

    }

}