Skip to content

Commit d77f6f7

Browse files
MaxFourMaxFour
committed
Update to release v1.2 (8.1.0-r9)
• Added Notification Dots (Android Marshmallow 6.0+) • Added gestures swipe down to open notifications, up to close them • Dynamic Calendar & Clock icons
1 parent ce7bb0c commit d77f6f7

350 files changed

Lines changed: 18128 additions & 6913 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎Android.mk‎

Lines changed: 60 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
LOCAL_PATH := $(call my-dir)
1818

1919
#
20-
# Build app code.
20+
# Build rule for Home app.
2121
#
2222
include $(CLEAR_VARS)
2323

@@ -26,12 +26,15 @@ LOCAL_MODULE_TAGS := optional
2626
LOCAL_STATIC_JAVA_LIBRARIES := \
2727
android-support-v4 \
2828
android-support-v7-recyclerview \
29-
android-support-v7-palette
29+
android-support-v7-palette \
30+
android-support-dynamic-animation
3031

3132
LOCAL_SRC_FILES := \
3233
$(call all-java-files-under, src) \
3334
$(call all-java-files-under, src_config) \
34-
$(call all-proto-files-under, protos)
35+
$(call all-java-files-under, src_flags) \
36+
$(call all-proto-files-under, protos) \
37+
$(call all-proto-files-under, proto_overrides)
3538

3639
LOCAL_RESOURCE_DIR := \
3740
$(LOCAL_PATH)/res \
@@ -40,7 +43,7 @@ LOCAL_RESOURCE_DIR := \
4043
LOCAL_PROGUARD_FLAG_FILES := proguard.flags
4144

4245
LOCAL_PROTOC_OPTIMIZE_TYPE := nano
43-
LOCAL_PROTOC_FLAGS := --proto_path=$(LOCAL_PATH)/protos/
46+
LOCAL_PROTOC_FLAGS := --proto_path=$(LOCAL_PATH)/protos/ --proto_path=$(LOCAL_PATH)/proto_overrides/
4447
LOCAL_PROTO_JAVA_OUTPUT_PARAMS := enum_style=java
4548

4649
LOCAL_AAPT_FLAGS := \
@@ -59,15 +62,66 @@ LOCAL_JACK_COVERAGE_INCLUDE_FILTER := com.android.home.*
5962

6063
include $(BUILD_PACKAGE)
6164

65+
#
66+
# Build rule for Home Go app for Android Go devices.
67+
#
68+
include $(CLEAR_VARS)
69+
70+
LOCAL_MODULE_TAGS := optional
71+
72+
LOCAL_STATIC_JAVA_LIBRARIES := \
73+
android-support-v4 \
74+
android-support-v7-recyclerview \
75+
android-support-v7-palette \
76+
android-support-dynamic-animation
77+
78+
LOCAL_SRC_FILES := \
79+
$(call all-java-files-under, src) \
80+
$(call all-java-files-under, src_config) \
81+
$(call all-java-files-under, go/src_flags) \
82+
$(call all-proto-files-under, protos) \
83+
$(call all-proto-files-under, proto_overrides)
84+
85+
LOCAL_RESOURCE_DIR := \
86+
$(LOCAL_PATH)/go/res \
87+
$(LOCAL_PATH)/res \
88+
prebuilts/sdk/current/support/v7/recyclerview/res \
89+
90+
LOCAL_PROGUARD_FLAG_FILES := proguard.flags
91+
92+
LOCAL_PROTOC_OPTIMIZE_TYPE := nano
93+
LOCAL_PROTOC_FLAGS := --proto_path=$(LOCAL_PATH)/protos/ --proto_path=$(LOCAL_PATH)/proto_overrides/
94+
LOCAL_PROTO_JAVA_OUTPUT_PARAMS := enum_style=java
95+
96+
LOCAL_AAPT_FLAGS := \
97+
--auto-add-overlay \
98+
--extra-packages android.support.v7.recyclerview \
99+
100+
LOCAL_SDK_VERSION := current
101+
LOCAL_MIN_SDK_VERSION := 21
102+
LOCAL_PACKAGE_NAME := HomeGo
103+
LOCAL_PRIVILEGED_MODULE := true
104+
LOCAL_OVERRIDES_PACKAGES := Home Launcher2 Home
105+
106+
LOCAL_FULL_LIBS_MANIFEST_FILES := \
107+
$(LOCAL_PATH)/AndroidManifest.xml \
108+
$(LOCAL_PATH)/AndroidManifest-common.xml
109+
110+
LOCAL_MANIFEST_FILE := go/AndroidManifest.xml
111+
112+
LOCAL_JACK_COVERAGE_INCLUDE_FILTER := com.android.home.*
113+
114+
include $(BUILD_PACKAGE)
115+
62116
#
63117
# Launcher proto buffer jar used for development
64118
#
65119
include $(CLEAR_VARS)
66120

67-
LOCAL_SRC_FILES := $(call all-proto-files-under, protos)
121+
LOCAL_SRC_FILES := $(call all-proto-files-under, protos) $(call all-proto-files-under, proto_overrides)
68122

69123
LOCAL_PROTOC_OPTIMIZE_TYPE := nano
70-
LOCAL_PROTOC_FLAGS := --proto_path=$(LOCAL_PATH)/protos/
124+
LOCAL_PROTOC_FLAGS := --proto_path=$(LOCAL_PATH)/protos/ --proto_path=$(LOCAL_PATH)/proto_overrides/
71125
LOCAL_PROTO_JAVA_OUTPUT_PARAMS := enum_style=java
72126

73127
LOCAL_MODULE_TAGS := optional

‎AndroidManifest-common.xml‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -87,6 +87,12 @@
8787
android:permission="android.permission.BIND_JOB_SERVICE">
8888
</service>
8989

90+
<service
91+
android:name="com.android.home.compat.WallpaperManagerCompatVL$ColorExtractionService"
92+
android:exported="false"
93+
android:process=":wallpaper_chooser"
94+
android:permission="android.permission.BIND_JOB_SERVICE" />
95+
9096
<service android:name="com.android.home.notification.NotificationListener"
9197
android:enabled="@bool/notification_badging_enabled"
9298
android:permission="android.permission.BIND_NOTIFICATION_LISTENER_SERVICE">

‎AndroidManifest.xml‎

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,9 @@
4949
<uses-permission android:name="com.android.home.permission.READ_SETTINGS" />
5050
<uses-permission android:name="com.android.home.permission.WRITE_SETTINGS" />
5151

52+
<!-- Custom -->
53+
<uses-permission android:name="android.permission.EXPAND_STATUS_BAR" />
54+
5255
<application
5356
android:backupAgent="com.android.home.LauncherBackupAgent"
5457
android:fullBackupOnly="true"
@@ -71,7 +74,7 @@
7174
android:launchMode="singleTask"
7275
android:clearTaskOnLaunch="true"
7376
android:stateNotNeeded="true"
74-
android:windowSoftInputMode="adjustPan|stateHidden"
77+
android:windowSoftInputMode="adjustPan"
7578
android:screenOrientation="nosensor"
7679
android:configChanges="keyboard|keyboardHidden|navigation"
7780
android:resizeableActivity="true"
@@ -83,6 +86,7 @@
8386
<category android:name="android.intent.category.HOME" />
8487
<category android:name="android.intent.category.DEFAULT" />
8588
<category android:name="android.intent.category.MONKEY"/>
89+
<category android:name="android.intent.category.LAUNCHER_APP" />
8690
</intent-filter>
8791
</activity>
8892

@@ -136,7 +140,8 @@
136140
android:theme="@android:style/Theme.NoDisplay"
137141
android:label="* HPROF"
138142
android:excludeFromRecents="true"
139-
android:icon="@drawable/ic_launcher_home"
143+
android:icon="@drawable/ic_home"
144+
android:roundIcon="@drawable/ic_home_round"
140145
>
141146
<intent-filter>
142147
<action android:name="android.intent.action.MAIN" />
@@ -148,7 +153,8 @@
148153
<activity
149154
android:name="com.android.home.testing.ToggleWeightWatcher"
150155
android:label="Show Mem"
151-
android:icon="@drawable/ic_launcher_home">
156+
android:icon="@drawable/ic_home">
157+
android:roundIcon="@drawable/ic_home_round"
152158
<intent-filter>
153159
<action android:name="android.intent.action.MAIN" />
154160
<category android:name="android.intent.category.DEFAULT" />

‎build.gradle‎

Lines changed: 38 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,10 @@ buildscript {
22
repositories {
33
mavenCentral()
44
jcenter()
5+
google()
56
}
67
dependencies {
7-
classpath 'com.android.tools.build:gradle:2.3.3'
8+
classpath 'com.android.tools.build:gradle:2.3.1'
89
classpath 'com.google.protobuf:protobuf-gradle-plugin:0.8.0'
910
}
1011
}
@@ -13,14 +14,14 @@ apply plugin: 'com.android.application'
1314
apply plugin: 'com.google.protobuf'
1415

1516
android {
16-
compileSdkVersion 26
17-
buildToolsVersion '26.0.2'
17+
compileSdkVersion 27
18+
buildToolsVersion '27.0.3'
1819

1920
defaultConfig {
2021
minSdkVersion 21
21-
targetSdkVersion 26
22-
versionCode 101
23-
versionName "1.1" //r_34
22+
targetSdkVersion 27
23+
versionCode 102
24+
versionName "1.2" //8.1.0-r9
2425

2526
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
2627
}
@@ -35,45 +36,68 @@ android {
3536
applicationId 'com.android.home'
3637
testApplicationId 'com.android.home.tests'
3738
}
39+
40+
l3go {
41+
applicationId 'com.android.home'
42+
testApplicationId 'com.android.home.tests'
43+
}
3844
}
3945
sourceSets {
4046
main {
4147
res.srcDirs = ['res']
42-
java.srcDirs = ['src', 'src_config']
48+
java.srcDirs = ['src']
4349
manifest.srcFile 'AndroidManifest-common.xml'
44-
proto.srcDirs 'protos/'
50+
proto {
51+
srcDir 'protos/'
52+
srcDir 'proto_overrides/'
53+
}
4554
}
4655

4756
androidTest {
48-
java.srcDirs = ['tests/src']
4957
res.srcDirs = ['tests/res']
58+
java.srcDirs = ['tests/src']
5059
manifest.srcFile "tests/AndroidManifest-common.xml"
5160
}
5261

5362
aosp {
63+
java.srcDirs = ['src_flags']
5464
manifest.srcFile "AndroidManifest.xml"
5565
}
5666

5767
aospAndroidTest {
5868
manifest.srcFile "tests/AndroidManifest.xml"
5969
}
70+
71+
l3go {
72+
res.srcDirs = ['go/res']
73+
java.srcDirs = ['go/src_flags']
74+
// Note: we are using the Home manifest here because the gradle manifest-merger uses
75+
// different attributes than the build system.
76+
manifest.srcFile "AndroidManifest.xml"
77+
}
78+
79+
l3goAndroidTest {
80+
manifest.srcFile "tests/AndroidManifest.xml"
81+
}
6082
}
6183
}
6284

6385
repositories {
6486
mavenCentral()
6587
jcenter()
88+
google()
6689
}
6790

68-
final String SUPPORT_LIBS_VERSION = '26.+'
91+
final String SUPPORT_LIBS_VERSION = '27.0.+'
6992
dependencies {
7093
compile "com.android.support:support-v4:${SUPPORT_LIBS_VERSION}"
94+
compile "com.android.support:support-dynamic-animation:${SUPPORT_LIBS_VERSION}"
7195
compile "com.android.support:recyclerview-v7:${SUPPORT_LIBS_VERSION}"
7296
compile "com.android.support:palette-v7:${SUPPORT_LIBS_VERSION}"
73-
compile 'com.google.protobuf.nano:protobuf-javanano:3.0.0-alpha-2'
97+
compile 'com.google.protobuf.nano:protobuf-javanano:3.0.0-alpha-7'
7498

7599
testCompile 'junit:junit:4.12'
76-
androidTestCompile "org.mockito:mockito-core:1.+"
100+
androidTestCompile "org.mockito:mockito-core:1.9.5"
77101
androidTestCompile 'com.google.dexmaker:dexmaker:1.2'
78102
androidTestCompile 'com.google.dexmaker:dexmaker-mockito:1.2'
79103
androidTestCompile 'com.android.support.test:runner:0.5'
@@ -91,7 +115,9 @@ protobuf {
91115
task.builtins {
92116
remove java
93117
javanano {
118+
option "java_package=launcher_log_extension.proto|com.android.home.userevent.nano"
94119
option "java_package=launcher_log.proto|com.android.home.userevent.nano"
120+
option "java_package=launcher_dump.proto|com.android.home.model.nano"
95121
option "enum_style=java"
96122
}
97123
}

‎go/AndroidManifest.xml‎

Lines changed: 54 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,54 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<!--
3+
/*
4+
**
5+
** Copyright 2017, The Android Open Source Project
6+
**
7+
** Licensed under the Apache License, Version 2.0 (the "License");
8+
** you may not use this file except in compliance with the License.
9+
** You may obtain a copy of the License at
10+
**
11+
** http://www.apache.org/licenses/LICENSE-2.0
12+
**
13+
** Unless required by applicable law or agreed to in writing, software
14+
** distributed under the License is distributed on an "AS IS" BASIS,
15+
** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
16+
** See the License for the specific language governing permissions and
17+
** limitations under the License.
18+
*/
19+
-->
20+
<manifest
21+
xmlns:android="http://schemas.android.com/apk/res/android"
22+
xmlns:tools="http://schemas.android.com/tools"
23+
package="com.android.home" >
24+
25+
<uses-sdk android:targetSdkVersion="23" android:minSdkVersion="21"/>
26+
27+
<application
28+
android:backupAgent="com.android.home.LauncherBackupAgent"
29+
android:fullBackupOnly="true"
30+
android:fullBackupContent="@xml/backupscheme"
31+
android:hardwareAccelerated="true"
32+
android:icon="@drawable/ic_home"
33+
android:roundIcon="@drawable/ic_home_round"
34+
android:label="@string/derived_app_name"
35+
android:theme="@style/LauncherTheme"
36+
android:largeHeap="@bool/config_largeHeap"
37+
android:restoreAnyVersion="true"
38+
android:supportsRtl="true" >
39+
40+
<!-- Activity for handling PinItemRequest. Only supports shortcuts -->
41+
<activity android:name="com.android.home.dragndrop.AddItemActivity"
42+
android:theme="@android:style/Theme.DeviceDefault.Light.Dialog.Alert"
43+
android:excludeFromRecents="true"
44+
android:autoRemoveFromRecents="true"
45+
android:label="@string/action_add_to_workspace"
46+
tools:merge="override" >
47+
<intent-filter>
48+
<action android:name="android.content.pm.action.CONFIRM_PIN_SHORTCUT" />
49+
</intent-filter>
50+
</activity>
51+
52+
</application>
53+
54+
</manifest>

‎go/res/drawable/ic_widget.xml‎

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
<!--
2+
Copyright (C) 2017 The Android Open Source Project
3+
4+
Licensed under the Apache License, Version 2.0 (the "License");
5+
you may not use this file except in compliance with the License.
6+
You may obtain a copy of the License at
7+
8+
http://www.apache.org/licenses/LICENSE-2.0
9+
10+
Unless required by applicable law or agreed to in writing, software
11+
distributed under the License is distributed on an "AS IS" BASIS,
12+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
See the License for the specific language governing permissions and
14+
limitations under the License.
15+
-->
16+
<vector xmlns:android="http://schemas.android.com/apk/res/android"
17+
android:width="48dp"
18+
android:height="48dp"
19+
android:viewportWidth="24.0"
20+
android:viewportHeight="24.0">
21+
<path
22+
android:fillColor="#FFFFFFFF"
23+
android:pathData="M3.9,18.35c2.5-2.49,5.78-3.64,10.14-3.64v3.05c0,0.47,0.57,0.71,0.9,0.37l5.74-5.74c0.41-0.41,0.41-1.08,0-1.49l-5.74-5.74
24+
c-0.33-0.33-0.9-0.1-0.9,0.37v2.95c-6.32,0.9-9.56,4.9-11.02,9.34C2.86,18.34,3.51,18.74,3.9,18.35z"/>
25+
</vector>

0 commit comments

Comments
 (0)