Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge changes I7f1ef2e8,I498bc261

Browse Source 
* changes:
  Convert sysui to bp
  Cleanup trying to move to bp
This commit is contained in:
Treehugger Robot
2018-09-05 22:42:52 +00:00
committed by Gerrit Code Review
parent 0b8f17b3ba 2c3a8045cd
commit ef98a2ca1c
33 changed files with 345 additions and 600 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
packages/SettingsLib/Android.bp Normal file
View File

@@ -0,0 +1,25 @@
android_library {
name: "SettingsLib",
libs: [
"androidx.annotation_annotation",
"androidx.legacy_legacy-support-v4",
"androidx.recyclerview_recyclerview",
"androidx.preference_preference",
"androidx.appcompat_appcompat",
"androidx.lifecycle_lifecycle-runtime",
],
// ANDROIDMK TRANSLATION ERROR: unsupported assignment to LOCAL_SHARED_JAVA_LIBRARIES
// LOCAL_SHARED_JAVA_LIBRARIES := androidx.lifecycle_lifecycle-common
resource_dirs: ["res"],
srcs: ["src/**/*.java"],
min_sdk_version: "21",
}
// For the test package.

34
packages/SettingsLib/Android.mk
View File

@@ -1,34 +0,0 @@
LOCAL_PATH := $(call my-dir)
include $(CLEAR_VARS)
LOCAL_USE_AAPT2 := true
LOCAL_AAPT2_ONLY := true
LOCAL_MODULE := SettingsLib
LOCAL_JAVA_LIBRARIES := \
androidx.annotation_annotation
LOCAL_SHARED_ANDROID_LIBRARIES := \
androidx.legacy_legacy-support-v4 \
androidx.recyclerview_recyclerview \
androidx.preference_preference \
androidx.appcompat_appcompat \
androidx.lifecycle_lifecycle-runtime
LOCAL_SHARED_JAVA_LIBRARIES := \
androidx.lifecycle_lifecycle-common
LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res
LOCAL_JAR_EXCLUDE_FILES := none
LOCAL_SRC_FILES := $(call all-java-files-under, src)
LOCAL_MIN_SDK_VERSION := 21
include $(BUILD_STATIC_JAVA_LIBRARY)
# For the test package.
include $(call all-makefiles-under, $(LOCAL_PATH))

101
packages/SystemUI/Android.bp Normal file
View File

@@ -0,0 +1,101 @@
//
// Copyright (C) 2018 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.
//
java_library {
name: "SystemUI-proto",
srcs: ["src/**/*.proto"],
proto: {
type: "nano",
},
}
java_library {
name: "SystemUI-tags",
srcs: ["src/com/android/systemui/EventLogTags.logtags"],
}
android_library {
name: "SystemUI-core",
srcs: [
"src/**/*.java",
"src/**/I*.aidl",
],
resource_dirs: [
"res-keyguard",
"res",
],
static_libs: [
"SystemUIPluginLib",
"SystemUISharedLib",
"SettingsLib",
"androidx.car_car",
"androidx.legacy_legacy-support-v4",
"androidx.recyclerview_recyclerview",
"androidx.preference_preference",
"androidx.appcompat_appcompat",
"androidx.mediarouter_mediarouter",
"androidx.palette_palette",
"androidx.legacy_legacy-preference-v14",
"androidx.leanback_leanback",
"androidx.slice_slice-core",
"androidx.slice_slice-view",
"androidx.slice_slice-builders",
"androidx.arch.core_core-runtime",
"androidx.lifecycle_lifecycle-extensions",
"SystemUI-tags",
"SystemUI-proto",
],
manifest: "AndroidManifest.xml",
libs: [
"telephony-common",
"android.car",
],
aaptflags: [
"--extra-packages",
"com.android.keyguard",
],
}
android_app {
name: "SystemUI",
static_libs: [
"SystemUI-core",
],
platform_apis: true,
certificate: "platform",
privileged: true,
optimize: {
proguard_flags_files: ["proguard.flags"],
},
libs: [
"telephony-common",
"android.car",
],
dxflags: ["--multi-dex"],
aaptflags: [
"--extra-packages",
"com.android.keyguard",
],
}

83
packages/SystemUI/Android.mk
View File

@@ -1,83 +0,0 @@
LOCAL_PATH:= $(call my-dir)
include $(CLEAR_VARS)
LOCAL_MODULE := SystemUI-proto
LOCAL_SRC_FILES := $(call all-proto-files-under,src)
LOCAL_PROTOC_OPTIMIZE_TYPE := nano
LOCAL_PROTO_JAVA_OUTPUT_PARAMS := optional_field_style=accessors
include $(BUILD_STATIC_JAVA_LIBRARY)
include $(CLEAR_VARS)
LOCAL_MODULE := SystemUI-tags
LOCAL_SRC_FILES := src/com/android/systemui/EventLogTags.logtags
include $(BUILD_STATIC_JAVA_LIBRARY)
# ------------------
include $(CLEAR_VARS)
LOCAL_USE_AAPT2 := true
LOCAL_MODULE_TAGS := optional
RELATIVE_FINGERPRINT_PATH := ../../core/java/android/hardware/fingerprint
LOCAL_SRC_FILES := \
$(call all-java-files-under, src) \
$(call all-Iaidl-files-under, src) \
$(call all-Iaidl-files-under, $(RELATIVE_FINGERPRINT_PATH))
LOCAL_STATIC_ANDROID_LIBRARIES := \
SystemUIPluginLib \
SystemUISharedLib \
androidx.car_car \
androidx.legacy_legacy-support-v4 \
androidx.recyclerview_recyclerview \
androidx.preference_preference \
androidx.appcompat_appcompat \
androidx.mediarouter_mediarouter \
androidx.palette_palette \
androidx.legacy_legacy-preference-v14 \
androidx.leanback_leanback \
androidx.slice_slice-core \
androidx.slice_slice-view \
androidx.slice_slice-builders \
androidx.arch.core_core-runtime \
androidx.lifecycle_lifecycle-extensions \
LOCAL_STATIC_JAVA_LIBRARIES := \
SystemUI-tags \
SystemUI-proto
LOCAL_JAVA_LIBRARIES := telephony-common \
android.car
LOCAL_PACKAGE_NAME := SystemUI
LOCAL_PRIVATE_PLATFORM_APIS := true
LOCAL_CERTIFICATE := platform
LOCAL_PRIVILEGED_MODULE := true
LOCAL_PROGUARD_FLAG_FILES := proguard.flags
LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res-keyguard $(LOCAL_PATH)/res
ifneq ($(INCREMENTAL_BUILDS),)
LOCAL_PROGUARD_ENABLED := disabled
LOCAL_JACK_ENABLED := incremental
LOCAL_DX_FLAGS := --multi-dex
LOCAL_JACK_FLAGS := --multi-dex native
endif
include frameworks/base/packages/SettingsLib/common.mk
LOCAL_AAPT_FLAGS := --extra-packages com.android.keyguard
include $(BUILD_PACKAGE)
include $(call all-makefiles-under,$(LOCAL_PATH))

37
packages/SystemUI/plugin/Android.bp Normal file
View File

@@ -0,0 +1,37 @@
// Copyright (C) 2016 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.
java_library {
name: "SystemUIPluginLib",
srcs: ["src/**/*.java"],
}
android_app {
// Dummy to generate .toc files.
name: "PluginDummyLib",
platform_apis: true,
srcs: ["src/**/*.java"],
libs: ["SystemUIPluginLib"],
optimize: {
enabled: false,
},
}

42
packages/SystemUI/plugin/Android.mk
View File

@@ -1,42 +0,0 @@
# Copyright (C) 2016 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.
LOCAL_PATH := $(call my-dir)
include $(CLEAR_VARS)
LOCAL_USE_AAPT2 := true
LOCAL_MODULE_TAGS := optional
LOCAL_MODULE := SystemUIPluginLib
LOCAL_SRC_FILES := $(call all-java-files-under, src)
LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res
LOCAL_JAR_EXCLUDE_FILES := none
include $(BUILD_STATIC_JAVA_LIBRARY)
include $(CLEAR_VARS)
# Dummy to generate .toc files.
LOCAL_PACKAGE_NAME := PluginDummyLib
LOCAL_PRIVATE_PLATFORM_APIS := true
LOCAL_SRC_FILES := $(call all-java-files-under, src)
LOCAL_JAVA_LIBRARIES := SystemUIPluginLib
LOCAL_PROGUARD_ENABLED := disabled
include $(BUILD_PACKAGE)

14
packages/SystemUI/plugin/ExamplePlugin/Android.bp Normal file
View File

@@ -0,0 +1,14 @@
android_app {
name: "ExamplePlugin",
libs: ["SystemUIPluginLib"],
certificate: "platform",
optimize: {
enabled: false,
},
srcs: ["src/**/*.java"],
}

15
packages/SystemUI/plugin/ExamplePlugin/Android.mk
View File

@@ -1,15 +0,0 @@
LOCAL_PATH := $(call my-dir)
include $(CLEAR_VARS)
LOCAL_USE_AAPT2 := true
LOCAL_PACKAGE_NAME := ExamplePlugin
LOCAL_JAVA_LIBRARIES := SystemUIPluginLib
LOCAL_CERTIFICATE := platform
LOCAL_PROGUARD_ENABLED := disabled
LOCAL_SRC_FILES := $(call all-java-files-under, src)
include $(BUILD_PACKAGE)

3
packages/SystemUI/res-keyguard/values/alias.xml
View File

@@ -25,9 +25,6 @@
<!-- Alias used to reference framework "OK" string in keyguard. -->
<item type="string" name="ok">@*android:string/ok</item>
<!-- Alias used to reference framework "OK" string in keyguard. -->
<item type="string" name="system_ui_date_pattern">@*android:string/system_ui_date_pattern</item>
<!-- Alias used to reference framework configuration for screen rotation. -->
<item type="bool" name="config_enableLockScreenRotation">@*android:bool/config_enableLockScreenRotation</item>

24
packages/SystemUI/res/values-bg/donottranslate.xml
View File

@@ -1,24 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
/**
* Copyright (c) 2009, 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.
*/
-->
<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<!-- For formatting day of week and date in DateView. Day of week precedes date by default,
but this may be overridden on a per-locale basis if necessary. -->
<string name="status_bar_date_formatter">%2$s\n%1$s</string>
</resources>

24
packages/SystemUI/res/values-hu/donottranslate.xml
View File

@@ -1,24 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
/**
* Copyright (c) 2009, 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.
*/
-->
<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<!-- For formatting day of week and date in DateView. Day of week precedes date by default,
but this may be overridden on a per-locale basis if necessary. -->
<string name="status_bar_date_formatter">%2$s\n%1$s</string>
</resources>

24
packages/SystemUI/res/values-ja/donottranslate.xml
View File

@@ -1,24 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
/**
* Copyright (c) 2009, 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.
*/
-->
<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<!-- For formatting day of week and date in DateView. Day of week precedes date by default,
but this may be overridden on a per-locale basis if necessary. -->
<string name="status_bar_date_formatter">%2$s\n%1$s</string>
</resources>

24
packages/SystemUI/res/values-ko/donottranslate.xml
View File

@@ -1,24 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
/**
* Copyright (c) 2009, 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.
*/
-->
<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<!-- For formatting day of week and date in DateView. Day of week precedes date by default,
but this may be overridden on a per-locale basis if necessary. -->
<string name="status_bar_date_formatter">%2$s\n%1$s</string>
</resources>

24
packages/SystemUI/res/values-lt/donottranslate.xml
View File

@@ -1,24 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
/**
* Copyright (c) 2009, 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.
*/
-->
<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<!-- For formatting day of week and date in DateView. Day of week precedes date by default,
but this may be overridden on a per-locale basis if necessary. -->
<string name="status_bar_date_formatter">%2$s\n%1$s</string>
</resources>

27
packages/SystemUI/res/values-sw720dp/donottranslate.xml
View File

@@ -1,27 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
/**
* Copyright (c) 2011, 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.
*/
-->
<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<!-- For formatting day of week and date in DateView. %1$s is DOW, %2$s is date.
We show both (DOW on one line, then the date) but this can be overridden for locales as
necessary.
-->
<string name="status_bar_date_formatter">%1$s\n%2$s</string>
</resources>

24
packages/SystemUI/res/values-tr/donottranslate.xml
View File

@@ -1,24 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
/**
* Copyright (c) 2009, 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.
*/
-->
<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<!-- For formatting day of week and date in DateView. Day of week precedes date by default,
but this may be overridden on a per-locale basis if necessary. -->
<string name="status_bar_date_formatter">%2$s\n%1$s</string>
</resources>

24
packages/SystemUI/res/values-zh-rCN/donottranslate.xml
View File

@@ -1,24 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
/**
* Copyright (c) 2009, 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.
*/
-->
<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<!-- For formatting day of week and date in DateView. Day of week precedes date by default,
but this may be overridden on a per-locale basis if necessary. -->
<string name="status_bar_date_formatter">%2$s\n%1$s</string>
</resources>

24
packages/SystemUI/res/values-zh-rTW/donottranslate.xml
View File

@@ -1,24 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
/**
* Copyright (c) 2009, 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.
*/
-->
<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<!-- For formatting day of week and date in DateView. Day of week precedes date by default,
but this may be overridden on a per-locale basis if necessary. -->
<string name="status_bar_date_formatter">%2$s\n%1$s</string>
</resources>

40
packages/SystemUI/shared/Android.bp Normal file
View File

@@ -0,0 +1,40 @@
// Copyright (C) 2017 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.
android_library {
name: "SystemUISharedLib",
srcs: [
"src/**/*.java",
"src/**/I*.aidl",
],
}
android_app {
name: "SysUISharedLib",
platform_apis: true,
srcs: [
"src/**/*.java",
"src/**/I*.aidl",
],
static_libs: ["SystemUISharedLib"],
optimize: {
enabled: false,
},
}

43
packages/SystemUI/shared/Android.mk
View File

@@ -1,43 +0,0 @@
# Copyright (C) 2017 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.
LOCAL_PATH := $(call my-dir)
include $(CLEAR_VARS)
LOCAL_USE_AAPT2 := true
LOCAL_MODULE_TAGS := optional
LOCAL_MODULE := SystemUISharedLib
LOCAL_SRC_FILES := $(call all-java-files-under, src) $(call all-Iaidl-files-under, src)
LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res
LOCAL_JAR_EXCLUDE_FILES := none
include $(BUILD_STATIC_JAVA_LIBRARY)
include $(CLEAR_VARS)
LOCAL_PACKAGE_NAME := SysUISharedLib
LOCAL_PRIVATE_PLATFORM_APIS := true
LOCAL_SRC_FILES := $(call all-java-files-under, src)
LOCAL_JAVA_LIBRARIES := SystemUISharedLib
LOCAL_PROGUARD_ENABLED := disabled
include $(BUILD_PACKAGE)
include $(call all-makefiles-under,$(LOCAL_PATH))

4
packages/SystemUI/shared/tests/Android.mk
View File

@@ -30,10 +30,10 @@ LOCAL_PRIVATE_PLATFORM_APIS := true
LOCAL_COMPATIBILITY_SUITE := device-tests
# Add local path sources as well as shared lib sources
LOCAL_SRC_FILES := $(call all-java-files-under, src) \
$(call all-java-files-under, ../src)
LOCAL_SRC_FILES := $(call all-java-files-under, src)
LOCAL_STATIC_JAVA_LIBRARIES := \
SystemUISharedLib \
metrics-helper-lib \
android-support-test \
mockito-target-inline-minus-junit4 \

40
packages/SystemUI/src/com/android/systemui/analytics/SensorLoggerSession.java
View File

@@ -101,31 +101,31 @@ public class SensorLoggerSession {
public Session toProto() {
Session proto = new Session();
proto.setStartTimestampMillis(mStartTimestampMillis);
proto.setDurationMillis(mEndTimestampMillis - mStartTimestampMillis);
proto.setBuild(Build.FINGERPRINT);
proto.setResult(mResult);
proto.setType(mType);
proto.startTimestampMillis = mStartTimestampMillis;
proto.durationMillis = mEndTimestampMillis - mStartTimestampMillis;
proto.build = Build.FINGERPRINT;
proto.result = mResult;
proto.type = mType;
proto.sensorEvents = mSensorEvents.toArray(proto.sensorEvents);
proto.touchEvents = mMotionEvents.toArray(proto.touchEvents);
proto.phoneEvents = mPhoneEvents.toArray(proto.phoneEvents);
proto.setTouchAreaWidth(mTouchAreaWidth);
proto.setTouchAreaHeight(mTouchAreaHeight);
proto.touchAreaWidth = mTouchAreaWidth;
proto.touchAreaHeight = mTouchAreaHeight;
return proto;
}
private PhoneEvent phoneEventToProto(int eventType, long sysTimeNanos) {
PhoneEvent proto = new PhoneEvent();
proto.setType(eventType);
proto.setTimeOffsetNanos(sysTimeNanos - mStartSystemTimeNanos);
proto.type = eventType;
proto.timeOffsetNanos = sysTimeNanos - mStartSystemTimeNanos;
return proto;
}
private SensorEvent sensorEventToProto(android.hardware.SensorEvent ev, long sysTimeNanos) {
SensorEvent proto = new SensorEvent();
proto.setType(ev.sensor.getType());
proto.setTimeOffsetNanos(sysTimeNanos - mStartSystemTimeNanos);
proto.setTimestamp(ev.timestamp);
proto.type = ev.sensor.getType();
proto.timeOffsetNanos = sysTimeNanos - mStartSystemTimeNanos;
proto.timestamp = ev.timestamp;
proto.values = ev.values.clone();
return proto;
}
@@ -133,17 +133,17 @@ public class SensorLoggerSession {
private TouchEvent motionEventToProto(MotionEvent ev) {
int count = ev.getPointerCount();
TouchEvent proto = new TouchEvent();
proto.setTimeOffsetNanos(ev.getEventTimeNano() - mStartSystemTimeNanos);
proto.setAction(ev.getActionMasked());
proto.setActionIndex(ev.getActionIndex());
proto.timeOffsetNanos = ev.getEventTimeNano() - mStartSystemTimeNanos;
proto.action = ev.getActionMasked();
proto.actionIndex = ev.getActionIndex();
proto.pointers = new TouchEvent.Pointer[count];
for (int i = 0; i < count; i++) {
TouchEvent.Pointer p = new TouchEvent.Pointer();
p.setX(ev.getX(i));
p.setY(ev.getY(i));
p.setSize(ev.getSize(i));
p.setPressure(ev.getPressure(i));
p.setId(ev.getPointerId(i));
p.x = ev.getX(i);
p.y = ev.getY(i);
p.size = ev.getSize(i);
p.pressure = ev.getPressure(i);
p.id = ev.getPointerId(i);
proto.pointers[i] = p;
}
return proto;

16
packages/SystemUI/src/com/android/systemui/qs/PseudoGridView.java
View File

@@ -47,16 +47,12 @@ public class PseudoGridView extends ViewGroup {
final int N = a.getIndexCount();
for (int i = 0; i < N; i++) {
int attr = a.getIndex(i);
switch (attr) {
case R.styleable.PseudoGridView_numColumns:
mNumColumns = a.getInt(attr, 3);
break;
case R.styleable.PseudoGridView_verticalSpacing:
mVerticalSpacing = a.getDimensionPixelSize(attr, 0);
break;
case R.styleable.PseudoGridView_horizontalSpacing:
mHorizontalSpacing = a.getDimensionPixelSize(attr, 0);
break;
if (attr == R.styleable.PseudoGridView_numColumns) {
mNumColumns = a.getInt(attr, 3);
} else if (attr == R.styleable.PseudoGridView_verticalSpacing) {
mVerticalSpacing = a.getDimensionPixelSize(attr, 0);
} else if (attr == R.styleable.PseudoGridView_horizontalSpacing) {
mHorizontalSpacing = a.getDimensionPixelSize(attr, 0);
}
}

11
packages/SystemUI/src/com/android/systemui/qs/tiles/UserDetailItemView.java
View File

@@ -69,13 +69,10 @@ public class UserDetailItemView extends LinearLayout {
final int N = a.getIndexCount();
for (int i = 0; i < N; i++) {
int attr = a.getIndex(i);
switch (attr) {
case R.styleable.UserDetailItemView_regularFontFamily:
mRegularTypeface = Typeface.create(a.getString(attr), 0 /* style */);
break;
case R.styleable.UserDetailItemView_activatedFontFamily:
mActivatedTypeface = Typeface.create(a.getString(attr), 0 /* style */);
break;
if (attr == R.styleable.UserDetailItemView_regularFontFamily) {
mRegularTypeface = Typeface.create(a.getString(attr), 0 /* style */);
} else if (attr == R.styleable.UserDetailItemView_activatedFontFamily) {
mActivatedTypeface = Typeface.create(a.getString(attr), 0 /* style */);
}
}
a.recycle();

26
packages/SystemUI/src/com/android/systemui/stackdivider/DividerView.java
View File

@@ -226,22 +226,16 @@ public class DividerView extends FrameLayout implements OnTouchListener,
public boolean performAccessibilityAction(View host, int action, Bundle args) {
int currentPosition = getCurrentPosition();
SnapTarget nextTarget = null;
switch (action) {
case R.id.action_move_tl_full:
nextTarget = mSnapAlgorithm.getDismissEndTarget();
break;
case R.id.action_move_tl_70:
nextTarget = mSnapAlgorithm.getLastSplitTarget();
break;
case R.id.action_move_tl_50:
nextTarget = mSnapAlgorithm.getMiddleTarget();
break;
case R.id.action_move_tl_30:
nextTarget = mSnapAlgorithm.getFirstSplitTarget();
break;
case R.id.action_move_rb_full:
nextTarget = mSnapAlgorithm.getDismissStartTarget();
break;
if (action == R.id.action_move_tl_full) {
nextTarget = mSnapAlgorithm.getDismissEndTarget();
} else if (action == R.id.action_move_tl_70) {
nextTarget = mSnapAlgorithm.getLastSplitTarget();
} else if (action == R.id.action_move_tl_50) {
nextTarget = mSnapAlgorithm.getMiddleTarget();
} else if (action == R.id.action_move_tl_30) {
nextTarget = mSnapAlgorithm.getFirstSplitTarget();
} else if (action == R.id.action_move_rb_full) {
nextTarget = mSnapAlgorithm.getDismissStartTarget();
}
if (nextTarget != null) {
startDragging(true /* animate */, false /* touching */);

20
packages/SystemUI/src/com/android/systemui/statusbar/ExpandableNotificationRow.java
View File

@@ -2747,16 +2747,18 @@ public class ExpandableNotificationRow extends ActivatableNotificationView
case AccessibilityNodeInfo.ACTION_LONG_CLICK:
doLongClickCallback();
return true;
case R.id.action_snooze:
NotificationMenuRowPlugin provider = getProvider();
if (provider == null) {
provider = createMenu();
default:
if (action == R.id.action_snooze) {
NotificationMenuRowPlugin provider = getProvider();
if (provider == null) {
provider = createMenu();
}
MenuItem snoozeMenu = provider.getSnoozeMenuItem(getContext());
if (snoozeMenu != null) {
doLongClickCallback(getWidth() / 2, getHeight() / 2, snoozeMenu);
}
return true;
}
MenuItem snoozeMenu = provider.getSnoozeMenuItem(getContext());
if (snoozeMenu != null) {
doLongClickCallback(getWidth() / 2, getHeight() / 2, snoozeMenu);
}
return true;
}
return false;
}

12
packages/SystemUI/src/com/android/systemui/statusbar/phone/NavigationBarView.java
View File

@@ -255,13 +255,11 @@ public class NavigationBarView extends FrameLayout implements PluginListener<Nav
@Override
public boolean performAccessibilityAction(View host, int action, Bundle args) {
switch (action) {
case R.id.action_toggle_overview:
SysUiServiceProvider.getComponent(getContext(), Recents.class)
.toggleRecentApps();
break;
default:
return super.performAccessibilityAction(host, action, args);
if (action == R.id.action_toggle_overview) {
SysUiServiceProvider.getComponent(getContext(), Recents.class)
.toggleRecentApps();
} else {
return super.performAccessibilityAction(host, action, args);
}
return true;
}

31
packages/SystemUI/src/com/android/systemui/statusbar/phone/UserAvatarView.java
View File

@@ -45,25 +45,18 @@ public class UserAvatarView extends View {
final int N = a.getIndexCount();
for (int i = 0; i < N; i++) {
int attr = a.getIndex(i);
switch (attr) {
case R.styleable.UserAvatarView_avatarPadding:
setAvatarPadding(a.getDimension(attr, 0));
break;
case R.styleable.UserAvatarView_frameWidth:
setFrameWidth(a.getDimension(attr, 0));
break;
case R.styleable.UserAvatarView_framePadding:
setFramePadding(a.getDimension(attr, 0));
break;
case R.styleable.UserAvatarView_frameColor:
setFrameColor(a.getColorStateList(attr));
break;
case R.styleable.UserAvatarView_badgeDiameter:
setBadgeDiameter(a.getDimension(attr, 0));
break;
case R.styleable.UserAvatarView_badgeMargin:
setBadgeMargin(a.getDimension(attr, 0));
break;
if (attr == R.styleable.UserAvatarView_avatarPadding) {
setAvatarPadding(a.getDimension(attr, 0));
} else if (attr == R.styleable.UserAvatarView_frameWidth) {
setFrameWidth(a.getDimension(attr, 0));
} else if (attr == R.styleable.UserAvatarView_framePadding) {
setFramePadding(a.getDimension(attr, 0));
} else if (attr == R.styleable.UserAvatarView_frameColor) {
setFrameColor(a.getColorStateList(attr));
} else if (attr == R.styleable.UserAvatarView_badgeDiameter) {
setBadgeDiameter(a.getDimension(attr, 0));
} else if (attr == R.styleable.UserAvatarView_badgeMargin) {
setBadgeMargin(a.getDimension(attr, 0));
}
}
a.recycle();

21
packages/SystemUI/src/com/android/systemui/statusbar/policy/SmartReplyView.java
View File

@@ -127,19 +127,14 @@ public class SmartReplyView extends ViewGroup {
final int length = arr.getIndexCount();
for (int i = 0; i < length; i++) {
int attr = arr.getIndex(i);
switch (attr) {
case R.styleable.SmartReplyView_spacing:
spacing = arr.getDimensionPixelSize(i, 0);
break;
case R.styleable.SmartReplyView_singleLineButtonPaddingHorizontal:
singleLineButtonPaddingHorizontal = arr.getDimensionPixelSize(i, 0);
break;
case R.styleable.SmartReplyView_doubleLineButtonPaddingHorizontal:
doubleLineButtonPaddingHorizontal = arr.getDimensionPixelSize(i, 0);
break;
case R.styleable.SmartReplyView_buttonStrokeWidth:
strokeWidth = arr.getDimensionPixelSize(i, 0);
break;
if (attr == R.styleable.SmartReplyView_spacing) {
spacing = arr.getDimensionPixelSize(i, 0);
} else if (attr == R.styleable.SmartReplyView_singleLineButtonPaddingHorizontal) {
singleLineButtonPaddingHorizontal = arr.getDimensionPixelSize(i, 0);
} else if (attr == R.styleable.SmartReplyView_doubleLineButtonPaddingHorizontal) {
doubleLineButtonPaddingHorizontal = arr.getDimensionPixelSize(i, 0);
} else if (attr == R.styleable.SmartReplyView_buttonStrokeWidth) {
strokeWidth = arr.getDimensionPixelSize(i, 0);
}
}
arr.recycle();

29
packages/SystemUI/tests/Android.mk
View File

@@ -30,37 +30,17 @@ LOCAL_PRIVATE_PLATFORM_APIS := true
LOCAL_COMPATIBILITY_SUITE := device-tests
LOCAL_SRC_FILES := $(call all-java-files-under, src) \
$(call all-Iaidl-files-under, src) \
$(call all-java-files-under, ../src)
$(call all-Iaidl-files-under, src)
LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res \
frameworks/base/packages/SystemUI/res \
frameworks/base/packages/SystemUI/res-keyguard \
LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res
LOCAL_STATIC_ANDROID_LIBRARIES := \
SystemUIPluginLib \
SystemUISharedLib \
androidx.car_car \
androidx.legacy_legacy-support-v4 \
androidx.recyclerview_recyclerview \
androidx.preference_preference \
androidx.appcompat_appcompat \
androidx.mediarouter_mediarouter \
androidx.palette_palette \
androidx.legacy_legacy-preference-v14 \
androidx.leanback_leanback \
androidx.slice_slice-core \
androidx.slice_slice-view \
androidx.slice_slice-builders \
androidx.arch.core_core-runtime \
androidx.lifecycle_lifecycle-extensions \
SystemUI-core
LOCAL_STATIC_JAVA_LIBRARIES := \
metrics-helper-lib \
android-support-test \
mockito-target-inline-minus-junit4 \
SystemUI-proto \
SystemUI-tags \
testables \
truth-prebuilt \
@@ -70,7 +50,6 @@ LOCAL_JNI_SHARED_LIBRARIES := \
libdexmakerjvmtiagent \
libmultiplejvmtiagentsinterferenceagent
LOCAL_JAVA_LIBRARIES := \
android.test.runner \
telephony-common \
@@ -112,8 +91,6 @@ jacoco_exclude := $(subst $(space),$(comma),$(patsubst %,%*,$(local_classes)))
LOCAL_JACK_COVERAGE_INCLUDE_FILTER := com.android.systemui.*
LOCAL_JACK_COVERAGE_EXCLUDE_FILTER := com.android.systemui.tests.*,$(jacoco_exclude)
include frameworks/base/packages/SettingsLib/common.mk
ifeq ($(EXCLUDE_SYSTEMUI_TESTS),)
include $(BUILD_PACKAGE)
endif

15
packages/SystemUI/tests/AndroidManifest.xml
View File

@@ -15,6 +15,8 @@
-->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:androidprv="http://schemas.android.com/apk/prv/res/android"
xmlns:tools="http://schemas.android.com/tools"
package="com.android.systemui.tests">
<uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW" />
@@ -63,6 +65,19 @@
<action android:name="com.android.systemui.action.TEST_ACTION" />
</intent-filter>
</receiver>
<provider android:name="com.android.systemui.keyguard.KeyguardSliceProvider"
android:authorities="com.android.systemui.test.keyguard.disabled"
android:enabled="false"
tools:replace="android:authorities"
tools:node="remove" />
<provider
android:name="androidx.core.content.FileProvider"
android:authorities="com.android.systemui.test.fileprovider"
android:exported="false"
tools:replace="android:authorities"
android:grantUriPermissions="true" />
</application>
<instrumentation android:name="android.testing.TestableInstrumentation"

32
tests/testables/Android.bp Normal file
View File

@@ -0,0 +1,32 @@
//
// Copyright (C) 2017 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.
//
java_library {
name: "testables",
// ANDROIDMK TRANSLATION ERROR: unsupported assignment to LOCAL_MODULE_TAG
// LOCAL_MODULE_TAG := tests
srcs: ["src/**/*.java"],
libs: [
"android.test.runner",
"android.test.mock",
"android-support-test",
"mockito-target-inline-minus-junit4",
],
}

32
tests/testables/Android.mk
View File

@@ -1,32 +0,0 @@
#
# Copyright (C) 2017 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.
#
LOCAL_PATH := $(call my-dir)
include $(CLEAR_VARS)
LOCAL_MODULE := testables
LOCAL_MODULE_TAG := tests
LOCAL_SRC_FILES := $(call all-java-files-under,src)
LOCAL_JAVA_LIBRARIES := android.test.runner android.test.mock \
android-support-test \
mockito-target-inline-minus-junit4
include $(BUILD_STATIC_JAVA_LIBRARY)
include $(call all-makefiles-under,$(LOCAL_PATH))