Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fe47a8dc authored by Alexandra Gherghina's avatar Alexandra Gherghina
Browse files

Toggle between primary and managed profile in Print Settings 

This adds a spinner to the print settings screen which can be used to toggle
between the Settings app in the primary and managed profile so that the user
can edit settings belonging to both profiles.

Bug: 16369104
Change-Id: I2556a331d09379c2a501bc6b192ab1631b5215f5
parent b8ec3434

res/layout/spinner_view.xml

0 → 100644
+20 −0
Original line number Diff line number Diff line 
<?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" />

res/layout/user_preference.xml

0 → 100644
+43 −0
Original line number Diff line number Diff line 
<?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>
 
 No newline at end of file

res/values/dimens.xml

+3 −0
Original line number Diff line number Diff line
@@ -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>

src/com/android/settings/UserSpinnerAdapter.java

0 → 100644
+141 −0
Original line number Diff line number Diff line 
/*

 * 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();

    }

}
 
 No newline at end of file

src/com/android/settings/Utils.java

+1 −1
Original line number Diff line number Diff line
@@ -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;