Merge "Merging from ub-launcher3-rvc-dev @ build 6617269" into rvc-dev am: a271085506 (33098501) · Commits · e / os / android_packages_apps_Trebuchet

Android.mk

+4 −1

Original line number	Diff line number	Diff line
		@@ -67,7 +67,10 @@ LOCAL_STATIC_ANDROID_LIBRARIES := Launcher3CommonDepsLib
		LOCAL_SRC_FILES := \
		$(call all-java-files-under, src) \
		$(call all-java-files-under, src_shortcuts_overrides) \
		$(call all-java-files-under, src_ui_overrides)
		$(call all-java-files-under, src_ui_overrides) \
		$(call all-java-files-under, ext_tests/src)

		LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/ext_tests/res

		LOCAL_PROGUARD_FLAG_FILES := proguard.flags
		# Proguard is disable for testing. Derivarive prjects to keep proguard enabled

ext_tests/res/values/overrides.xml

0 → 100644

+5 −0

Original line number	Diff line number	Diff line
		<?xml version="1.0" encoding="utf-8"?>
		<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
		<string name="test_information_handler_class" translatable="false">com.android.launcher3.testing.DebugTestInformationHandler</string>
		</resources>

ext_tests/src/com/android/launcher3/testing/DebugTestInformationHandler.java

0 → 100644

+172 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2020 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.
		*/

		package com.android.launcher3.testing;

		import static android.graphics.Bitmap.Config.ARGB_8888;

		import android.content.Context;
		import android.graphics.Bitmap;
		import android.graphics.Color;
		import android.os.Bundle;
		import android.os.Debug;
		import android.system.Os;
		import android.view.View;

		import androidx.annotation.Keep;

		import java.util.ArrayList;
		import java.util.Collection;
		import java.util.LinkedList;
		import java.util.concurrent.CountDownLatch;
		import java.util.concurrent.TimeUnit;

		/**
		* Class to handle requests from tests, including debug ones.
		*/
		public class DebugTestInformationHandler extends TestInformationHandler {
		private static LinkedList sLeaks;
		private static Collection<String> sEvents;

		public DebugTestInformationHandler(Context context) {
		init(context);
		}

		private static void runGcAndFinalizersSync() {
		Runtime.getRuntime().gc();
		Runtime.getRuntime().runFinalization();

		final CountDownLatch fence = new CountDownLatch(1);
		createFinalizationObserver(fence);
		try {
		do {
		Runtime.getRuntime().gc();
		Runtime.getRuntime().runFinalization();
		} while (!fence.await(100, TimeUnit.MILLISECONDS));
		} catch (InterruptedException ex) {
		throw new RuntimeException(ex);
		}
		}

		// Create the observer in the scope of a method to minimize the chance that
		// it remains live in a DEX/machine register at the point of the fence guard.
		// This must be kept to avoid R8 inlining it.
		@Keep
		private static void createFinalizationObserver(CountDownLatch fence) {
		new Object() {
		@Override
		protected void finalize() throws Throwable {
		try {
		fence.countDown();
		} finally {
		super.finalize();
		}
		}
		};
		}

		@Override
		public Bundle call(String method) {
		final Bundle response = new Bundle();
		switch (method) {
		case TestProtocol.REQUEST_APP_LIST_FREEZE_FLAGS: {
		return getLauncherUIProperty(Bundle::putInt,
		l -> l.getAppsView().getAppsStore().getDeferUpdatesFlags());
		}

		case TestProtocol.REQUEST_ENABLE_DEBUG_TRACING:
		TestProtocol.sDebugTracing = true;
		return response;

		case TestProtocol.REQUEST_DISABLE_DEBUG_TRACING:
		TestProtocol.sDebugTracing = false;
		return response;

		case TestProtocol.REQUEST_PID: {
		response.putInt(TestProtocol.TEST_INFO_RESPONSE_FIELD, Os.getpid());
		return response;
		}

		case TestProtocol.REQUEST_TOTAL_PSS_KB: {
		runGcAndFinalizersSync();
		Debug.MemoryInfo mem = new Debug.MemoryInfo();
		Debug.getMemoryInfo(mem);
		response.putInt(TestProtocol.TEST_INFO_RESPONSE_FIELD, mem.getTotalPss());
		return response;
		}

		case TestProtocol.REQUEST_JAVA_LEAK: {
		if (sLeaks == null) sLeaks = new LinkedList();

		// Allocate and dirty the memory.
		final int leakSize = 1024 * 1024;
		final byte[] bytes = new byte[leakSize];
		for (int i = 0; i < leakSize; i += 239) {
		bytes[i] = (byte) (i % 256);
		}
		sLeaks.add(bytes);
		return response;
		}

		case TestProtocol.REQUEST_NATIVE_LEAK: {
		if (sLeaks == null) sLeaks = new LinkedList();

		// Allocate and dirty a bitmap.
		final Bitmap bitmap = Bitmap.createBitmap(512, 512, ARGB_8888);
		bitmap.eraseColor(Color.RED);
		sLeaks.add(bitmap);
		return response;
		}

		case TestProtocol.REQUEST_VIEW_LEAK: {
		if (sLeaks == null) sLeaks = new LinkedList();
		sLeaks.add(new View(mContext));
		return response;
		}

		case TestProtocol.REQUEST_START_EVENT_LOGGING: {
		sEvents = new ArrayList<>();
		TestLogging.setEventConsumer(
		(sequence, event) -> {
		final Collection<String> events = sEvents;
		if (events != null) {
		synchronized (events) {
		events.add(sequence + '/' + event);
		}
		}
		});
		return response;
		}

		case TestProtocol.REQUEST_STOP_EVENT_LOGGING: {
		TestLogging.setEventConsumer(null);
		sEvents = null;
		return response;
		}

		case TestProtocol.REQUEST_GET_TEST_EVENTS: {
		synchronized (sEvents) {
		response.putStringArrayList(
		TestProtocol.TEST_INFO_RESPONSE_FIELD, new ArrayList<>(sEvents));
		}
		return response;
		}

		default:
		return super.call(method);
		}
		}
		}

protos/launcher_atom.proto

+15 −2

Original line number	Diff line number	Diff line
		@@ -96,8 +96,21 @@ enum Attribute {
		ADD_TO_HOMESCREEN = 6; // play install + launcher home setting
		ALLAPPS_PREDICTION = 7; // from prediction bar in all apps container
		HOTSEAT_PREDICTION = 8; // from prediction bar in hotseat container
		SUGGESTED_LABEL = 9; // folder icon's label was suggested
		MANUAL_LABEL = 10; // folder icon's label was manually edited

		// Folder's label is one of the non-empty suggested values.
		SUGGESTED_LABEL = 9;

		// Folder's label is non-empty, manually entered by the user
		// and different from any of suggested values.
		MANUAL_LABEL = 10;

		// Folder's label is not yet assigned( i.e., title == null).
		// Eligible for auto-labeling.
		UNLABELED = 11;

		// Folder's label is empty(i.e., title == "").
		// Not eligible for auto-labeling.
		EMPTY_LABEL = 12;
		}

		// Main app icons

quickstep/AndroidManifest-launcher.xml

+1 −1

Original line number	Diff line number	Diff line
		@@ -52,7 +52,7 @@
		android:configChanges="keyboard\|keyboardHidden\|mcc\|mnc\|navigation\|orientation\|screenSize\|screenLayout\|smallestScreenSize"
		android:resizeableActivity="true"
		android:resumeWhilePausing="true"
		android:taskAffinity="${packageName}.launcher"
		android:taskAffinity=""
		android:enabled="true">
		<intent-filter>
		<action android:name="android.intent.action.MAIN" />