psmattas/android_packages_apps_Cherish
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Cherish: Add WakelockBlocker [2/2]

Browse Source 
Included WakeLock: Layout Improvements (See image below)
- Moved switch to the right
- Replaced refresh/save icons to match stock lollipop theme
- Added padding to title/summary
- Removed drawables / add vector

- http://i.imgur.com/5HMpfQw.png

Signed-off-by: Hưng Phan <phandinhhungvp2001@gmail.com>
This commit is contained in:
Alex Cruz
2017-09-02 14:46:12 +08:00
committed by Hưng Phan
parent c2dc90c18c
commit 398e4eeca7
6 changed files with 453 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
res/drawable/ic_wakelockblocker_save.xml Normal file
View File

@@ -0,0 +1,25 @@
<!--
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="24dp"
android:height="24dp"
android:viewportWidth="24"
android:viewportHeight="24"
android:tint="?android:attr/colorControlNormal">
<path
android:pathData="M17 3H5c-1.11 0-2 .9-2 2v14c0 1.1.89 2 2 2h14c1.1 0 2-.9 2-2V7l-4-4zm-5 16c-1.66 0-3-1.34-3-3s1.34-3 3-3 3 1.34 3 3-1.34 3-3 3zm3-10H5V5h10v4z"
android:fillColor="?android:attr/colorAccent"/>
</vector>

79
res/layout/wakelock_blocker.xml Normal file
View File

@@ -0,0 +1,79 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
/*
** Copyright 2013, 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.
*/
-->
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:minHeight="?android:attr/listPreferredItemHeight"
android:gravity="center_vertical"
android:paddingEnd="?android:attr/scrollbarSize"
android:background="?android:attr/selectableItemBackground"
android:orientation="vertical">
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:orientation="horizontal">
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content">
<TextView android:id="@+id/wakelock_blocker_title"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:singleLine="true"
android:textAppearance="?android:attr/textAppearanceMedium"
android:ellipsize="marquee"
android:text="@string/wakelock_blocker_title"
android:padding="6dp"
android:fadingEdge="horizontal" />
<TextView android:id="@+id/wakelock_blocker_title_summary"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@id/wakelock_blocker_title"
android:layout_alignStart="@id/wakelock_blocker_title"
android:textAppearance="?android:attr/textAppearanceSmall"
android:textColor="?android:attr/textColorSecondary"
android:text="@string/wakelock_blocker_summary"
android:padding="6dp"
android:maxLines="4" />
<Switch
android:id="@+id/wakelock_blocker_switch"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true" />
</RelativeLayout>
</LinearLayout>
<TextView
android:id="@+id/wakelock_list_header"
android:text="@string/wakelock_list_header"
style="?android:attr/listSeparatorTextViewStyle" />
<ListView
android:id="@+id/wakelock_list"
android:layout_width="match_parent"
android:layout_height="match_parent"/>
</LinearLayout>

32
res/layout/wakelock_item.xml Normal file
View File

@@ -0,0 +1,32 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
/*
** Copyright 2013, 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.
*/
-->
<LinearLayout
xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="fill_parent"
android:layout_height="wrap_content">
<CheckBox
android:id="@+id/wakelock_blocked"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textAppearance="?android:attr/textAppearanceSmall"
android:focusable="false"/>
</LinearLayout>

9
res/values/cherish_strings.xml
View File

@@ -1238,4 +1238,13 @@
<string name="qs_clock_styling">Qs Clock Styling</string>
<string name="qs_clock_font_size_title">Qs Clock Font size</string>
<string name="qs_clock_color_title">Qs Clock Color</string>
<!-- Wakelock blocker -->
<string name="wakelock_blocker_title">Wakelock blocker</string>
<string name="wakelock_blocker_summary">Block system wakelocks</string>
<string name="wakelock_blocker_save">Save</string>
<string name="wakelock_list_header">Available wakelocks</string>
<string name="wakelock_blocker_reload">Reload</string>
<string name="wakelock_blocker_warning_title">Proceed with caution</string>
<string name="wakelock_blocker_warning">Blocking wakelocks have the potential to cause instability, crashes or data loss</string>
</resources>

6
res/xml/cherish_settings_misc.xml
View File

@@ -125,6 +125,12 @@
android:title="@string/smart_pixels_title"
android:summary="@string/smart_pixels_summary" />
<Preference
android:key="wakelock_blocker"
android:title="@string/wakelock_blocker_title"
android:summary="@string/wakelock_blocker_summary"
android:fragment="com.cherish.settings.fragments.WakeLockBlocker" />
<PreferenceCategory
android:key="corners_category"
android:title="@string/corners_category" >

302
src/com/cherish/settings/fragments/WakeLockBlocker.java Normal file
View File

@@ -0,0 +1,302 @@
/*
* Copyright (C) 2014 The LiquidSmooth Project
* (C) 2018 crDroid Android 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.cherish.settings.fragments;
import android.app.AlertDialog;
import android.content.ContentResolver;
import android.content.Context;
import android.content.DialogInterface;
import android.os.Bundle;
import android.os.PowerManager;
import android.os.UserHandle;
import android.preference.PreferenceFragment;
import android.provider.Settings;
import android.util.Log;
import android.view.LayoutInflater;
import android.view.Menu;
import android.view.MenuInflater;
import android.view.MenuItem;
import android.view.View;
import android.view.ViewGroup;
import android.widget.AdapterView;
import android.widget.ArrayAdapter;
import android.widget.CheckBox;
import android.widget.CompoundButton;
import android.widget.ListView;
import android.widget.Switch;
import android.widget.TextView;
import java.util.ArrayList;
import java.util.Collections;
import java.util.HashMap;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
import com.android.internal.logging.nano.MetricsProto;
import com.android.settings.R;
import com.android.settings.SettingsPreferenceFragment;
public class WakeLockBlocker extends SettingsPreferenceFragment {
private static final String TAG = "WakeLockBlocker";
private Switch mBlockerEnabled;
private ListView mWakeLockList;
private List<String> mSeenWakeLocks;
private List<String> mBlockedWakeLocks;
private LayoutInflater mInflater;
private Map<String, Boolean> mWakeLockState;
private WakeLockListAdapter mListAdapter;
private boolean mEnabled;
private AlertDialog mAlertDialog;
private boolean mAlertShown = false;
private TextView mWakeLockListHeader;
private static final int MENU_RELOAD = Menu.FIRST;
private static final int MENU_SAVE = Menu.FIRST + 1;
public class WakeLockListAdapter extends ArrayAdapter<String> {
public WakeLockListAdapter(Context context, int resource, List<String> values) {
super(context, R.layout.wakelock_item, resource, values);
}
@Override
public View getView(int position, View convertView, ViewGroup parent) {
View rowView = mInflater.inflate(R.layout.wakelock_item, parent, false);
final CheckBox check = (CheckBox)rowView.findViewById(R.id.wakelock_blocked);
check.setText(mSeenWakeLocks.get(position));
Boolean checked = mWakeLockState.get(check.getText().toString());
check.setChecked(checked.booleanValue());
if(checked.booleanValue()) {
check.setTextColor(getResources().getColor(android.R.color.holo_red_light));
}
check.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
@Override
public void onCheckedChanged(CompoundButton v, boolean checked) {
mWakeLockState.put(v.getText().toString(), new Boolean(checked));
if(checked) {
check.setTextColor(getResources().getColor(android.R.color.holo_red_light));
mListAdapter.notifyDataSetChanged();
} else {
check.setTextColor(getResources().getColor(android.R.color.primary_text_dark));
mListAdapter.notifyDataSetChanged();
}
}
});
return rowView;
}
}
@Override
public int getMetricsCategory() {
return MetricsProto.MetricsEvent.CHERISH_SETTINGS;
}
@Override
public void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
Log.d(TAG, "running");
}
@Override
public View onCreateView(LayoutInflater inflater, ViewGroup container,
Bundle savedInstanceState) {
mInflater = inflater;
setHasOptionsMenu(true);
return inflater.inflate(R.layout.wakelock_blocker, container, false);
}
@Override
public void onActivityCreated(Bundle savedInstanceState) {
super.onActivityCreated(savedInstanceState);
mWakeLockState = new HashMap<String, Boolean>();
updateSeenWakeLocksList();
updateBlockedWakeLocksList();
mBlockerEnabled = (Switch) getActivity().findViewById(
R.id.wakelock_blocker_switch);
mWakeLockList = (ListView) getActivity().findViewById(
R.id.wakelock_list);
mWakeLockListHeader = (TextView) getActivity().findViewById(
R.id.wakelock_list_header);
mListAdapter = new WakeLockListAdapter(getActivity(), android.R.layout.simple_list_item_multiple_choice,
mSeenWakeLocks);
mWakeLockList.setAdapter(mListAdapter);
updateSwitches();
// after updateSwitches!!!
mBlockerEnabled
.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
@Override
public void onCheckedChanged(CompoundButton v, boolean checked) {
if (checked && isFirstEnable() && !mAlertShown) {
showAlert();
mAlertShown = true;
}
Settings.Global.putInt(getActivity().getContentResolver(),
Settings.Global.WAKELOCK_BLOCKING_ENABLED,
checked ? 1 : 0);
updateSwitches();
}
});
}
private boolean isFirstEnable() {
return Settings.Global.getString(getActivity().getContentResolver(),
Settings.Global.WAKELOCK_BLOCKING_LIST) == null;
}
private void updateSwitches() {
mBlockerEnabled.setChecked(Settings.Global.getInt(getActivity().getContentResolver(),
Settings.Global.WAKELOCK_BLOCKING_ENABLED, 0) == 1);
mEnabled = mBlockerEnabled.isChecked();
//mWakeLockList.setEnabled(mEnabled);
mWakeLockList.setVisibility(mEnabled ?View.VISIBLE : View.INVISIBLE);
mWakeLockListHeader.setVisibility(mEnabled ?View.VISIBLE : View.INVISIBLE);
}
private void updateSeenWakeLocksList() {
PowerManager pm = (PowerManager) getActivity().getSystemService(Context.POWER_SERVICE);
Log.d(TAG, pm.getSeenWakeLocks());
String seenWakeLocks = pm.getSeenWakeLocks();
mSeenWakeLocks = new ArrayList<String>();
if (seenWakeLocks!=null && seenWakeLocks.length()!=0) {
String[] parts = seenWakeLocks.split("\\|");
for(int i = 0; i < parts.length; i++) {
mSeenWakeLocks.add(parts[i]);
mWakeLockState.put(parts[i], new Boolean(false));
}
}
}
private void updateBlockedWakeLocksList() {
String blockedWakelockList = Settings.Global.getString(getActivity().getContentResolver(),
Settings.Global.WAKELOCK_BLOCKING_LIST);
mBlockedWakeLocks = new ArrayList<String>();
if (blockedWakelockList!=null && blockedWakelockList.length()!=0) {
String[] parts = blockedWakelockList.split("\\|");
for(int i = 0; i < parts.length; i++) {
mBlockedWakeLocks.add(parts[i]);
// add all blocked but not seen so far
if(!mSeenWakeLocks.contains(parts[i])) {
mSeenWakeLocks.add(parts[i]);
}
mWakeLockState.put(parts[i], new Boolean(true));
}
}
Collections.sort(mSeenWakeLocks);
}
private void save() {
StringBuffer buffer = new StringBuffer();
Iterator<String> nextState = mWakeLockState.keySet().iterator();
while(nextState.hasNext()) {
String name = nextState.next();
Boolean state=mWakeLockState.get(name);
if(state.booleanValue()) {
buffer.append(name + "|");
}
}
if(buffer.length() > 0) {
buffer.deleteCharAt(buffer.length() - 1);
}
Log.d(TAG, buffer.toString());
Settings.Global.putString(getActivity().getContentResolver(),
Settings.Global.WAKELOCK_BLOCKING_LIST, buffer.toString());
}
private void reload() {
mWakeLockState = new HashMap<String, Boolean>();
updateSeenWakeLocksList();
updateBlockedWakeLocksList();
mListAdapter.notifyDataSetChanged();
}
@Override
public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
menu.add(0, MENU_RELOAD, 0, R.string.wakelock_blocker_reload)
.setIcon(com.android.internal.R.drawable.ic_menu_refresh)
.setAlphabeticShortcut('r')
.setShowAsAction(MenuItem.SHOW_AS_ACTION_IF_ROOM |
MenuItem.SHOW_AS_ACTION_WITH_TEXT);
menu.add(0, MENU_SAVE, 0, R.string.wakelock_blocker_save)
.setIcon(R.drawable.ic_wakelockblocker_save)
.setAlphabeticShortcut('s')
.setShowAsAction(MenuItem.SHOW_AS_ACTION_IF_ROOM |
MenuItem.SHOW_AS_ACTION_WITH_TEXT);
}
@Override
public boolean onOptionsItemSelected(MenuItem item) {
switch (item.getItemId()) {
case MENU_RELOAD:
if (mEnabled) {
reload();
}
return true;
case MENU_SAVE:
if (mEnabled) {
save();
}
return true;
default:
return false;
}
}
public static void reset(Context mContext) {
ContentResolver resolver = mContext.getContentResolver();
Settings.Global.putInt(resolver,
Settings.Global.WAKELOCK_BLOCKING_ENABLED, 0);
}
private void showAlert() {
/* Display the warning dialog */
mAlertDialog = new AlertDialog.Builder(getActivity()).create();
mAlertDialog.setTitle(R.string.wakelock_blocker_warning_title);
mAlertDialog.setMessage(getResources().getString(R.string.wakelock_blocker_warning));
mAlertDialog.setButton(DialogInterface.BUTTON_POSITIVE,
getResources().getString(com.android.internal.R.string.ok),
new DialogInterface.OnClickListener() {
public void onClick(DialogInterface dialog, int which) {
return;
}
});
mAlertDialog.show();
}
}