resolve merge conflicts of c10abb25f3 to cw-e-dev.
am: c3d14f58d8
* commit 'c3d14f58d80cc5ed8b60ee1782d38643c08734e7':
Clean up package installer styling
diff --git a/src/com/android/packageinstaller/permission/ui/ManagePermissionsActivity.java b/src/com/android/packageinstaller/permission/ui/ManagePermissionsActivity.java
index 419dbf4..a92b0ea 100644
--- a/src/com/android/packageinstaller/permission/ui/ManagePermissionsActivity.java
+++ b/src/com/android/packageinstaller/permission/ui/ManagePermissionsActivity.java
@@ -21,9 +21,12 @@
import android.os.Bundle;
import android.util.Log;
import com.android.packageinstaller.permission.utils.Utils;
+<<<<<<< HEAD
import com.android.packageinstaller.permission.ui.wear.AppPermissionsFragmentWear;
import com.android.packageinstaller.DeviceUtils;
+=======
+>>>>>>> c10abb25f3864e56b2a24ef3661511cd78921225
public final class ManagePermissionsActivity extends OverlayTouchActivity {
private static final String LOG_TAG = "ManagePermissionsActivity";
diff --git a/src/com/android/packageinstaller/permission/ui/PermissionsFrameFragment.java b/src/com/android/packageinstaller/permission/ui/PermissionsFrameFragment.java
deleted file mode 100644
index 35b6f1a..0000000
--- a/src/com/android/packageinstaller/permission/ui/PermissionsFrameFragment.java
+++ /dev/null
@@ -1,188 +0,0 @@
-package com.android.packageinstaller.permission.ui;
-
-import android.annotation.Nullable;
-import android.os.Bundle;
-import android.support.v14.preference.PreferenceFragment;
-import android.support.v17.leanback.widget.VerticalGridView;
-import android.support.v7.preference.PreferenceScreen;
-import android.support.v7.widget.RecyclerView;
-import android.support.v7.widget.RecyclerView.AdapterDataObserver;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.view.animation.Animation;
-import android.view.animation.Animation.AnimationListener;
-import android.view.animation.AnimationUtils;
-import android.widget.TextView;
-
-import com.android.packageinstaller.DeviceUtils;
-import com.android.packageinstaller.R;
-import com.android.packageinstaller.permission.utils.Utils;
-
-public abstract class PermissionsFrameFragment extends PreferenceFragment {
-
- private static final float WINDOW_ALIGNMENT_OFFSET_PERCENT = 50;
-
- private ViewGroup mPreferencesContainer;
-
- // TV-specific instance variables
- @Nullable private VerticalGridView mGridView;
-
- private View mLoadingView;
- private ViewGroup mPrefsView;
- private boolean mIsLoading;
-
- /**
- * Returns the view group that holds the preferences objects. This will
- * only be set after {@link #onCreateView} has been called.
- */
- protected final ViewGroup getPreferencesContainer() {
- return mPreferencesContainer;
- }
-
- @Override
- public View onCreateView(LayoutInflater inflater, ViewGroup container,
- Bundle savedInstanceState) {
- ViewGroup rootView = (ViewGroup) inflater.inflate(R.layout.permissions_frame, container,
- false);
- mPrefsView = (ViewGroup) rootView.findViewById(R.id.prefs_container);
- if (mPrefsView == null) {
- mPrefsView = rootView;
- }
- mLoadingView = rootView.findViewById(R.id.loading_container);
- mPreferencesContainer = (ViewGroup) super.onCreateView(
- inflater, mPrefsView, savedInstanceState);
- setLoading(mIsLoading, false, true /* force */);
- mPrefsView.addView(mPreferencesContainer);
- return rootView;
- }
-
- @Override
- public void onCreatePreferences(@Nullable Bundle savedInstanceState, String rootKey) {
- PreferenceScreen preferences = getPreferenceScreen();
- if (preferences == null) {
- preferences = getPreferenceManager().createPreferenceScreen(getActivity());
- setPreferenceScreen(preferences);
- }
- }
-
- protected void setLoading(boolean loading, boolean animate) {
- setLoading(loading, animate, false);
- }
-
- private void setLoading(boolean loading, boolean animate, boolean force) {
- if (mIsLoading != loading || force) {
- mIsLoading = loading;
- if (getView() == null) {
- // If there is no created view, there is no reason to animate.
- animate = false;
- }
- if (mPrefsView != null) {
- setViewShown(mPrefsView, !loading, animate);
- }
- if (mLoadingView != null) {
- setViewShown(mLoadingView, loading, animate);
- }
- }
- }
-
- private void setViewShown(final View view, boolean shown, boolean animate) {
- if (animate) {
- Animation animation = AnimationUtils.loadAnimation(getContext(),
- shown ? android.R.anim.fade_in : android.R.anim.fade_out);
- if (shown) {
- view.setVisibility(View.VISIBLE);
- } else {
- animation.setAnimationListener(new AnimationListener() {
- @Override
- public void onAnimationStart(Animation animation) {
- }
-
- @Override
- public void onAnimationRepeat(Animation animation) {
- }
-
- @Override
- public void onAnimationEnd(Animation animation) {
- view.setVisibility(View.INVISIBLE);
- }
- });
- }
- view.startAnimation(animation);
- } else {
- view.clearAnimation();
- view.setVisibility(shown ? View.VISIBLE : View.INVISIBLE);
- }
- }
-
- @Override
- public RecyclerView onCreateRecyclerView(LayoutInflater inflater, ViewGroup parent,
- Bundle savedInstanceState) {
- if (DeviceUtils.isTelevision(getContext())) {
- mGridView = (VerticalGridView) inflater.inflate(
- R.layout.leanback_preferences_list, parent, false);
- mGridView.setWindowAlignmentOffset(0);
- mGridView.setWindowAlignmentOffsetPercent(WINDOW_ALIGNMENT_OFFSET_PERCENT);
- mGridView.setWindowAlignment(VerticalGridView.WINDOW_ALIGN_NO_EDGE);
- mGridView.setFocusScrollStrategy(VerticalGridView.FOCUS_SCROLL_ALIGNED);
- return mGridView;
- } else {
- return super.onCreateRecyclerView(inflater, parent, savedInstanceState);
- }
- }
-
- @Override
- protected RecyclerView.Adapter<?> onCreateAdapter(PreferenceScreen preferenceScreen) {
- final RecyclerView.Adapter<?> adapter = super.onCreateAdapter(preferenceScreen);
-
- if (adapter != null) {
- final TextView emptyView = (TextView) getView().findViewById(R.id.no_permissions);
- onSetEmptyText(emptyView);
- final RecyclerView recyclerView = getListView();
- adapter.registerAdapterDataObserver(new AdapterDataObserver() {
- @Override
- public void onChanged() {
- checkEmpty();
- }
-
- @Override
- public void onItemRangeInserted(int positionStart, int itemCount) {
- checkEmpty();
- }
-
- @Override
- public void onItemRangeRemoved(int positionStart, int itemCount) {
- checkEmpty();
- }
-
- private void checkEmpty() {
- boolean isEmpty = adapter.getItemCount() == 0;
- emptyView.setVisibility(isEmpty ? View.VISIBLE : View.GONE);
- recyclerView.setVisibility(isEmpty ? View.GONE : View.VISIBLE);
- if (!isEmpty && mGridView != null) {
- mGridView.requestFocus();
- }
- }
- });
-
- boolean isEmpty = adapter.getItemCount() == 0;
- emptyView.setVisibility(isEmpty ? View.VISIBLE : View.GONE);
- recyclerView.setVisibility(isEmpty ? View.GONE : View.VISIBLE);
- if (!isEmpty && mGridView != null) {
- mGridView.requestFocus();
- }
- }
-
- return adapter;
- }
-
- /**
- * Hook for subclasses to change the default text of the empty view.
- * Base implementation leaves the default empty view text.
- *
- * @param textView the empty text view
- */
- protected void onSetEmptyText(TextView textView) {
- }
-}
-
diff --git a/src/com/android/packageinstaller/permission/ui/SettingsWithHeader.java b/src/com/android/packageinstaller/permission/ui/SettingsWithHeader.java
deleted file mode 100644
index 976fee1..0000000
--- a/src/com/android/packageinstaller/permission/ui/SettingsWithHeader.java
+++ /dev/null
@@ -1,86 +0,0 @@
-/*
- * Copyright (C) 2015 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.packageinstaller.permission.ui;
-
-import android.content.Intent;
-import android.graphics.drawable.Drawable;
-import android.os.Bundle;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.View.OnClickListener;
-import android.view.ViewGroup;
-import android.widget.ImageView;
-import android.widget.TextView;
-
-import com.android.packageinstaller.DeviceUtils;
-import com.android.packageinstaller.R;
-import com.android.packageinstaller.permission.utils.Utils;
-
-public abstract class SettingsWithHeader extends PermissionsFrameFragment
- implements OnClickListener {
-
- private View mHeader;
- protected Intent mInfoIntent;
- protected Drawable mIcon;
- protected CharSequence mLabel;
-
- @Override
- public View onCreateView(LayoutInflater inflater, ViewGroup container,
- Bundle savedInstanceState) {
- ViewGroup root = (ViewGroup) super.onCreateView(inflater, container, savedInstanceState);
-
- if (!DeviceUtils.isTelevision(getContext())) {
- mHeader = inflater.inflate(R.layout.header, root, false);
- getPreferencesContainer().addView(mHeader, 0);
- updateHeader();
- }
-
- return root;
- }
-
- public void setHeader(Drawable icon, CharSequence label, Intent infoIntent) {
- mIcon = icon;
- mLabel = label;
- mInfoIntent = infoIntent;
- updateHeader();
- }
-
- private void updateHeader() {
- if (mHeader != null) {
- final ImageView appIcon = (ImageView) mHeader.findViewById(R.id.icon);
- appIcon.setImageDrawable(mIcon);
-
- final TextView appName = (TextView) mHeader.findViewById(R.id.name);
- appName.setText(mLabel);
-
- final View info = mHeader.findViewById(R.id.info);
- if (mInfoIntent == null) {
- info.setVisibility(View.GONE);
- } else {
- info.setVisibility(View.VISIBLE);
- info.setClickable(true);
- info.setOnClickListener(this);
- }
- }
- }
-
- @Override
- public void onClick(View v) {
- getActivity().startActivity(mInfoIntent);
- }
-
-}
