Revert "Settings: Add screen color settings"

 * We now have support for HSIC controls in LiveDisplay and this
   can be deprecated. A new UI to bring the same kind of functionality
   is underway as well.

This reverts commit 853513841512a0fbf15dc22c7164a98d0a2de80b.

Change-Id: I4fa3af25f64b05338a78ba7832e75333cf15e448

4 files changed, 0 insertions, 999 deletions

diff --git a/src/com/android/display/IPPService.aidl b/src/com/android/display/IPPService.aidl
deleted file mode 100644
index c934efe..0000000
--- a/src/com/android/display/IPPService.aidl
+++ /dev/null
@@ -1,7 +0,0 @@
-package com.android.display;
-interface IPPService {
-    boolean startPP();
-    boolean stopPP();
-    boolean updateHSIC(int h, int s, int i, int c);
-    boolean getPPStatus();
-}
diff --git a/src/com/android/settings/CustomScreenColor.java b/src/com/android/settings/CustomScreenColor.java
deleted file mode 100644
index 2d6c7c2..0000000
--- a/src/com/android/settings/CustomScreenColor.java
+++ /dev/null
@@ -1,721 +0,0 @@
-/*
-   Copyright (c) 2014, The Linux Foundation. All Rights Reserved.
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-    * Redistributions of source code must retain the above copyright
-      notice, this list of conditions and the following disclaimer.
-    * Redistributions in binary form must reproduce the above
-      copyright notice, this list of conditions and the following
-      disclaimer in the documentation and/or other materials provided
-      with the distribution.
-    * Neither the name of The Linux Foundation nor the names of its
-      contributors may be used to endorse or promote products derived
-      from this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED
-WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT
-ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS
-BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
-BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
-OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
-IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
-
-package com.android.settings;
-
-import android.app.ActionBar;
-import android.app.Activity;
-import android.content.ComponentName;
-import android.content.Context;
-import android.content.Intent;
-import android.content.ServiceConnection;
-import android.content.SharedPreferences;
-import android.content.SharedPreferences.Editor;
-import android.graphics.Bitmap;
-import android.graphics.BitmapFactory;
-import android.graphics.drawable.BitmapDrawable;
-import android.net.Uri;
-import android.os.Bundle;
-import android.os.IBinder;
-import android.os.RemoteException;
-import android.util.Log;
-import android.view.Gravity;
-import android.view.Menu;
-import android.view.MenuItem;
-import android.view.View;
-import android.view.Window;
-import android.widget.AdapterView;
-import android.widget.AdapterView.OnItemClickListener;
-import android.widget.ListView;
-import android.widget.Button;
-import android.widget.ImageView;
-import android.widget.LinearLayout;
-import android.widget.PopupMenu;
-import android.widget.PopupMenu.OnMenuItemClickListener;
-import android.widget.RelativeLayout;
-import android.widget.SeekBar;
-import android.widget.TextView;
-import android.widget.PopupWindow;
-
-import com.android.display.IPPService;
-
-import java.io.FileNotFoundException;
-import java.io.IOException;
-import java.io.InputStream;
-
-public class CustomScreenColor extends Activity implements SeekBar.OnSeekBarChangeListener,
-        View.OnClickListener {
-    private final static String TAG = "CustomScreenColor";
-
-    private static final int RESTORE_DEFAULT_PREVIEW = 0;
-    private static final int SELECT_NEW_FILE_ITEM = 1;
-    private static final int SELECT_FILE_ITEM = 2;
-    private static final int RESET = 3;
-    private static final int SELECT_FILE_GROUP1 = 0;
-    private static final int SELECT_FILE_GROUP2 = 1;
-    private static final int SELECT_FILE_ORDER = 0;
-    private static final int REQUEST_SELECT_FILE = 100;
-    private static final String IMAGE_UNSPECIFIED = "image/*";
-    private static final String PREVIEW_STRING_KEY = "screencolor_preview_key";
-    private static final String PREVIEW_STRING_NAME = "screencolor_preview_name";
-    private static final String COLOR_HUE = "hue";
-    private static final String COLOR_SATURATION = "saturation";
-    private static final String COLOR_INTENSITY = "intensity";
-    private static final String COLOR_CONTRAST = "contrast";
-
-    private static final String KEY_ASPECT_X = "aspectX";
-    private static final String KEY_ASPECT_Y = "aspectY";
-    private static final String KEY_SPOTLIGHT_X = "spotlightX";
-    private static final String KEY_SPOTLIGHT_Y = "spotlightY";
-    private static final String KEY_FROME_SCREENCOLOR = "fromScreenColor";
-
-    private ImageView mImageView;
-    private RelativeLayout mRLayout;
-    private LinearLayout mScreenColorLayout;
-    private SeekBar mHBar, mSBar, mCBar, mIBar;
-    private TextView mHTv, mSTv, mCTv, mITv;
-    private ImageView mReduceH, mIncreaseH, mReduceS, mIncreaseS, mReduceC, mIncreaseC, mReduceI,
-            mIncreaseI, mUpdown, mMore;
-    private Button mCancelBtn, mSaveBtn, mPreviousBtn, mNewBtn;
-    private boolean canRestorePreview;
-    private int mHueValue = 0;
-    private int mSaturationValue = 0;
-    private int mIntensityValue = 0;
-    private int mContrastValue = 0;
-
-    private int mMinHueValue = 0;
-    private int mMaxHueValue = 0;
-    private int mDefaultHueValue = 0;
-    private int mMinSaturationValue = 0;
-    private int mMaxSaturationValue = 0;
-    private int mDefaultSaturationValue = 0;
-    private int mMinIntensityValue = 0;
-    private int mMaxIntensityValue = 0;
-    private int mDefaultIntensityValue = 0;
-    private int mMinContrastValue = 0;
-    private int mMaxContrastValue = 0;
-    private int mDefaultContrastValue = 0;
-
-    /**
-     *  It is used to update the screen's hue, saturation, contrast, and intensity.
-     */
-    IPPService mPPService = null;
-    PPServiceConnection mPPServiceConn = null;
-
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        initPPService();
-        getWindow().requestFeature(Window.FEATURE_ACTION_BAR);
-        setContentView(R.layout.custom_screencolor);
-        initView();
-        restoreSavedHSCI(true);
-    }
-
-    @Override
-    protected void onResume() {
-        super.onResume();
-    }
-
-    @Override
-    protected void onPause() {
-        super.onPause();
-    }
-
-    @Override
-    protected void onDestroy() {
-        super.onDestroy();
-        unbindService(mPPServiceConn);
-    }
-
-    private void initView() {
-        ActionBar actionBar = getActionBar();
-        actionBar.setDisplayHomeAsUpEnabled(true);
-
-        mMinHueValue = getResources().getInteger(R.integer.minimum_hue_value);
-        mMaxHueValue = getResources().getInteger(R.integer.maximum_hue_value);
-        mDefaultHueValue = getResources().getInteger(R.integer.default_hue_value);
-        mMinSaturationValue = getResources().getInteger(R.integer.minimum_saturation_value);
-        mMaxSaturationValue = getResources().getInteger(R.integer.maximum_saturation_value);
-        mDefaultSaturationValue = getResources().getInteger(R.integer.default_saturation_value);
-        mMinIntensityValue = getResources().getInteger(R.integer.minimum_intensity_value);
-        mMaxIntensityValue = getResources().getInteger(R.integer.maximum_intensity_value);
-        mDefaultIntensityValue = getResources().getInteger(R.integer.default_intensity_value);
-        mMinContrastValue = getResources().getInteger(R.integer.minimum_contrast_value);
-        mMaxContrastValue = getResources().getInteger(R.integer.maximum_contrast_value);
-        mDefaultContrastValue = getResources().getInteger(R.integer.default_contrast_value);
-
-        mRLayout = (RelativeLayout) findViewById(R.id.background_preview);
-        String previewContent = getScreenColorPreviewKey();
-        if ("".equals(previewContent)) {
-            resotreBackgroundByDefault();
-        } else {
-            Uri previewUri = Uri.parse(previewContent);
-            setBackgroundByUri(previewUri);
-        }
-
-        mScreenColorLayout = (LinearLayout) findViewById(R.id.screencolor_control);
-        mScreenColorLayout.setBackgroundColor(R.color.screencolor_background);
-        mScreenColorLayout.setOnClickListener(this);
-
-        mHBar = (SeekBar) findViewById(R.id.hcontrol);
-        mHBar.setMax(mMaxHueValue);
-        mHBar.setOnSeekBarChangeListener(this);
-        mSBar = (SeekBar) findViewById(R.id.scontrol);
-        mSBar.setMax(mMaxSaturationValue);
-        mSBar.setOnSeekBarChangeListener(this);
-        mIBar = (SeekBar) findViewById(R.id.icontrol);
-        mIBar.setMax(mMaxIntensityValue);
-        mIBar.setOnSeekBarChangeListener(this);
-        mCBar = (SeekBar) findViewById(R.id.ccontrol);
-        mCBar.setMax(mMaxContrastValue);
-        mCBar.setOnSeekBarChangeListener(this);
-
-        mHTv = (TextView) findViewById(R.id.hue);
-        mHTv.setText(getString(R.string.hue_str, mHBar.getProgress()));
-        mSTv = (TextView) findViewById(R.id.saturation);
-        mSTv.setText(getString(R.string.saturation_str, mSBar.getProgress()));
-        mITv = (TextView) findViewById(R.id.intensity);
-        mITv.setText(getString(R.string.intensity_str, mIBar.getProgress()));
-        mCTv = (TextView) findViewById(R.id.contrast);
-        mCTv.setText(getString(R.string.contrast_str, mCBar.getProgress()));
-
-        mReduceH = (ImageView) findViewById(R.id.reduce_hue);
-        mReduceH.setOnClickListener(this);
-        mIncreaseH = (ImageView) findViewById(R.id.increase_hue);
-        mIncreaseH.setOnClickListener(this);
-        mReduceS = (ImageView) findViewById(R.id.reduce_saturation);
-        mReduceS.setOnClickListener(this);
-        mIncreaseS = (ImageView) findViewById(R.id.increase_saturation);
-        mIncreaseS.setOnClickListener(this);
-        mReduceI = (ImageView) findViewById(R.id.reduce_intensity);
-        mReduceI.setOnClickListener(this);
-        mIncreaseI = (ImageView) findViewById(R.id.increase_intensity);
-        mIncreaseI.setOnClickListener(this);
-        mReduceC = (ImageView) findViewById(R.id.reduce_contrast);
-        mReduceC.setOnClickListener(this);
-        mIncreaseC = (ImageView) findViewById(R.id.increase_contrast);
-        mIncreaseC.setOnClickListener(this);
-
-        mUpdown = (ImageView) findViewById(R.id.up_down);
-        mUpdown.setOnClickListener(this);
-        mMore = (ImageView) findViewById(R.id.more);
-        mMore.setOnClickListener(this);
-
-        mPreviousBtn = (Button) findViewById(R.id.previous_btn);
-        mPreviousBtn.setOnClickListener(this);
-        mNewBtn = (Button) findViewById(R.id.new_btn);
-        mNewBtn.setOnClickListener(this);
-        mCancelBtn = (Button) findViewById(R.id.cancel);
-        mCancelBtn.setOnClickListener(this);
-        mSaveBtn = (Button) findViewById(R.id.save);
-        mSaveBtn.setOnClickListener(this);
-
-        initBtnsStatus();
-    }
-
-    private void initPPService() {
-        mPPServiceConn = new PPServiceConnection();
-        String packetname = "com.qualcomm.display";
-        String service = "com.qualcomm.display.PPService";
-        Intent i = new Intent(IPPService.class.getName());
-
-        ComponentName component = new ComponentName(packetname, service);
-        i.setComponent(component);
-
-        boolean ret = bindService(i, mPPServiceConn, Context.BIND_AUTO_CREATE);
-    }
-
-    private class PPServiceConnection implements ServiceConnection {
-
-        @Override
-        public void onServiceConnected(ComponentName name, IBinder service) {
-            mPPService = IPPService.Stub.asInterface((IBinder) service);
-            Log.d(TAG, "onServiceConnected, service=" + mPPService);
-            try {
-                if (null != mPPService) {
-                    mPPService.startPP();
-                    restoreSavedHSCI(true);
-                }
-            } catch (RemoteException e) {
-                Log.e(TAG, "startPP exception");
-            }
-
-        }
-
-        @Override
-        public void onServiceDisconnected(ComponentName name) {
-            if (null != mPPService) {
-                // end thread
-                try {
-                    Log.d(TAG, "stopPP");
-                    mPPService.stopPP();
-                } catch (RemoteException e) {
-                    Log.e(TAG, "stopPP exception");
-                }
-            }
-            mPPService = null;
-        }
-
-    }
-
-    @Override
-    protected void onActivityResult(int requestCode, int resultCode, Intent data) {
-        if (resultCode != RESULT_OK) {
-            Log.i(TAG, "bail due to resultCode=" + resultCode);
-            return;
-        }
-        switch (requestCode) {
-            case REQUEST_SELECT_FILE:
-                changePreviewByData(data);
-                break;
-            default:
-                break;
-        }
-    }
-
-    @Override
-    public boolean onCreateOptionsMenu(Menu menu) {
-        menu.add(SELECT_FILE_GROUP1, SELECT_FILE_ITEM, SELECT_FILE_ORDER,
-                R.string.selectfile_menu);
-        menu.add(SELECT_FILE_GROUP1, RESET, SELECT_FILE_ORDER, R.string.restore_default_str);
-        menu.add(SELECT_FILE_GROUP2, RESTORE_DEFAULT_PREVIEW, SELECT_FILE_ORDER,
-                R.string.restore_preview);
-        menu.add(SELECT_FILE_GROUP2, SELECT_NEW_FILE_ITEM, SELECT_FILE_ORDER,
-                R.string.selectnewfile_menu);
-        menu.add(SELECT_FILE_GROUP2, RESET, SELECT_FILE_ORDER, R.string.restore_default_str);
-        return true;
-    }
-
-    @Override
-    public boolean onPrepareOptionsMenu(Menu menu) {
-        if (canRestorePreview) {
-            menu.setGroupVisible(SELECT_FILE_GROUP1, false);
-            menu.setGroupVisible(SELECT_FILE_GROUP2, true);
-        } else {
-            menu.setGroupVisible(SELECT_FILE_GROUP1, true);
-            menu.setGroupVisible(SELECT_FILE_GROUP2, false);
-        }
-        return true;
-    }
-
-    @Override
-    public boolean onOptionsItemSelected(MenuItem item) {
-        switch (item.getItemId()) {
-            case android.R.id.home:
-                finish();
-                break;
-            case SELECT_NEW_FILE_ITEM:
-                selectPicFromGallery2();
-                break;
-            case SELECT_FILE_ITEM:
-                selectPicFromGallery2();
-                break;
-            case RESTORE_DEFAULT_PREVIEW:
-                resotreBackgroundByDefault();
-                break;
-            case RESET:
-                restoreDefaultHSCI();
-                break;
-            default:
-                return true;
-        }
-        return false;
-    }
-
-    public void onProgressChanged(SeekBar seekBar, int progress, boolean fromUser) {
-        setNewBtnHighlight();
-        int id = seekBar.getId();
-        switch (id) {
-            case R.id.hcontrol:
-                mHueValue = progress;
-                //The screen hue display value varies from -180 to 180.
-                mHTv.setText(getString(R.string.hue_str, progress - 180));
-                break;
-            case R.id.scontrol:
-                mSaturationValue = progress;
-                //Change the saturation display value varies from (-180, 180) to (-1.0, 1.0).
-                mSTv.setText(getString(R.string.saturation_str,
-                        ((int) (((progress - 180) * 100) / 180.0)) / 100.0));
-                break;
-            case R.id.ccontrol:
-                mContrastValue = progress;
-                //Change the contrast display value varies from (-180, 180) to (-1.0, 1.0).
-                mCTv.setText(getString(R.string.contrast_str,
-                        ((int) (((progress - 180) * 100) / 180.0)) / 100.0));
-                break;
-            case R.id.icontrol:
-                mIntensityValue = progress;
-                //The screen intensity display value varies from -200 to 200.
-                mITv.setText(getString(R.string.intensity_str, progress - 200));
-                break;
-            default:
-                break;
-
-        }
-        Log.i(TAG, "onProgressChanged mHueValue=" + mHueValue + " mSaturationValue="
-                + mSaturationValue + " mNewContrastValue=" + mContrastValue + " mIntensityValue="
-                + mIntensityValue);
-        try {
-            if (null != mPPService && mPPService.getPPStatus()) {
-                mPPService.updateHSIC(mHueValue, mSaturationValue, mIntensityValue,
-                                     mContrastValue);
-            }
-        } catch (RemoteException e) {
-            Log.e(TAG, "updateHSIC exception");
-        }
-    }
-
-    public void onStartTrackingTouch(SeekBar seekBar) {
-        setActivated(seekBar, true);
-    }
-
-    public void onStopTrackingTouch(SeekBar seekBar) {
-        setActivated(seekBar, false);
-    }
-
-    private void setActivated(SeekBar seekBar, boolean isActivated) {
-        int id = seekBar.getId();
-        switch (id) {
-            case R.id.hcontrol:
-                mReduceH.setActivated(isActivated);
-                mIncreaseH.setActivated(isActivated);
-                break;
-            case R.id.scontrol:
-                mReduceS.setActivated(isActivated);
-                mIncreaseS.setActivated(isActivated);
-                break;
-            case R.id.icontrol:
-                mReduceI.setActivated(isActivated);
-                mIncreaseI.setActivated(isActivated);
-                break;
-            case R.id.ccontrol:
-                mReduceC.setActivated(isActivated);
-                mIncreaseC.setActivated(isActivated);
-                break;
-            default:
-                break;
-        }
-
-    }
-
-    public void onClick(View v) {
-        int id = v.getId();
-
-        switch (id) {
-            case R.id.cancel:
-                restoreSavedHSCI(false);
-                finish();
-                break;
-            case R.id.save:
-                saveHSCI();
-                break;
-            case R.id.previous_btn:
-                previousOrNewHSCI(true);
-                break;
-            case R.id.new_btn:
-                previousOrNewHSCI(false);
-                break;
-            case R.id.up_down:
-                upDownHSCISettingLayout();
-                break;
-            case R.id.more:
-                showMoreMenus();
-                break;
-            case R.id.reduce_hue:
-                mHBar.setProgress((mHueValue - 1 > mMinHueValue) ? (mHueValue - 1) : mMinHueValue);
-                break;
-            case R.id.increase_hue:
-                mHBar.setProgress((mHueValue + 1 < mMaxHueValue) ? (mHueValue + 1) : mMaxHueValue);
-                break;
-            case R.id.reduce_saturation:
-                mSBar.setProgress((mSaturationValue - 1 > mMinSaturationValue) ?
-                    (mSaturationValue - 1) : mMinSaturationValue);
-                break;
-            case R.id.increase_saturation:
-                mSBar.setProgress((mSaturationValue + 1 < mMaxSaturationValue) ?
-                    (mSaturationValue + 1) : mMaxSaturationValue);
-                break;
-            case R.id.reduce_intensity:
-                mIBar.setProgress((mIntensityValue - 1 > mMinIntensityValue) ?
-                    (mIntensityValue - 1) : mMinIntensityValue);
-                break;
-            case R.id.increase_intensity:
-                mIBar.setProgress((mIntensityValue + 1 < mMaxIntensityValue) ?
-                    (mIntensityValue + 1) : mMaxIntensityValue);
-                break;
-            case R.id.reduce_contrast:
-                mCBar.setProgress((mContrastValue - 1 > mMinContrastValue) ?
-                    (mContrastValue - 1) : mMinContrastValue);
-                break;
-            case R.id.increase_contrast:
-                mCBar.setProgress((mContrastValue + 1 < mMaxContrastValue) ?
-                    (mContrastValue + 1) : mMaxContrastValue);
-                break;
-            default:
-                break;
-        }
-    }
-
-    private void selectPicFromGallery2() {
-        Intent intent = new Intent(Intent.ACTION_GET_CONTENT);
-        intent.setType("image/*");
-        startActivityForResult(intent, REQUEST_SELECT_FILE);
-    }
-
-    private void restoreDefaultHSCI() {
-        mHBar.setProgress(mDefaultHueValue);
-        mSBar.setProgress(mDefaultSaturationValue);
-        mIBar.setProgress(mDefaultIntensityValue);
-        mCBar.setProgress(mDefaultContrastValue);
-        setNewBtnHighlight();
-    }
-
-    private void restoreSavedHSCI(boolean setProgress) {
-        SharedPreferences share = getSharedPreferences(PREVIEW_STRING_NAME,
-                Context.MODE_WORLD_WRITEABLE);
-        int hueValue = share.getInt(COLOR_HUE, mDefaultHueValue);
-        int saturationValue = share.getInt(COLOR_SATURATION, mDefaultSaturationValue);
-        int intensityValue = share.getInt(COLOR_INTENSITY, mDefaultIntensityValue);
-        int contrastValue = share.getInt(COLOR_CONTRAST, mDefaultContrastValue);
-        if (setProgress) {
-            mHBar.setProgress(hueValue);
-            mSBar.setProgress(saturationValue);
-            mIBar.setProgress(intensityValue);
-            mCBar.setProgress(contrastValue);
-        }
-        Log.i(TAG, "restoreSavedHSCI hueValue=" + hueValue + " saturationValue=" + saturationValue
-                + " contrastValue=" + contrastValue + " intensityValue=" + intensityValue);
-        try {
-            if (null != mPPService && mPPService.getPPStatus()) {
-                mPPService.updateHSIC(hueValue, saturationValue, intensityValue, contrastValue);
-            }
-        } catch (RemoteException e) {
-            Log.e(TAG, "updateHSIC exception");
-        }
-    }
-
-    private void previewNewHSIC() {
-        mHBar.setProgress(mHueValue);
-        mSBar.setProgress(mSaturationValue);
-        mIBar.setProgress(mIntensityValue);
-        mCBar.setProgress(mContrastValue);
-        Log.i(TAG, "previewNewHSIC mHueValue=" + mHueValue + " mSaturationValue="
-                + mSaturationValue + " mContrastValue=" + mContrastValue + " mIntensityValue="
-                + mIntensityValue);
-        try {
-            if (null != mPPService && mPPService.getPPStatus()) {
-                mPPService.updateHSIC(mHueValue, mSaturationValue, mIntensityValue,
-                        mContrastValue);
-            }
-        } catch (RemoteException e) {
-            Log.e(TAG, "updateHSIC exception");
-        }
-    }
-
-    private void setNewBtnHighlight() {
-        mPreviousBtn.setBackgroundResource(R.drawable.ic_previous_default);
-        mNewBtn.setBackgroundResource(R.drawable.ic_new_glow);
-        mPreviousBtn.setEnabled(true);
-        mNewBtn.setEnabled(true);
-        mSaveBtn.setEnabled(true);
-
-    }
-
-    private void initBtnsStatus() {
-        mPreviousBtn.setBackgroundResource(R.drawable.ic_previous_dis);
-        mNewBtn.setBackgroundResource(R.drawable.ic_new_dis);
-        mPreviousBtn.setEnabled(false);
-        mNewBtn.setEnabled(false);
-        mSaveBtn.setEnabled(false);
-    }
-
-    private void previousOrNewHSCI(boolean isPrevious) {
-        if (View.GONE != mScreenColorLayout.getVisibility()) {
-            mScreenColorLayout.setVisibility(View.GONE);
-            mUpdown.setBackgroundResource(R.drawable.up_button);
-        }
-        if (isPrevious) {
-            mPreviousBtn.setBackgroundResource(R.drawable.ic_previous_glow);
-            mNewBtn.setBackgroundResource(R.drawable.ic_new_default);
-            mUpdown.setVisibility(View.GONE);
-            mMore.setVisibility(View.GONE);
-            restoreSavedHSCI(false);
-        } else {
-            mPreviousBtn.setBackgroundResource(R.drawable.ic_previous_default);
-            mNewBtn.setBackgroundResource(R.drawable.ic_new_glow);
-            mUpdown.setVisibility(View.VISIBLE);
-            mMore.setVisibility(View.VISIBLE);
-            previewNewHSIC();
-        }
-    }
-
-    private void saveHSCI() {
-        // TODO save HSCI values.
-        saveHSICPreference(mHueValue, mSaturationValue, mIntensityValue, mContrastValue);
-        finish();
-    }
-
-    private void changePreviewByData(Intent data) {
-        if (data != null) {
-            Uri uri = data.getData();
-            setBackgroundByUri(uri);
-            savePreviewKey(uri.toString());
-        }
-    }
-
-    private void setBackgroundByUri(Uri uri) {
-        InputStream is = null;
-        try {
-            is = getContentResolver().openInputStream(uri);
-            BitmapFactory.Options opts = new BitmapFactory.Options();
-            opts.inJustDecodeBounds = true;
-            BitmapFactory.decodeStream(is, null, opts);
-            is.close();
-            is = getContentResolver().openInputStream(uri);
-            opts.inJustDecodeBounds = false;
-            opts.inSampleSize = calculateInSampleSize(opts,
-                    mRLayout.getWidth(), mRLayout.getHeight());
-            Bitmap bm = BitmapFactory.decodeStream(is, null, opts);
-            BitmapDrawable bd = new BitmapDrawable(bm);
-            mRLayout.setBackgroundDrawable(bd);
-        } catch (FileNotFoundException e) {
-            e.printStackTrace();
-        } catch (IOException e) {
-            e.printStackTrace();
-        } finally {
-            if (is != null) {
-                try {
-                    is.close();
-                } catch (IOException e) {
-                    e.printStackTrace();
-                }
-            }
-        }
-        canRestorePreview = true;
-    }
-
-    public static int calculateInSampleSize(BitmapFactory.Options options, int reqWidth, int reqHeight) {
-        // Raw height and width of image
-        final int height = options.outHeight;
-        final int width = options.outWidth;
-        int inSampleSize = 1;
-
-        if (height > reqHeight || width > reqWidth) {
-
-            final int halfHeight = height / 2;
-            final int halfWidth = width / 2;
-
-            // Calculate the largest inSampleSize value that is a power of 2 and keeps both
-            // height and width larger than the requested height and width.
-            while ((halfHeight / inSampleSize) > reqHeight
-                    && (halfWidth / inSampleSize) > reqWidth) {
-                inSampleSize *= 2;
-            }
-        }
-
-        return inSampleSize;
-    }
-
-    private void resotreBackgroundByDefault() {
-        mRLayout.setBackgroundResource(R.drawable.default_screencolor_setting);
-        savePreviewKey("");
-        canRestorePreview = false;
-    }
-
-    // use sharepreference to save preview image.
-    private void savePreviewKey(String value) {
-        SharedPreferences share = getSharedPreferences(PREVIEW_STRING_NAME, Context.MODE_PRIVATE);
-        Editor editor = share.edit();
-        editor.putString(PREVIEW_STRING_KEY, value);
-        editor.commit();
-    }
-
-    private void saveHSICPreference(int h, int s, int i, int c) {
-        SharedPreferences share = getSharedPreferences(PREVIEW_STRING_NAME, Context.MODE_PRIVATE);
-        Editor editor = share.edit();
-        editor.putInt(COLOR_HUE, h);
-        editor.putInt(COLOR_SATURATION, s);
-        editor.putInt(COLOR_INTENSITY, i);
-        editor.putInt(COLOR_CONTRAST, c);
-        editor.commit();
-    }
-
-    private String getScreenColorPreviewKey() {
-        SharedPreferences share = getSharedPreferences(PREVIEW_STRING_NAME,
-                Context.MODE_WORLD_WRITEABLE | Context.MODE_WORLD_READABLE);
-        return share.getString(PREVIEW_STRING_KEY, "");
-    }
-
-    private void upDownHSCISettingLayout() {
-        if (View.GONE != mScreenColorLayout.getVisibility()) {
-            mScreenColorLayout.setVisibility(View.GONE);
-            mUpdown.setBackgroundResource(R.drawable.up_button);
-        } else {
-            mScreenColorLayout.setVisibility(View.VISIBLE);
-            mUpdown.setBackgroundResource(R.drawable.down_button);
-        }
-    }
-
-    private void showMoreMenus() {
-        PopupMenu popup = new PopupMenu(CustomScreenColor.this, mMore);
-        Menu menu = popup.getMenu();
-        popup.getMenuInflater().inflate(R.menu.screencolor_more, menu);
-
-        if (canRestorePreview) {
-            menu.removeItem(R.id.selectfile_menu);
-        } else {
-            menu.removeItem(R.id.restore_preview);
-            menu.removeItem(R.id.selectnewfile_menu);
-        }
-
-        popup.setOnMenuItemClickListener(new MyMenuItemclick());
-        popup.show();
-    }
-
-    private class MyMenuItemclick implements OnMenuItemClickListener {
-        @Override
-        public boolean onMenuItemClick(MenuItem item) {
-            switch (item.getItemId()) {
-                case R.id.restore_preview:
-                    resotreBackgroundByDefault();
-                    return true;
-                case R.id.selectnewfile_menu:
-                    selectPicFromGallery2();
-                    return true;
-                case R.id.selectfile_menu:
-                    selectPicFromGallery2();
-                    return true;
-                case R.id.restore_default_str:
-                    restoreDefaultHSCI();
-                    return true;
-            }
-            return true;
-        }
-    }
-}
diff --git a/src/com/android/settings/DisplaySettings.java b/src/com/android/settings/DisplaySettings.java
index ef7f9c3..f01f1e8 100644
--- a/src/com/android/settings/DisplaySettings.java
+++ b/src/com/android/settings/DisplaySettings.java
@@ -52,8 +52,6 @@ import android.app.UiModeManager;
 import android.app.admin.DevicePolicyManager;
 import android.content.ContentResolver;
 import android.content.Context;
-import android.content.pm.PackageManager;
-import android.content.pm.PackageManager.NameNotFoundException;
 import android.content.res.Configuration;
 import android.content.res.Resources;
 import android.hardware.Sensor;
diff --git a/src/com/android/settings/ScreenColorSettings.java b/src/com/android/settings/ScreenColorSettings.java
deleted file mode 100644
index 4d4caaa..0000000
--- a/src/com/android/settings/ScreenColorSettings.java
+++ /dev/null
@@ -1,269 +0,0 @@
-/*
-   Copyright (c) 2014, The Linux Foundation. All Rights Reserved.
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-    * Redistributions of source code must retain the above copyright
-      notice, this list of conditions and the following disclaimer.
-    * Redistributions in binary form must reproduce the above
-      copyright notice, this list of conditions and the following
-      disclaimer in the documentation and/or other materials provided
-      with the distribution.
-    * Neither the name of The Linux Foundation nor the names of its
-      contributors may be used to endorse or promote products derived
-      from this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED
-WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT
-ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS
-BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
-BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
-OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
-IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
-
-package com.android.settings;
-
-import java.io.FileNotFoundException;
-import java.io.InputStream;
-
-import android.app.ActionBar;
-import android.app.Activity;
-import android.content.ComponentName;
-import android.content.Context;
-import android.content.Intent;
-import android.content.ServiceConnection;
-import android.content.SharedPreferences;
-import android.content.SharedPreferences.Editor;
-import android.graphics.Bitmap;
-import android.graphics.BitmapFactory;
-import android.graphics.drawable.BitmapDrawable;
-import android.net.Uri;
-import android.os.Bundle;
-import android.os.IBinder;
-import android.os.RemoteException;
-import android.util.Log;
-import android.view.Gravity;
-import android.view.LayoutInflater;
-import android.view.Menu;
-import android.view.MenuItem;
-import android.view.View;
-import android.view.View.OnClickListener;
-import android.view.ViewGroup;
-import android.view.Window;
-import android.widget.AdapterView;
-import android.widget.AdapterView.OnItemClickListener;
-import android.widget.ArrayAdapter;
-import android.widget.ListView;
-import android.widget.Button;
-import android.widget.ImageView;
-import android.widget.LinearLayout;
-import android.widget.PopupMenu;
-import android.widget.RadioButton;
-import android.widget.PopupMenu.OnMenuItemClickListener;
-import android.widget.RadioGroup;
-import android.widget.RelativeLayout;
-import android.widget.SeekBar;
-import android.widget.TextView;
-import android.widget.PopupWindow;
-
-import com.android.display.IPPService;
-
-public class ScreenColorSettings extends Activity {
-    private final static String TAG = "ScreenColorSettings";
-    private final static boolean DEBUG = false;
-
-    private final static int MODE_STANDARD = 0;
-    private final static int MODE_VIVID    = 1;
-    private final static int MODE_CUSTOM   = 2;
-
-    private static final String COLOR_MODE       = "mode";
-    private static final String COLOR_HUE        = "hue";
-    private static final String COLOR_SATURATION = "saturation";
-    private static final String COLOR_INTENSITY  = "intensity";
-    private static final String COLOR_CONTRAST   = "contrast";
-
-    private static final String PREVIEW_STRING_NAME = "screencolor_preview_name";
-
-    private int mMode = 0;
-    private IPPService mPPService = null;
-    private PPServiceConnection mPPServiceConn = null;
-    private SharedPreferences mSharedPreference;
-
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        initPPService();
-        getWindow().requestFeature(Window.FEATURE_ACTION_BAR);
-        setContentView(R.layout.screencolor_settings);
-
-        ListView listView = (ListView)findViewById(R.id.mode_list);
-        listView.setBackgroundColor(R.color.screencolor_background);
-        mSharedPreference = getSharedPreferences(PREVIEW_STRING_NAME, Context.MODE_PRIVATE);
-        mMode = mSharedPreference.getInt(COLOR_MODE, 0);
-        setScreenColorMode(mMode);
-        String[] list = getResources().getStringArray(R.array.screen_color_setting);
-        ColorModeAdaper adapter = new ColorModeAdaper(this,
-                R.layout.screen_color_item, list);
-        listView.setAdapter(adapter);
-    }
-
-    private class ColorModeAdaper extends ArrayAdapter<String> {
-        private int mResource;
-        private RelativeLayout mItemView;
-
-        public ColorModeAdaper(Context context, int resource, String[] list) {
-            super(context, resource, list);
-            this.mResource = resource;
-        }
-
-        @Override
-        public View getView(int position, View convertView, ViewGroup parent) {
-            String name = getItem(position);
-            if(convertView == null) {
-                mItemView = new RelativeLayout(getContext());
-                LayoutInflater vi = (LayoutInflater)getContext()
-                        .getSystemService(Context.LAYOUT_INFLATER_SERVICE);
-                vi.inflate(mResource, mItemView, true);
-            } else {
-                mItemView = (RelativeLayout) convertView;
-            }
-            ((TextView) mItemView.findViewById(android.R.id.title)).setText(name);
-
-            RadioButton radioButton = (RadioButton) mItemView.findViewById(android.R.id.button1);
-            ImageView setting = (ImageView) mItemView.findViewById(android.R.id.button2);
-            if (mMode == position) {
-                radioButton.setChecked(true);
-                setting.setEnabled(true);
-            } else {
-                radioButton.setChecked(false);
-                setting.setEnabled(false);
-            }
-
-            if (position != getCount()-1) {
-                ((ImageView) mItemView.findViewById(R.id.divider)).setVisibility(View.INVISIBLE);
-                setting.setVisibility(View.INVISIBLE);
-            } else {
-                setting.setOnClickListener(new OnClickListener () {
-                    @Override
-                    public void onClick(View v) {
-                        Intent intent = new Intent();
-                        intent.setClass(ScreenColorSettings.this, CustomScreenColor.class);
-                        startActivity(intent);
-                    }});
-            }
-
-            View v = mItemView.findViewById(R.id.widget_frame);
-            v.setTag(position);
-            v.setOnClickListener(new OnClickListener () {
-                @Override
-                public void onClick(View v) {
-                    int mode = (Integer)(v.getTag());
-                    setScreenColorMode(mode);
-                    notifyDataSetChanged();
-                }});
-            return mItemView;
-        }
-    }
-
-    private void initPPService() {
-        mPPServiceConn = new PPServiceConnection();
-        String packetname = "com.qualcomm.display";
-        String service = "com.qualcomm.display.PPService";
-        Intent i = new Intent(IPPService.class.getName());
-
-        ComponentName component = new ComponentName(packetname, service);
-        i.setComponent(component);
-
-        bindService(i, mPPServiceConn, Context.BIND_AUTO_CREATE);
-    }
-
-    private class PPServiceConnection implements ServiceConnection {
-
-        @Override
-        public void onServiceConnected(ComponentName name, IBinder service) {
-            mPPService = IPPService.Stub.asInterface((IBinder) service);
-            if (DEBUG) Log.d(TAG, "onServiceConnected, service=" + mPPService);
-            try {
-                if (null != mPPService) {
-                    mPPService.startPP();
-                    setScreenColorMode(mMode);
-                }
-            } catch (RemoteException e) {
-                Log.e(TAG, "startPP exception");
-            }
-        }
-
-        @Override
-        public void onServiceDisconnected(ComponentName name) {
-            if (null != mPPService) {
-                try {
-                    mPPService.stopPP();
-                } catch (RemoteException e) {
-                    Log.e(TAG, "stopPP exception");
-                }
-            }
-            mPPService = null;
-        }
-
-    }
-
-    private void setScreenColorMode(int mode) {
-        if (DEBUG) Log.i(TAG, "setScreenColorMode mode = " + mode);
-        int hue = 0;
-        int saturation = 0;
-        int intensity = 0;
-        int contrast = 0;
-        switch (mode) {
-            case MODE_STANDARD:
-                hue = 180;
-                saturation = 180;
-                intensity = 255;
-                contrast = 180;
-                break;
-            case MODE_VIVID:
-                hue = 180;
-                saturation = 210;
-                intensity = 255;
-                contrast = 180;
-                break;
-            case MODE_CUSTOM:
-                hue = mSharedPreference.getInt(COLOR_HUE, 180);
-                saturation = mSharedPreference.getInt(COLOR_SATURATION, 180);
-                intensity = mSharedPreference.getInt(COLOR_INTENSITY, 255);
-                contrast = mSharedPreference.getInt(COLOR_CONTRAST, 180);
-                break;
-            default:
-                break;
-        }
-        saveModeValue(mode);
-        updateHSCIValue(hue, saturation, intensity, contrast);
-    }
-
-    private void updateHSCIValue(int hue, int saturation, int intensity, int contrast) {
-        try {
-            if (null != mPPService && mPPService.getPPStatus()) {
-                mPPService.updateHSIC(hue, saturation, intensity, contrast);
-            }
-        } catch (RemoteException e) {
-            Log.e(TAG, "updateHSIC exception");
-        }
-    }
-
-    @Override
-    protected void onDestroy() {
-        super.onDestroy();
-        unbindService(mPPServiceConn);
-    }
-
-    private void saveModeValue(int mode) {
-        mMode = mode;
-        Editor editor = mSharedPreference.edit();
-        editor.putInt(COLOR_MODE, mode);
-        editor.commit();
-    }
-}