am fe47a8dc: Toggle between primary and managed profile in Print Settings
* commit 'fe47a8dc89fe0393dae16b1c2152c901feab4dcb': Toggle between primary and managed profile in Print Settings
This commit is contained in:
committed by
Android Git Automerger
commit
76cc239fba
20
res/layout/spinner_view.xml
Normal file
20
res/layout/spinner_view.xml
Normal file
@@ -0,0 +1,20 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<!-- Copyright (C) 2014 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.
|
||||
-->
|
||||
|
||||
<Spinner xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:id="@+id/profile_spinner"
|
||||
android:layout_width="fill_parent"
|
||||
android:layout_height="wrap_content" />
|
||||
43
res/layout/user_preference.xml
Normal file
43
res/layout/user_preference.xml
Normal file
@@ -0,0 +1,43 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<!-- Copyright (C) 2014 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:id="@android:id/widget_frame"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:orientation="horizontal"
|
||||
android:paddingStart="?android:attr/listPreferredItemPaddingStart"
|
||||
android:paddingEnd="?android:attr/listPreferredItemPaddingEnd">
|
||||
|
||||
<ImageView
|
||||
android:id="@+android:id/icon"
|
||||
android:layout_width="@dimen/user_icon_diameter"
|
||||
android:layout_height="@dimen/user_icon_diameter"
|
||||
android:layout_gravity="center"
|
||||
android:scaleType="fitCenter" />
|
||||
|
||||
<TextView
|
||||
android:id="@+android:id/title"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:singleLine="true"
|
||||
android:layout_gravity="center"
|
||||
android:labelFor="@+android:id/icon"
|
||||
android:ellipsize="marquee"
|
||||
android:fadingEdge="horizontal"
|
||||
style="@style/TextAppearance.Medium"/>
|
||||
|
||||
</LinearLayout>
|
||||
@@ -201,4 +201,7 @@
|
||||
<!-- Sim Card Name length -->
|
||||
<integer name="sim_name_length">32</integer>
|
||||
|
||||
<!-- Diameter of a round user icon -->
|
||||
<dimen name="user_icon_diameter">56dp</dimen>
|
||||
|
||||
</resources>
|
||||
|
||||
141
src/com/android/settings/UserSpinnerAdapter.java
Normal file
141
src/com/android/settings/UserSpinnerAdapter.java
Normal file
@@ -0,0 +1,141 @@
|
||||
/*
|
||||
* Copyright (C) 2014 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;
|
||||
|
||||
import android.content.Context;
|
||||
import android.content.pm.UserInfo;
|
||||
import android.database.DataSetObserver;
|
||||
import android.graphics.Bitmap;
|
||||
import android.graphics.drawable.Drawable;
|
||||
import android.os.UserHandle;
|
||||
import android.os.UserManager;
|
||||
import android.view.LayoutInflater;
|
||||
import android.view.View;
|
||||
import android.view.ViewGroup;
|
||||
import android.widget.ImageView;
|
||||
import android.widget.SpinnerAdapter;
|
||||
import android.widget.TextView;
|
||||
|
||||
import com.android.settings.drawable.CircleFramedDrawable;
|
||||
|
||||
import java.util.ArrayList;
|
||||
|
||||
/**
|
||||
* Adapter for a spinner that shows a list of users.
|
||||
*/
|
||||
public class UserSpinnerAdapter implements SpinnerAdapter {
|
||||
// TODO: Update UI. See: http://b/16518801
|
||||
/** Holder for user details */
|
||||
public static class UserDetails {
|
||||
private final UserHandle mUserHandle;
|
||||
private final String name;
|
||||
private final Drawable icon;
|
||||
|
||||
public UserDetails(UserHandle userHandle, UserManager um, Context context) {
|
||||
mUserHandle = userHandle;
|
||||
UserInfo userInfo = um.getUserInfo(mUserHandle.getIdentifier());
|
||||
name = userInfo.name;
|
||||
Bitmap bitmap = um.getUserIcon(userHandle.getIdentifier());
|
||||
if (bitmap != null) {
|
||||
icon = CircleFramedDrawable.getInstance(context, bitmap);
|
||||
} else {
|
||||
icon = null;
|
||||
}
|
||||
}
|
||||
}
|
||||
private ArrayList<UserDetails> data;
|
||||
private final LayoutInflater mInflater;
|
||||
|
||||
public UserSpinnerAdapter(Context context, ArrayList<UserDetails> users) {
|
||||
if (users == null) {
|
||||
throw new IllegalArgumentException("A list of user details must be provided");
|
||||
}
|
||||
this.data = users;
|
||||
mInflater = (LayoutInflater) context.getSystemService(Context.LAYOUT_INFLATER_SERVICE);
|
||||
}
|
||||
|
||||
public UserHandle getUserHandle(int position) {
|
||||
if (position < 0 || position >= data.size()) {
|
||||
return null;
|
||||
}
|
||||
return data.get(position).mUserHandle;
|
||||
}
|
||||
|
||||
@Override
|
||||
public View getDropDownView(int position, View convertView, ViewGroup parent) {
|
||||
final View row = convertView != null ? convertView : createUser(parent);
|
||||
|
||||
UserDetails user = data.get(position);
|
||||
((ImageView) row.findViewById(android.R.id.icon)).setImageDrawable(user.icon);
|
||||
((TextView) row.findViewById(android.R.id.title)).setText(user.name);
|
||||
return row;
|
||||
}
|
||||
|
||||
private View createUser(ViewGroup parent) {
|
||||
return mInflater.inflate(R.layout.user_preference, parent, false);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void registerDataSetObserver(DataSetObserver observer) {
|
||||
// We don't support observers
|
||||
}
|
||||
|
||||
@Override
|
||||
public void unregisterDataSetObserver(DataSetObserver observer) {
|
||||
// We don't support observers
|
||||
}
|
||||
|
||||
@Override
|
||||
public int getCount() {
|
||||
return data.size();
|
||||
}
|
||||
|
||||
@Override
|
||||
public UserDetails getItem(int position) {
|
||||
return data.get(position);
|
||||
}
|
||||
|
||||
@Override
|
||||
public long getItemId(int position) {
|
||||
return data.get(position).mUserHandle.getIdentifier();
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean hasStableIds() {
|
||||
return false;
|
||||
}
|
||||
|
||||
@Override
|
||||
public View getView(int position, View convertView, ViewGroup parent) {
|
||||
return getDropDownView(position, convertView, parent);
|
||||
}
|
||||
|
||||
@Override
|
||||
public int getItemViewType(int position) {
|
||||
return 0;
|
||||
}
|
||||
|
||||
@Override
|
||||
public int getViewTypeCount() {
|
||||
return 1;
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean isEmpty() {
|
||||
return data.isEmpty();
|
||||
}
|
||||
}
|
||||
@@ -68,7 +68,7 @@ import android.widget.TabWidget;
|
||||
|
||||
import com.android.settings.dashboard.DashboardCategory;
|
||||
import com.android.settings.dashboard.DashboardTile;
|
||||
import com.android.settings.users.CircleFramedDrawable;
|
||||
import com.android.settings.drawable.CircleFramedDrawable;
|
||||
|
||||
import java.io.IOException;
|
||||
import java.io.InputStream;
|
||||
|
||||
@@ -14,7 +14,7 @@
|
||||
* limitations under the License.
|
||||
*/
|
||||
|
||||
package com.android.settings.users;
|
||||
package com.android.settings.drawable;
|
||||
|
||||
import android.content.Context;
|
||||
import android.content.res.Resources;
|
||||
@@ -16,6 +16,7 @@
|
||||
|
||||
package com.android.settings.print;
|
||||
|
||||
import android.app.Activity;
|
||||
import android.app.ActivityManager;
|
||||
import android.app.LoaderManager.LoaderCallbacks;
|
||||
import android.content.AsyncTaskLoader;
|
||||
@@ -31,6 +32,9 @@ import android.net.Uri;
|
||||
import android.os.Bundle;
|
||||
import android.os.Handler;
|
||||
import android.os.Message;
|
||||
import android.os.UserHandle;
|
||||
import android.os.UserManager;
|
||||
import android.os.Process;
|
||||
import android.preference.Preference;
|
||||
import android.preference.PreferenceCategory;
|
||||
import android.preference.PreferenceScreen;
|
||||
@@ -50,9 +54,12 @@ import android.view.MenuInflater;
|
||||
import android.view.MenuItem;
|
||||
import android.view.View;
|
||||
import android.view.ViewGroup;
|
||||
import android.widget.AdapterView;
|
||||
import android.widget.TextView;
|
||||
|
||||
import com.android.internal.content.PackageMonitor;
|
||||
import com.android.settings.UserSpinnerAdapter;
|
||||
import com.android.settings.UserSpinnerAdapter.UserDetails;
|
||||
import com.android.settings.DialogCreatable;
|
||||
import com.android.settings.R;
|
||||
import com.android.settings.SettingsPreferenceFragment;
|
||||
@@ -64,11 +71,14 @@ import java.text.DateFormat;
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
|
||||
import android.widget.AdapterView.OnItemSelectedListener;
|
||||
import android.widget.Spinner;
|
||||
|
||||
/**
|
||||
* Fragment with the top level print settings.
|
||||
*/
|
||||
public class PrintSettingsFragment extends SettingsPreferenceFragment
|
||||
implements DialogCreatable, Indexable {
|
||||
implements DialogCreatable, Indexable, OnItemSelectedListener {
|
||||
|
||||
private static final int LOADER_ID_PRINT_JOBS_LOADER = 1;
|
||||
|
||||
@@ -113,6 +123,14 @@ public class PrintSettingsFragment extends SettingsPreferenceFragment
|
||||
private PreferenceCategory mPrintServicesCategory;
|
||||
|
||||
private PrintJobsController mPrintJobsController;
|
||||
private Context mContext;
|
||||
private UserSpinnerAdapter mProfileSpinnerAdapter;
|
||||
|
||||
@Override
|
||||
public void onAttach(Activity activity) {
|
||||
super.onAttach(activity);
|
||||
mContext = activity;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onCreate(Bundle icicle) {
|
||||
@@ -169,6 +187,27 @@ public class PrintSettingsFragment extends SettingsPreferenceFragment
|
||||
textView.setText(R.string.print_no_services_installed);
|
||||
contentRoot.addView(emptyView);
|
||||
getListView().setEmptyView(emptyView);
|
||||
|
||||
final UserManager um = (UserManager) getSystemService(Context.USER_SERVICE);
|
||||
List<UserHandle> userProfiles = um.getUserProfiles();
|
||||
if (userProfiles.size() >= 2) {
|
||||
Spinner spinner = (Spinner) getActivity().getLayoutInflater().inflate(
|
||||
R.layout.spinner_view, null);
|
||||
|
||||
UserHandle myUserHandle = Process.myUserHandle();
|
||||
userProfiles.remove(myUserHandle);
|
||||
userProfiles.add(0, myUserHandle);
|
||||
ArrayList<UserDetails> userDetails = new ArrayList<UserDetails>(userProfiles.size());
|
||||
final int count = userProfiles.size();
|
||||
for (int i = 0; i < count; i++) {
|
||||
userDetails.add(new UserDetails(userProfiles.get(i), um, mContext));
|
||||
}
|
||||
|
||||
mProfileSpinnerAdapter = new UserSpinnerAdapter(mContext, userDetails);
|
||||
spinner.setAdapter(mProfileSpinnerAdapter);
|
||||
spinner.setOnItemSelectedListener(this);
|
||||
setPinnedHeaderView(spinner);
|
||||
}
|
||||
}
|
||||
|
||||
private void updateServicesPreferences() {
|
||||
@@ -271,6 +310,22 @@ public class PrintSettingsFragment extends SettingsPreferenceFragment
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onItemSelected(AdapterView<?> parent, View view, int position, long id) {
|
||||
UserHandle selectedUser = mProfileSpinnerAdapter.getUserHandle(position);
|
||||
if (selectedUser.getIdentifier() != UserHandle.myUserId()) {
|
||||
Intent intent = new Intent(Settings.ACTION_PRINT_SETTINGS);
|
||||
intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
|
||||
mContext.startActivityAsUser(intent, selectedUser);
|
||||
getActivity().finish();
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onNothingSelected(AdapterView<?> parent) {
|
||||
// Nothing to do
|
||||
}
|
||||
|
||||
private class SettingsPackageMonitor extends PackageMonitor {
|
||||
@Override
|
||||
public void onPackageAdded(String packageName, int uid) {
|
||||
|
||||
@@ -17,7 +17,6 @@
|
||||
package com.android.settings.users;
|
||||
|
||||
import android.app.Activity;
|
||||
import android.app.AppGlobals;
|
||||
import android.appwidget.AppWidgetManager;
|
||||
import android.content.BroadcastReceiver;
|
||||
import android.content.Context;
|
||||
@@ -57,13 +56,13 @@ import android.view.View.OnClickListener;
|
||||
import android.view.inputmethod.InputMethodInfo;
|
||||
import android.view.inputmethod.InputMethodManager;
|
||||
import android.view.ViewGroup;
|
||||
import android.widget.CheckBox;
|
||||
import android.widget.CompoundButton;
|
||||
import android.widget.CompoundButton.OnCheckedChangeListener;
|
||||
import android.widget.Switch;
|
||||
|
||||
import com.android.settings.R;
|
||||
import com.android.settings.SettingsPreferenceFragment;
|
||||
import com.android.settings.drawable.CircleFramedDrawable;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.Collections;
|
||||
|
||||
@@ -37,6 +37,7 @@ import android.widget.EditText;
|
||||
import android.widget.ImageView;
|
||||
|
||||
import com.android.settings.R;
|
||||
import com.android.settings.drawable.CircleFramedDrawable;
|
||||
|
||||
/**
|
||||
* This class encapsulates a Dialog for editing the user nickname and photo.
|
||||
|
||||
@@ -44,6 +44,7 @@ import android.widget.ListAdapter;
|
||||
import android.widget.ListPopupWindow;
|
||||
|
||||
import com.android.settings.R;
|
||||
import com.android.settings.drawable.CircleFramedDrawable;
|
||||
|
||||
import java.io.File;
|
||||
import java.io.FileNotFoundException;
|
||||
|
||||
@@ -37,7 +37,6 @@ import android.content.SharedPreferences;
|
||||
import android.content.pm.UserInfo;
|
||||
import android.content.res.Resources;
|
||||
import android.graphics.Bitmap;
|
||||
import android.graphics.BitmapFactory;
|
||||
import android.graphics.Canvas;
|
||||
import android.graphics.drawable.Drawable;
|
||||
import android.os.AsyncTask;
|
||||
@@ -69,6 +68,7 @@ import com.android.settings.SelectableEditTextPreference;
|
||||
import com.android.settings.SettingsActivity;
|
||||
import com.android.settings.SettingsPreferenceFragment;
|
||||
import com.android.settings.Utils;
|
||||
import com.android.settings.drawable.CircleFramedDrawable;
|
||||
|
||||
/**
|
||||
* Screen that manages the list of users on the device.
|
||||
|
||||
Reference in New Issue
Block a user