Merge "Import FooterPreferenceMixin and its dependencies into SettingsLib." (8c85f622) · Commits · e / os / android_frameworks_base

packages/SettingsLib/res/drawable/ic_info_outline_24dp.xml

0 → 100644

+26 −0

Original line number	Diff line number	Diff line
		<?xml version="1.0" encoding="utf-8"?>
		<!--
		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.
		-->
		<vector xmlns:android="http://schemas.android.com/apk/res/android"
		android:width="24dp"
		android:height="24dp"
		android:viewportWidth="24.0"
		android:viewportHeight="24.0"
		android:tint="?android:attr/textColorSecondary">
		<path
		android:fillColor="#000000"
		android:pathData="M11,17h2v-6h-2v6zM12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zM12,20c-4.41,0 -8,-3.59 -8,-8s3.59,-8 8,-8 8,3.59 8,8 -3.59,8 -8,8zM11,9h2L13,7h-2v2z"/>
		</vector>

packages/SettingsLib/res/layout/preference_footer.xml

0 → 100644

+54 −0

Original line number	Diff line number	Diff line
		<?xml version="1.0" encoding="utf-8"?>
		<!--
		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.
		-->

		<LinearLayout
		xmlns:android="http://schemas.android.com/apk/res/android"
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:minHeight="?android:attr/listPreferredItemHeight"
		android:paddingStart="?android:attr/listPreferredItemPaddingStart"
		android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"
		android:background="?android:attr/selectableItemBackground"
		android:clipToPadding="false">

		<LinearLayout
		android:id="@+id/icon_container"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:minWidth="60dp"
		android:gravity="start\|top"
		android:orientation="horizontal"
		android:paddingEnd="12dp"
		android:paddingTop="20dp"
		android:paddingBottom="4dp">
		<ImageView
		android:id="@android:id/icon"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content" />
		</LinearLayout>

		<com.android.settingslib.widget.LinkTextView
		android:id="@android:id/title"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:paddingBottom="16dp"
		android:paddingTop="16dp"
		android:maxLines="10"
		android:textColor="?android:attr/textColorSecondary"
		android:ellipsize="marquee" />

		</LinearLayout>
		No newline at end of file

packages/SettingsLib/res/values/attrs.xml

+2 −0

Original line number	Diff line number	Diff line
		@@ -54,4 +54,6 @@
		<attr name="android:gravity" />
		</declare-styleable>

		<attr name="footerPreferenceStyle" format="reference" />

		</resources>

packages/SettingsLib/src/com/android/settingslib/core/lifecycle/Lifecycle.java

0 → 100644

+159 −0

Original line number	Diff line number	Diff line
		/*
		* 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.
		*/
		package com.android.settingslib.core.lifecycle;

		import android.annotation.UiThread;
		import android.content.Context;
		import android.os.Bundle;
		import android.support.annotation.Nullable;
		import android.support.v7.preference.PreferenceScreen;
		import android.view.Menu;
		import android.view.MenuInflater;
		import android.view.MenuItem;

		import com.android.settingslib.core.lifecycle.events.OnAttach;
		import com.android.settingslib.core.lifecycle.events.OnCreate;
		import com.android.settingslib.core.lifecycle.events.OnCreateOptionsMenu;
		import com.android.settingslib.core.lifecycle.events.OnDestroy;
		import com.android.settingslib.core.lifecycle.events.OnOptionsItemSelected;
		import com.android.settingslib.core.lifecycle.events.OnPause;
		import com.android.settingslib.core.lifecycle.events.OnPrepareOptionsMenu;
		import com.android.settingslib.core.lifecycle.events.OnResume;
		import com.android.settingslib.core.lifecycle.events.OnSaveInstanceState;
		import com.android.settingslib.core.lifecycle.events.OnStart;
		import com.android.settingslib.core.lifecycle.events.OnStop;
		import com.android.settingslib.core.lifecycle.events.SetPreferenceScreen;
		import com.android.settingslib.utils.ThreadUtils;

		import java.util.ArrayList;
		import java.util.List;

		/**
		* Dispatcher for lifecycle events.
		*/
		public class Lifecycle {

		protected final List<LifecycleObserver> mObservers = new ArrayList<>();

		/**
		* Registers a new observer of lifecycle events.
		*/
		@UiThread
		public <T extends LifecycleObserver> T addObserver(T observer) {
		ThreadUtils.ensureMainThread();
		mObservers.add(observer);
		return observer;
		}

		public void onAttach(Context context) {
		for (LifecycleObserver observer : mObservers) {
		if (observer instanceof OnAttach) {
		((OnAttach) observer).onAttach(context);
		}
		}
		}

		public void onCreate(Bundle savedInstanceState) {
		for (LifecycleObserver observer : mObservers) {
		if (observer instanceof OnCreate) {
		((OnCreate) observer).onCreate(savedInstanceState);
		}
		}
		}

		public void onStart() {
		for (LifecycleObserver observer : mObservers) {
		if (observer instanceof OnStart) {
		((OnStart) observer).onStart();
		}
		}
		}

		public void setPreferenceScreen(PreferenceScreen preferenceScreen) {
		for (LifecycleObserver observer : mObservers) {
		if (observer instanceof SetPreferenceScreen) {
		((SetPreferenceScreen) observer).setPreferenceScreen(preferenceScreen);
		}
		}
		}

		public void onResume() {
		for (LifecycleObserver observer : mObservers) {
		if (observer instanceof OnResume) {
		((OnResume) observer).onResume();
		}
		}
		}

		public void onPause() {
		for (LifecycleObserver observer : mObservers) {
		if (observer instanceof OnPause) {
		((OnPause) observer).onPause();
		}
		}
		}

		public void onSaveInstanceState(Bundle outState) {
		for (LifecycleObserver observer : mObservers) {
		if (observer instanceof OnSaveInstanceState) {
		((OnSaveInstanceState) observer).onSaveInstanceState(outState);
		}
		}
		}

		public void onStop() {
		for (LifecycleObserver observer : mObservers) {
		if (observer instanceof OnStop) {
		((OnStop) observer).onStop();
		}
		}
		}

		public void onDestroy() {
		for (LifecycleObserver observer : mObservers) {
		if (observer instanceof OnDestroy) {
		((OnDestroy) observer).onDestroy();
		}
		}
		}

		public void onCreateOptionsMenu(final Menu menu, final @Nullable MenuInflater inflater) {
		for (LifecycleObserver observer : mObservers) {
		if (observer instanceof OnCreateOptionsMenu) {
		((OnCreateOptionsMenu) observer).onCreateOptionsMenu(menu, inflater);
		}
		}
		}

		public void onPrepareOptionsMenu(final Menu menu) {
		for (LifecycleObserver observer : mObservers) {
		if (observer instanceof OnPrepareOptionsMenu) {
		((OnPrepareOptionsMenu) observer).onPrepareOptionsMenu(menu);
		}
		}
		}

		public boolean onOptionsItemSelected(final MenuItem menuItem) {
		for (LifecycleObserver observer : mObservers) {
		if (observer instanceof OnOptionsItemSelected) {
		if (((OnOptionsItemSelected) observer).onOptionsItemSelected(menuItem)) {
		return true;
		}
		}
		}
		return false;
		}
		}

packages/SettingsLib/src/com/android/settingslib/core/lifecycle/LifecycleObserver.java

0 → 100644

+22 −0

Original line number	Diff line number	Diff line
		/*
		* 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.
		*/
		package com.android.settingslib.core.lifecycle;

		/**
		* Observer of lifecycle events.
		*/
		public interface LifecycleObserver {
		}