[Android Builders Collective] diddly3000:
first off i know this isn't a slimroms question, but ye helped me before with stuff and im feeling a bit cheeky lol.

posted this earlier in rastapop and the thread has been quiet, could anyone here shed some light :)

was looking to add some features into my aosp build. i googled and googled and googled and i cannot find any guides about moving actual features into a rom. i tried to git cherry-pick the commit but as expected got errors and failed. i didnt understand what it was telling me or what i need to do to prepare for these commits.

i want to add center clock with date, battery options with a text option, quick pulldown for right side and customisable quick settings like in cm.

i wanted to start with something like this https://github.com/SimpleAOSP-Lolli...mmit/5d7647c09dfec74da9b20be8067df15ec85cb014

could anyone give me an explination on what to look for before cherry picking or any advice on how to go about it.

sorry if this is in the wrong place, just eager to learn lol

update: this is one of the issues when i did git status

as far as im aware its between the the <<<<<<<<<HEAD & >>>>>>>>>>

but i am not sure what to do with it lol :p

* 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.

*/

package com.android.systemui.qs;

import android.animation.Animator;

import android.animation.Animator.AnimatorListener;

import android.animation.AnimatorListenerAdapter;

import android.content.Context;

import android.content.Intent;

import android.content.res.Configuration;

import android.content.res.Resources;

import android.os.Handler;

import android.os.Message;

<<<<<<< HEAD

=======

import android.os.UserHandle;

import android.provider.Settings;

import android.os.Vibrator;

import android.os.UserHandle;

import android.provider.Settings;

>>>>>>> 6fd9082... Add customization for Quick Settings [1/2]

import android.util.AttributeSet;

import android.view.LayoutInflater;

import android.view.View;

import android.view.ViewGroup;

import android.view.accessibility.AccessibilityEvent;

import android.widget.ImageView;

import android.widget.TextView;

import com.android.systemui.FontSizeUtils;

import com.android.systemui.R;

import com.android.systemui.qs.QSTile.DetailAdapter;

import com.android.systemui.settings.BrightnessController;

import com.android.systemui.settings.ToggleSlider;

import com.android.systemui.statusbar.phone.QSTileHost;

import com.android.systemui.statusbar.policy.BrightnessMirrorController;

import java.util.ArrayList;

import java.util.Collection;

/** View that represents the quick settings tile panel. **/

public class QSPanel extends ViewGroup {

private static final float TILE_ASPECT = 1.2f;

private final Context mContext;

private final ArrayList<TileRecord> mRecords = new ArrayList<TileRecord>();

private final View mDetail;

private final ViewGroup mDetailContent;

private final TextView mDetailSettingsButton;

private final TextView mDetailDoneButton;

private final View mBrightnessView;

private final QSDetailClipper mClipper;

private final H mHandler = new H();

private int mColumns;

private int mCellWidth;

private int mCellHeight;

private int mLargeCellWidth;

private int mLargeCellHeight;

private int mPanelPaddingBottom;

private int mDualTileUnderlap;

private int mBrightnessPaddingTop;

private boolean mExpanded;

private boolean mListening;

private Record mDetailRecord;

private Callback mCallback;

private BrightnessController mBrightnessController;

private QSTileHost mHost;

private QSFooter mFooter;

private boolean mGridContentVisible = true;

<<<<<<< HEAD

=======

private boolean mUseMainTiles = false;

protected Vibrator mVibrator;

>>>>>>> 6fd9082... Add customization for Quick Settings [1/2]

public QSPanel(Context context) {

this(context, null);

}