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

Commit d9779db8 authored by Philip P. Moltmann's avatar Philip P. Moltmann
Browse files

Make Print Settings use the new PrintManager.getPrintServices loader 

This makes sure that all data always stays up to date.

printer_dropdown_item.xml:
- Reduce the amount of overriden properties

PrintServiceSettingsFragment:
- Instead receiving most data from PrintSettingsFragment have own loader
  and keep data up to date
- Also the updating of the print service state now has a dedicated
  PrintManager call instead of relying of the Settings-ContentObserver
  to transport this information. No more race-conditions, whohoo!

DynamicIndexableContentMonitor:
- To not rewrite too much code the update logic has to live here but the
  reading of the actual data is in PrintSettingsFragment.

Change-Id: I60715cda8952565d7f68cb24fb7da61a37085887
parent 52fdd6a0

res/layout/printer_dropdown_item.xml

+20 −27
Original line number Diff line number Diff line
@@ -28,8 +28,6 @@ 
        android:layout_width="40dip"

        android:layout_height="40dip"

        android:layout_gravity="center_vertical"

        android:layout_marginTop="8dip"

        android:layout_marginBottom="8dip"

        android:duplicateParentState="true"

        android:contentDescription="@null"

        android:visibility="invisible">
@@ -47,47 +45,42 @@ 
            android:id="@+id/title"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:textAppearance="?android:attr/textAppearanceMedium"

            android:textAppearance="?android:attr/textAppearanceListItem"

            android:singleLine="true"

            android:ellipsize="end"

            android:textIsSelectable="false"

            android:layout_alignParentTop="true"

            android:layout_alignParentStart="true"

            android:fadingEdge="horizontal"

            android:textAlignment="viewStart"

            android:textColor="?android:attr/textColorPrimary"

            android:duplicateParentState="true">

        </TextView>

            android:duplicateParentState="true" />



        <TextView

            android:id="@+id/subtitle"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:layout_below="@id/title"

            android:layout_alignParentStart="true"

            android:textAppearance="?android:attr/textAppearanceSmall"

            android:textAppearance="?android:attr/textAppearanceListItemSecondary"

            android:textColor="?android:attr/textColorSecondary"

            android:singleLine="true"

            android:ellipsize="end"

            android:textIsSelectable="false"

            android:visibility="gone"

            android:textColor="?android:attr/textColorSecondary"

            android:textAlignment="viewStart"

            android:duplicateParentState="true">

        </TextView>

            android:duplicateParentState="true" />



    </RelativeLayout>



    <ImageView

    <!-- wrapper for image view to increase the touch target size -->

    <LinearLayout

        android:id="@+id/more_info"

        android:layout_width="wrap_content"

        android:layout_height="fill_parent"

        android:visibility="gone">



        <ImageView

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:layout_gravity="center_vertical"

            android:paddingLeft="16dip"

            android:contentDescription="@string/printer_info_desc"

        android:src="@drawable/ic_info_outline"

            android:src="@drawable/ic_info"

            android:tint="?android:attr/colorControlNormal"

        android:tintMode="src_in"

        android:visibility="gone">

    </ImageView>

            android:tintMode="src_in" />



    </LinearLayout>



</LinearLayout>

src/com/android/settings/SettingsActivity.java

+3 −1
Original line number Diff line number Diff line
@@ -131,6 +131,8 @@ public class SettingsActivity extends SettingsDrawerActivity 


    private static final String LOG_TAG = "Settings";



    private static final int LOADER_ID_INDEXABLE_CONTENT_MONITOR = 1;



    // Constants for state save/restore

    private static final String SAVE_KEY_CATEGORIES = ":settings:categories";

    private static final String SAVE_KEY_SEARCH_MENU_EXPANDED = ":settings:search_menu_expanded";
@@ -786,7 +788,7 @@ public class SettingsActivity extends SettingsDrawerActivity 
        registerReceiver(mUserAddRemoveReceiver, new IntentFilter(Intent.ACTION_USER_ADDED));

        registerReceiver(mUserAddRemoveReceiver, new IntentFilter(Intent.ACTION_USER_REMOVED));



        mDynamicIndexableContentMonitor.register(this);

        mDynamicIndexableContentMonitor.register(this, LOADER_ID_INDEXABLE_CONTENT_MONITOR);



        if(mDisplaySearch && !TextUtils.isEmpty(mSearchQuery)) {

            onQueryTextSubmit(mSearchQuery);

src/com/android/settings/print/PrintServiceSettingsFragment.java

+68 −77
Original line number Diff line number Diff line
@@ -19,25 +19,23 @@ package com.android.settings.print; 
import android.app.Activity;

import android.app.LoaderManager;

import android.content.ComponentName;

import android.content.ContentResolver;

import android.content.Context;

import android.content.Intent;

import android.content.IntentSender.SendIntentException;

import android.content.Loader;

import android.content.pm.ResolveInfo;

import android.database.ContentObserver;

import android.database.DataSetObserver;

import android.graphics.Color;

import android.graphics.drawable.ColorDrawable;

import android.graphics.drawable.Drawable;

import android.net.Uri;

import android.os.Bundle;

import android.os.Handler;

import android.print.PrintManager;

import android.print.PrintServicesLoader;

import android.print.PrinterDiscoverySession;

import android.print.PrinterDiscoverySession.OnPrintersChangeListener;

import android.print.PrinterId;

import android.print.PrinterInfo;

import android.printservice.PrintServiceInfo;

import android.text.TextUtils;

import android.util.Log;

import android.util.TypedValue;
@@ -53,6 +51,7 @@ import android.widget.BaseAdapter; 
import android.widget.Filter;

import android.widget.Filterable;

import android.widget.ImageView;

import android.widget.LinearLayout;

import android.widget.ListView;

import android.widget.SearchView;

import android.widget.Switch;
@@ -74,19 +73,13 @@ import java.util.Map; 
 * Fragment with print service settings.

 */

public class PrintServiceSettingsFragment extends SettingsPreferenceFragment

        implements SwitchBar.OnSwitchChangeListener {

        implements SwitchBar.OnSwitchChangeListener,

        LoaderManager.LoaderCallbacks<List<PrintServiceInfo>> {



    private static final String LOG_TAG = "PrintServiceSettingsFragment";



    private static final int LOADER_ID_PRINTERS_LOADER = 1;



    private final SettingsContentObserver mSettingsContentObserver =

            new SettingsContentObserver(new Handler()) {

        @Override

        public void onChange(boolean selfChange, Uri uri) {

            updateUiForServiceState();

        }

    };

    private static final int LOADER_ID_PRINT_SERVICE_LOADER = 2;



    private final DataSetObserver mDataObserver = new DataSetObserver() {

        @Override
@@ -115,10 +108,8 @@ public class PrintServiceSettingsFragment extends SettingsPreferenceFragment 


    private String mPreferenceKey;



    private CharSequence mSettingsTitle;

    private Intent mSettingsIntent;



    private CharSequence mAddPrintersTitle;

    private Intent mAddPrintersIntent;



    private ComponentName mComponentName;
@@ -144,6 +135,8 @@ public class PrintServiceSettingsFragment extends SettingsPreferenceFragment 
    public void onCreate(Bundle icicle) {

        super.onCreate(icicle);



        mServiceEnabled = getArguments().getBoolean(PrintSettingsFragment.EXTRA_CHECKED);



        String title = getArguments().getString(PrintSettingsFragment.EXTRA_TITLE);

        if (!TextUtils.isEmpty(title)) {

            getActivity().setTitle(title);
@@ -153,8 +146,6 @@ public class PrintServiceSettingsFragment extends SettingsPreferenceFragment 
    @Override

    public void onStart() {

        super.onStart();

        mSettingsContentObserver.register(getContentResolver());



        updateEmptyView();

        updateUiForServiceState();

    }
@@ -169,7 +160,6 @@ public class PrintServiceSettingsFragment extends SettingsPreferenceFragment 


    @Override

    public void onStop() {

        mSettingsContentObserver.unregister(getContentResolver());

        super.onStop();

    }
@@ -192,14 +182,8 @@ public class PrintServiceSettingsFragment extends SettingsPreferenceFragment 
    }



    private void onPreferenceToggled(String preferenceKey, boolean enabled) {

        ComponentName service = ComponentName.unflattenFromString(preferenceKey);

        List<ComponentName> services = PrintSettingsUtils.readDisabledPrintServices(getActivity());

        if (enabled) {

            services.remove(service);

        } else {

            services.add(service);

        }

        PrintSettingsUtils.writeDisabledPrintServices(getActivity(), services);

        ((PrintManager)getContext().getSystemService(Context.PRINT_SERVICE))

                .setPrintServiceEnabled(mComponentName, enabled);

    }



    private ListView getBackupListView() {
@@ -255,9 +239,6 @@ public class PrintServiceSettingsFragment extends SettingsPreferenceFragment 
    }



    private void updateUiForServiceState() {

        List<ComponentName> disabledServices = PrintSettingsUtils

                .readDisabledPrintServices(getActivity());

        mServiceEnabled = !disabledServices.contains(mComponentName);

        if (mServiceEnabled) {

            mSwitchBar.setCheckedInternal(true);

            mPrintersAdapter.enable();
@@ -315,56 +296,87 @@ public class PrintServiceSettingsFragment extends SettingsPreferenceFragment 
    private void updateUiForArguments() {

        Bundle arguments = getArguments();



        // Component name.

        mComponentName = ComponentName.unflattenFromString(arguments

                .getString(PrintSettingsFragment.EXTRA_SERVICE_COMPONENT_NAME));



        // Key.

        mPreferenceKey = arguments.getString(PrintSettingsFragment.EXTRA_PREFERENCE_KEY);

        mPreferenceKey = mComponentName.flattenToString();



        // Enabled.

        final boolean enabled = arguments.getBoolean(PrintSettingsFragment.EXTRA_CHECKED);

        mSwitchBar.setCheckedInternal(enabled);



        // Settings title and intent.

        String settingsTitle = arguments.getString(PrintSettingsFragment.EXTRA_SETTINGS_TITLE);

        String settingsComponentName = arguments.getString(

                PrintSettingsFragment.EXTRA_SETTINGS_COMPONENT_NAME);

        if (!TextUtils.isEmpty(settingsTitle) && !TextUtils.isEmpty(settingsComponentName)) {

        getLoaderManager().initLoader(LOADER_ID_PRINT_SERVICE_LOADER, null, this);

        setHasOptionsMenu(true);

    }



    @Override

    public Loader<List<PrintServiceInfo>> onCreateLoader(int id, Bundle args) {

        return new PrintServicesLoader(

                (PrintManager) getContext().getSystemService(Context.PRINT_SERVICE), getContext(),

                PrintManager.ALL_SERVICES);

    }



    @Override

    public void onLoadFinished(Loader<List<PrintServiceInfo>> loader,

            List<PrintServiceInfo> services) {

        PrintServiceInfo service = null;



        if (services != null) {

            final int numServices = services.size();

            for (int i = 0; i < numServices; i++) {

                if (services.get(i).getComponentName().equals(mComponentName)) {

                    service = services.get(i);

                    break;

                }

            }

        }



        if (service == null) {

            // The print service was uninstalled

            finishFragment();

        }



        mServiceEnabled = service.isEnabled();



        if (service.getSettingsActivityName() != null) {

            Intent settingsIntent = new Intent(Intent.ACTION_MAIN).setComponent(

                    ComponentName.unflattenFromString(settingsComponentName.toString()));

                    ComponentName.unflattenFromString(service.getSettingsActivityName()));

            List<ResolveInfo> resolvedActivities = getPackageManager().queryIntentActivities(

                    settingsIntent, 0);

            if (!resolvedActivities.isEmpty()) {

                // The activity is a component name, therefore it is one or none.

                if (resolvedActivities.get(0).activityInfo.exported) {

                    mSettingsTitle = settingsTitle;

                    mSettingsIntent = settingsIntent;

                }

            }

        } else {

            mSettingsIntent = null;

        }



        // Add printers title and intent.

        String addPrintersTitle = arguments.getString(

                PrintSettingsFragment.EXTRA_ADD_PRINTERS_TITLE);

        String addPrintersComponentName =

                arguments.getString(PrintSettingsFragment.EXTRA_ADD_PRINTERS_COMPONENT_NAME);

        if (!TextUtils.isEmpty(addPrintersTitle)

                && !TextUtils.isEmpty(addPrintersComponentName)) {

            Intent addPritnersIntent = new Intent(Intent.ACTION_MAIN).setComponent(

                    ComponentName.unflattenFromString(addPrintersComponentName.toString()));

        if (service.getAddPrintersActivityName() != null) {

            Intent addPrintersIntent = new Intent(Intent.ACTION_MAIN)

                    .setComponent(ComponentName.unflattenFromString(

                            service.getAddPrintersActivityName()));

            List<ResolveInfo> resolvedActivities = getPackageManager().queryIntentActivities(

                    addPritnersIntent, 0);

                    addPrintersIntent, 0);

            if (!resolvedActivities.isEmpty()) {

                // The activity is a component name, therefore it is one or none.

                if (resolvedActivities.get(0).activityInfo.exported) {

                    mAddPrintersTitle = addPrintersTitle;

                    mAddPrintersIntent = addPritnersIntent;

                    mAddPrintersIntent = addPrintersIntent;

                }

            }

        } else {

            mAddPrintersIntent = null;

        }



        // Component name.

        mComponentName = ComponentName.unflattenFromString(arguments

                .getString(PrintSettingsFragment.EXTRA_SERVICE_COMPONENT_NAME));

        updateUiForServiceState();

    }



        setHasOptionsMenu(true);

    @Override

    public void onLoaderReset(Loader<List<PrintServiceInfo>> loader) {

        updateUiForServiceState();

    }



    @Override
@@ -373,16 +385,14 @@ public class PrintServiceSettingsFragment extends SettingsPreferenceFragment 
        inflater.inflate(R.menu.print_service_settings, menu);



        MenuItem addPrinters = menu.findItem(R.id.print_menu_item_add_printer);

        if (mServiceEnabled && !TextUtils.isEmpty(mAddPrintersTitle)

                && mAddPrintersIntent != null) {

        if (mServiceEnabled && mAddPrintersIntent != null) {

            addPrinters.setIntent(mAddPrintersIntent);

        } else {

            menu.removeItem(R.id.print_menu_item_add_printer);

        }



        MenuItem settings = menu.findItem(R.id.print_menu_item_settings);

        if (mServiceEnabled && !TextUtils.isEmpty(mSettingsTitle)

                && mSettingsIntent != null) {

        if (mServiceEnabled && mSettingsIntent != null) {

            settings.setIntent(mSettingsIntent);

        } else {

            menu.removeItem(R.id.print_menu_item_settings);
@@ -426,25 +436,6 @@ public class PrintServiceSettingsFragment extends SettingsPreferenceFragment 
        }

    }



    private static abstract class SettingsContentObserver extends ContentObserver {



        public SettingsContentObserver(Handler handler) {

            super(handler);

        }



        public void register(ContentResolver contentResolver) {

            contentResolver.registerContentObserver(android.provider.Settings.Secure.getUriFor(

                    android.provider.Settings.Secure.DISABLED_PRINT_SERVICES), false, this);

        }



        public void unregister(ContentResolver contentResolver) {

            contentResolver.unregisterContentObserver(this);

        }



        @Override

        public abstract void onChange(boolean selfChange, Uri uri);

    }



    private final class PrintersAdapter extends BaseAdapter

            implements LoaderManager.LoaderCallbacks<List<PrinterInfo>>, Filterable {

        private final Object mLock = new Object();
@@ -568,7 +559,7 @@ public class PrintServiceSettingsFragment extends SettingsPreferenceFragment 
                subtitleView.setVisibility(View.GONE);

            }



            ImageView moreInfoView = (ImageView) convertView.findViewById(R.id.more_info);

            LinearLayout moreInfoView = (LinearLayout) convertView.findViewById(R.id.more_info);

            if (printer.getInfoIntent() != null) {

                moreInfoView.setVisibility(View.VISIBLE);

                moreInfoView.setOnClickListener(new OnClickListener() {

src/com/android/settings/print/PrintSettingsFragment.java

+73 −152

File changed.

Preview size limit exceeded, changes collapsed.

src/com/android/settings/print/PrintSettingsUtils.java

deleted100644 → 0
+0 −79
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2013 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.print;



import android.content.ComponentName;

import android.content.Context;

import android.provider.Settings;

import android.text.TextUtils;

import android.text.TextUtils.SimpleStringSplitter;



import java.util.ArrayList;

import java.util.List;



/**

 * Helper methods for reading and writing to print settings.

 */

public class PrintSettingsUtils {



    private static final char DISABLED_PRINT_SERVICES_SEPARATOR = ':';



    private PrintSettingsUtils() {

        /* do nothing */

    }



    public static List<ComponentName> readDisabledPrintServices(Context context) {

        List<ComponentName> disabledServices = new ArrayList<ComponentName>();



        String disabledServicesSetting = Settings.Secure.getString(context

                .getContentResolver(), Settings.Secure.DISABLED_PRINT_SERVICES);

        if (TextUtils.isEmpty(disabledServicesSetting)) {

            return disabledServices;

        }



        SimpleStringSplitter colonSplitter = new SimpleStringSplitter(

                DISABLED_PRINT_SERVICES_SEPARATOR);

        colonSplitter.setString(disabledServicesSetting);



        while (colonSplitter.hasNext()) {

            String componentNameString = colonSplitter.next();

            ComponentName disabledService = ComponentName.unflattenFromString(

                    componentNameString);

            if (disabledService != null) {

                disabledServices.add(disabledService);

            }

        }



        return disabledServices;

    }



    public static void writeDisabledPrintServices(Context context,

            List<ComponentName> services) {

        StringBuilder builder = new StringBuilder();

        final int serviceCount = services.size();

        for (int i = 0; i < serviceCount; i++) {

            ComponentName service = services.get(i);

            if (builder.length() > 0) {

                builder.append(DISABLED_PRINT_SERVICES_SEPARATOR);

            }

            builder.append(service.flattenToString());

        }

        Settings.Secure.putString(context.getContentResolver(),

                Settings.Secure.DISABLED_PRINT_SERVICES,

                builder.toString());

    }

}