Merge "resolve merge conflicts of d42d9a41f6712a07d79fba3f61750f7c7477b8af to sc-dev" into sc-dev (321f4133) · Commits · e / os / android_packages_apps_Settings

src/com/android/settings/datausage/AppDataUsageActivity.java

+0 −1

Original line number	Diff line number	Diff line
		@@ -17,7 +17,6 @@ package com.android.settings.datausage;
		import android.content.Intent;
		import android.content.pm.PackageManager;
		import android.os.Bundle;
		import android.provider.Settings;
		import android.util.Log;

		import com.android.settings.R;

src/com/android/settings/datausage/UnrestrictedDataAccessPreferenceController.java

+0 −1

Original line number	Diff line number	Diff line
		@@ -42,7 +42,6 @@ import java.util.ArrayList;
		import java.util.Set;
		import java.util.TreeSet;


		public class UnrestrictedDataAccessPreferenceController extends BasePreferenceController implements
		LifecycleObserver, OnStart, OnStop, OnDestroy, ApplicationsState.Callbacks,
		AppStateBaseBridge.Callback, Preference.OnPreferenceChangeListener {

src/com/android/settings/deviceinfo/MigrateEstimateTask.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -29,9 +29,9 @@ import android.os.UserHandle;
		import android.os.UserManager;
		import android.os.storage.StorageManager;
		import android.os.storage.VolumeInfo;
		import android.util.Log;
		import android.text.format.DateUtils;
		import android.text.format.Formatter;
		import android.util.Log;

		import java.io.IOException;
		import java.util.UUID;

src/com/android/settings/deviceinfo/PercentageBarChart.java

+0 −160

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2010 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.settings.deviceinfo;

		import android.content.Context;
		import android.content.res.TypedArray;
		import android.graphics.Canvas;
		import android.graphics.Color;
		import android.graphics.Paint;
		import android.util.AttributeSet;
		import android.view.View;

		import com.android.settings.R;

		import java.util.Collection;

		/**
		* Draws a horizontal bar chart with colored slices, each represented by
		* {@link Entry}.
		*/
		public class PercentageBarChart extends View {
		private final Paint mEmptyPaint = new Paint();

		private Collection<Entry> mEntries;

		private int mMinTickWidth = 1;

		public static class Entry implements Comparable<Entry> {
		public final int order;
		public final float percentage;
		public final Paint paint;

		protected Entry(int order, float percentage, Paint paint) {
		this.order = order;
		this.percentage = percentage;
		this.paint = paint;
		}

		@Override
		public int compareTo(Entry another) {
		return order - another.order;
		}
		}

		public PercentageBarChart(Context context, AttributeSet attrs) {
		super(context, attrs);

		TypedArray a = context.obtainStyledAttributes(attrs, R.styleable.PercentageBarChart);
		mMinTickWidth = a.getDimensionPixelSize(R.styleable.PercentageBarChart_minTickWidth, 1);
		int emptyColor = a.getColor(R.styleable.PercentageBarChart_emptyColor, Color.BLACK);
		a.recycle();

		mEmptyPaint.setColor(emptyColor);
		mEmptyPaint.setStyle(Paint.Style.FILL);
		}

		@Override
		protected void onDraw(Canvas canvas) {
		super.onDraw(canvas);

		final int left = getPaddingLeft();
		final int right = getWidth() - getPaddingRight();
		final int top = getPaddingTop();
		final int bottom = getHeight() - getPaddingBottom();

		final int width = right - left;

		final boolean isLayoutRtl = isLayoutRtl();
		if (isLayoutRtl) {
		float nextX = right;

		if (mEntries != null) {
		for (final Entry e : mEntries) {
		final float entryWidth;
		if (e.percentage == 0.0f) {
		entryWidth = 0.0f;
		} else {
		entryWidth = Math.max(mMinTickWidth, width * e.percentage);
		}

		final float lastX = nextX - entryWidth;
		if (lastX < left) {
		canvas.drawRect(left, top, nextX, bottom, e.paint);
		return;
		}

		canvas.drawRect(lastX, top, nextX, bottom, e.paint);
		nextX = lastX;
		}
		}

		canvas.drawRect(left, top, nextX, bottom, mEmptyPaint);
		} else {
		float lastX = left;

		if (mEntries != null) {
		for (final Entry e : mEntries) {
		final float entryWidth;
		if (e.percentage == 0.0f) {
		entryWidth = 0.0f;
		} else {
		entryWidth = Math.max(mMinTickWidth, width * e.percentage);
		}

		final float nextX = lastX + entryWidth;
		if (nextX > right) {
		canvas.drawRect(lastX, top, right, bottom, e.paint);
		return;
		}

		canvas.drawRect(lastX, top, nextX, bottom, e.paint);
		lastX = nextX;
		}
		}

		canvas.drawRect(lastX, top, right, bottom, mEmptyPaint);
		}
		}

		/**
		* Sets the background for this chart. Callers are responsible for later
		* calling {@link #invalidate()}.
		*/
		@Override
		public void setBackgroundColor(int color) {
		mEmptyPaint.setColor(color);
		}

		/**
		* Adds a new slice to the percentage bar chart. Callers are responsible for
		* later calling {@link #invalidate()}.
		*
		* @param percentage the total width that
		* @param color the color to draw the entry
		*/
		public static Entry createEntry(int order, float percentage, int color) {
		final Paint p = new Paint();
		p.setColor(color);
		p.setStyle(Paint.Style.FILL);
		return new Entry(order, percentage, p);
		}

		public void setEntries(Collection<Entry> entries) {
		mEntries = entries;
		}
		}

src/com/android/settings/deviceinfo/StorageVolumePreference.java

+0 −1

Original line number	Diff line number	Diff line
		@@ -19,7 +19,6 @@ package com.android.settings.deviceinfo;
		import android.app.usage.StorageStatsManager;
		import android.content.Context;
		import android.content.res.ColorStateList;
		import android.graphics.Color;
		import android.graphics.drawable.Drawable;
		import android.os.storage.StorageManager;
		import android.os.storage.VolumeInfo;