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

Commit 9b46d456 authored by Steve Kondik's avatar Steve Kondik
Browse files

systemui: Fix compilation issues 

 * Update tiles for new APIs
 * Fix merge conflicts
 * Animation code in the screen timeout tile needs refactored- it is
   broken as-is in CM12.

Change-Id: I97f2104bf268cd398688235f72f5a623392aca13
parent fb0a9057

packages/SystemUI/res/drawable/ic_qs_location_off.xml

0 → 100644
+28 −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.

-->

<vector xmlns:android="http://schemas.android.com/apk/res/android"

        android:width="64dp"

        android:height="64dp"

        android:viewportWidth="48.0"

        android:viewportHeight="48.0">



    <path

        android:fillColor="#4DFFFFFF"

        android:pathData="M24.0,13.0c2.8,0.0 5.0,2.2 5.0,5.0c0.0,1.5 -0.7,2.8 -1.7,3.7l7.3,7.3c2.0,-3.7 3.4,-7.6 3.4,-11.0c0.0,-7.7 -6.3,-14.0 -14.0,-14.0c-4.0,0.0 -7.5,1.6 -10.1,4.3l6.4,6.4C21.2,13.6 22.5,13.0 24.0,13.0zM32.7,32.2l-9.3,-9.3l-0.2,-0.2L6.5,6.0L4.0,8.5l6.4,6.4c-0.2,1.0 -0.4,2.0 -0.4,3.1c0.0,10.5 14.0,26.0 14.0,26.0s3.3,-3.7 6.8,-8.7l6.7,6.7l2.5,-2.5L32.7,32.2z"/>

    <path

        android:pathData="M23.5,22.9l0.0,0.0 -0.20000076,-0.19999886z"

        android:fillColor="#4DFFFFFF"/>

</vector>

packages/SystemUI/res/drawable/ic_qs_location_on.xml

0 → 100644
+25 −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.

-->

<vector xmlns:android="http://schemas.android.com/apk/res/android"

        android:width="64dp"

        android:height="64dp"

        android:viewportWidth="48.0"

        android:viewportHeight="48.0">



    <path

        android:fillColor="#FFFFFFFF"

        android:pathData="M24.0,4.0c-7.7,0.0 -14.0,6.3 -14.0,14.0c0.0,10.5 14.0,26.0 14.0,26.0s14.0,-15.5 14.0,-26.0C38.0,10.3 31.7,4.0 24.0,4.0zM24.0,23.0c-2.8,0.0 -5.0,-2.2 -5.0,-5.0s2.2,-5.0 5.0,-5.0c2.8,0.0 5.0,2.2 5.0,5.0S26.8,23.0 24.0,23.0z"/>

</vector>

packages/SystemUI/src/com/android/systemui/qs/QSPanel.java

+1 −0
Original line number Diff line number Diff line
@@ -26,6 +26,7 @@ import android.content.res.Resources; 
import android.graphics.Point;

import android.os.Handler;

import android.os.Message;

import android.os.UserHandle;

import android.provider.Settings;

import android.util.AttributeSet;

import android.view.LayoutInflater;

packages/SystemUI/src/com/android/systemui/qs/QSTileView.java

+1 −1
Original line number Diff line number Diff line
@@ -182,7 +182,7 @@ public class QSTileView extends ViewGroup { 
        }

        if (dual) {

            mTopBackgroundView.setOnClickListener(mClickPrimary);

            mTopBackgroundView.setOnLongClickListener(mClickLong);

            mTopBackgroundView.setOnLongClickListener(mLongClick);

            setOnClickListener(null);

            setClickable(false);

            setImportantForAccessibility(View.IMPORTANT_FOR_ACCESSIBILITY_NO);

packages/SystemUI/src/com/android/systemui/qs/tiles/ColorInversionTile.java

+0 −13
Original line number Diff line number Diff line
@@ -92,19 +92,6 @@ public class ColorInversionTile extends QSTile<QSTile.BooleanState> { 
        mDisable.setAllowAnimation(true);

    }



    @Override

    protected void handleLongClick() {

        if (mState.value) return;  // don't allow usage reset if inversion is active

        final String title = mContext.getString(R.string.quick_settings_reset_confirmation_title,

                mState.label);

        mUsageTracker.showResetConfirmation(title, new Runnable() {

            @Override

            public void run() {

                refreshState();

            }

        });

    }



    @Override

    protected void handleLongClick() {

        mHost.startSettingsActivity(ACCESSIBILITY_SETTINGS);