Snap for 4376088 from 440240db5c1e8d329f70b16cd36976a0f3bfac4e to oc-mr1-release (4fb39d94) · Commits · e / os / android_frameworks_base

core/java/android/app/assist/AssistStructure.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -1265,7 +1265,7 @@ public class AssistStructure implements Parcelable {
		* {@link android.service.autofill.AutofillService} for more details.
		*
		* @return domain-only part of the document. For example, if the full URL is
		* {@code https://my.site/login?user=my_user}, it returns {@code my.site}.
		* {@code https://example.com/login?user=my_user}, it returns {@code example.com}.
		*/
		@Nullable public String getWebDomain() {
		return mWebDomain;

+1 −1

Original line number	Diff line number	Diff line
		@@ -131,7 +131,7 @@ public class StorageStatsSource {
		}

		public long getTotalBytes() {
		return mStats.getCacheBytes() + mStats.getCodeBytes() + mStats.getDataBytes();
		return mStats.getAppBytes() + mStats.getDataBytes();
		}
		}
		}
		No newline at end of file

0 → 100644

+41 −0

Original line number	Diff line number	Diff line
		/*
		* 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.
		*/

		package com.android.settingslib.applications;

		import static com.google.common.truth.Truth.assertThat;

		import android.app.usage.StorageStats;

		import org.junit.Test;
		import org.junit.runner.RunWith;
		import org.junit.runners.JUnit4;

		@RunWith(JUnit4.class)
		public class StorageStatsSourceTest {
		@Test
		public void AppStorageStatsImpl_totalCorrectly() {
		StorageStats storageStats = new StorageStats();
		storageStats.cacheBytes = 1;
		storageStats.codeBytes = 10;
		storageStats.dataBytes = 100;
		StorageStatsSource.AppStorageStatsImpl stats = new StorageStatsSource.AppStorageStatsImpl(
		storageStats);

		// Note that this does not double add the cache (111).
		assertThat(stats.getTotalBytes()).isEqualTo(110);
		}
		}

+1 −1

Original line number	Diff line number	Diff line
		@@ -17,6 +17,6 @@

		<corners android:radius="@dimen/borderless_button_radius" />

		<solid android:color="#CC000000" />
		<solid android:color="?attr/clearAllBackgroundColor" />

		</shape>

+0 −4

Original line number	Diff line number	Diff line
		@@ -203,10 +203,6 @@ public class RecentsView extends FrameLayout {
		mStackButtonShadowDistance.x, mStackButtonShadowDistance.y,
		mStackButtonShadowColor);
		}
		if (Recents.getConfiguration().isLowRamDevice) {
		int bgColor = Utils.getColorAttr(mContext, R.attr.clearAllBackgroundColor);
		mStackActionButton.setBackgroundColor(bgColor);
		}
		}

		// Let's also require dark status and nav bars if the text is dark