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

Commit d293f7c5 authored by Danny Baumann's avatar Danny Baumann Committed by Gerrit Code Review
Browse files

Merge "Fix Quick Settings layout." into cm-10.2

parents ec2363bc 00cb1d04

packages/SystemUI/res/layout/quick_settings_tile_camera.xml

+26 −9
Original line number Diff line number Diff line
@@ -18,15 +18,32 @@ 
    android:layout_width="match_parent"

    android:layout_height="match_parent">



    <TextView android:id="@+id/camera_text"

    <LinearLayout

        android:id="@+id/icon_container"

        android:layout_width="match_parent"

        android:layout_height="match_parent"

        android:layout_gravity="center"

        android:orientation="vertical">



        <ImageView

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:layout_gravity="center"

            android:layout_marginTop="@dimen/qs_tile_margin_above_icon"

            android:layout_marginBottom="@dimen/qs_tile_margin_below_icon"

            android:src="@drawable/ic_qs_camera"

            />



        <TextView

            style="@style/TextAppearance.QuickSettings.TileView"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:layout_gravity="center"

            android:gravity="center"

        android:layout_centerInParent="true"

        android:drawableTop="@drawable/ic_qs_camera"

            android:text="@string/quick_settings_camera_label"

        android:singleLine="true" />

            />



    </LinearLayout>



    <FrameLayout android:id="@+id/camera_surface_holder"

        android:layout_width="match_parent"

packages/SystemUI/src/com/android/systemui/quicksettings/CameraTile.java

+4 −5
Original line number Diff line number Diff line
@@ -28,7 +28,6 @@ import android.view.View; 
import android.view.ViewParent;

import android.view.WindowManager;

import android.widget.FrameLayout;

import android.widget.TextView;

import android.widget.Toast;



import java.io.File;
@@ -48,7 +47,7 @@ public class CameraTile extends QuickSettingsTile { 
    private static final int CAMERA_ID = 0;



    private Handler mHandler;

    private TextView mTextView;

    private View mIconContainer;

    private FrameLayout mSurfaceLayout;

    private SurfaceView mSurfaceView;

    private View mFlashView;
@@ -138,7 +137,7 @@ public class CameraTile extends QuickSettingsTile { 
                }

            }, 100);



            mTextView.setVisibility(View.GONE);

            mIconContainer.setVisibility(View.GONE);

            mSurfaceView = new CameraPreview(mContext, mCamera);

            mSurfaceView.setVisibility(View.VISIBLE);

            mSurfaceLayout.addView(mSurfaceView, 0);
@@ -225,7 +224,7 @@ public class CameraTile extends QuickSettingsTile { 
            mCameraStarted = false;

            mCameraOrientationListener.disable();



            mTextView.setVisibility(View.VISIBLE);

            mIconContainer.setVisibility(View.VISIBLE);

            mSurfaceView.setVisibility(View.GONE);

            mSurfaceLayout.removeView(mSurfaceView);

            mSurfaceView = null;
@@ -276,7 +275,7 @@ public class CameraTile extends QuickSettingsTile { 
            }

        };



        mTextView = (TextView) mTile.findViewById(R.id.camera_text);

        mIconContainer = mTile.findViewById(R.id.icon_container);

        mSurfaceLayout = (FrameLayout) mTile.findViewById(R.id.camera_surface_holder);

        mFlashView = mTile.findViewById(R.id.camera_surface_flash_overlay);

packages/SystemUI/src/com/android/systemui/quicksettings/QuickSettingsTile.java

+7 −3
Original line number Diff line number Diff line
@@ -13,6 +13,7 @@ import android.view.View; 
import android.view.View.OnClickListener;

import android.view.View.OnLongClickListener;

import android.view.ViewGroup;

import android.widget.ImageView;

import android.widget.TextView;



import com.android.systemui.R;
@@ -36,7 +37,7 @@ public class QuickSettingsTile implements OnClickListener { 




    public QuickSettingsTile(Context context, QuickSettingsController qsc) {

        this(context, qsc, R.layout.quick_settings_tile_generic);

        this(context, qsc, R.layout.quick_settings_tile_basic);

    }



    public QuickSettingsTile(Context context, QuickSettingsController qsc, int layout) {
@@ -74,11 +75,14 @@ public class QuickSettingsTile implements OnClickListener { 
    }



    void updateQuickSettings(){

        TextView tv = (TextView) mTile.findViewById(R.id.tile_textview);

        TextView tv = (TextView) mTile.findViewById(R.id.text);

        if (tv != null) {

            tv.setCompoundDrawablesWithIntrinsicBounds(0, mDrawable, 0, 0);

            tv.setText(mLabel);

        }

        ImageView image = (ImageView) mTile.findViewById(R.id.image);

        if (image != null) {

            image.setImageResource(mDrawable);

        }

    }



    void startSettingsActivity(String action) {