Merge "Start brightness dialog in same task"

import static com.android.settingslib.display.BrightnessUtils.GAMMA_SPACE_MIN;

import static com.android.settingslib.display.BrightnessUtils.convertLinearToGammaFloat;

import android.app.ActivityOptions;

import android.content.ContentResolver;

import android.content.Context;

import android.content.Intent;

        final Intent intent = new Intent(ACTION_SHOW_BRIGHTNESS_DIALOG);

        intent.putExtra(SettingsBaseActivity.EXTRA_PAGE_TRANSITION_TYPE,

                SettingsTransitionHelper.TransitionType.TRANSITION_NONE);

        mContext.startActivity(intent);

        // Start activity in the same task and pass fade animations

        final ActivityOptions options = ActivityOptions.makeCustomAnimation(mContext,

                android.R.anim.fade_in, android.R.anim.fade_out);

        mContext.startActivityForResult(preference.getKey(), intent, 0, options.toBundle());

        return true;

    }