From b6a9fa5e442b85cd262042d0cbaa8c9d67831fea Mon Sep 17 00:00:00 2001 From: lozo2010 Date: Wed, 10 Jun 2015 14:09:24 +0200 Subject: [PATCH 01/29] Update dashboard_categories.xml --- res/xml/dashboard_categories.xml | 22 ++++++++-------------- 1 file changed, 8 insertions(+), 14 deletions(-) diff --git a/res/xml/dashboard_categories.xml b/res/xml/dashboard_categories.xml index f8e314c01ba..fd2821b5e1d 100644 --- a/res/xml/dashboard_categories.xml +++ b/res/xml/dashboard_categories.xml @@ -75,23 +75,17 @@ android:id="@+id/personalization_section" android:title="@string/header_category_personalization" > - - - + + + android:id="@+id/main_settings" + android:title="@string/nuclear_settings_title" + android:fragment="com.android.settings.nuclear.MainSettings" + android:icon="@drawable/ic_nuclear" + /> - + Date: Wed, 10 Jun 2015 14:50:46 +0200 Subject: [PATCH 02/29] Algunos cambios --- res/values/slim_strings.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/res/values/slim_strings.xml b/res/values/slim_strings.xml index c5fc73a88fd..5c939725e2c 100644 --- a/res/values/slim_strings.xml +++ b/res/values/slim_strings.xml @@ -51,7 +51,7 @@ Show notification if privacy guard is active. - Slim version + NuclearSlim version Unknown Build date @@ -836,7 +836,7 @@ Never - SlimPIE + NuclearSlimPIE Enable pie controls Navigation size Trigger options @@ -1042,4 +1042,4 @@ Do you want to remove this blacklist entry? Select contact - \ No newline at end of file + From 3fc48316eff3d941c6f3321b0a0c0295fe5427f4 Mon Sep 17 00:00:00 2001 From: Moludos Date: Wed, 10 Jun 2015 14:52:31 +0200 Subject: [PATCH 03/29] Algunos cambios --- res/values-es/slim_strings.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/res/values-es/slim_strings.xml b/res/values-es/slim_strings.xml index 8777adf04c1..8bd6c121d5d 100644 --- a/res/values-es/slim_strings.xml +++ b/res/values-es/slim_strings.xml @@ -37,7 +37,7 @@ Avanzado Notificación Mostrar notificación con Protección de Privacidad activa. - Versión SLIM + Versión NuclearSlim Desconocido Fecha de compilación Desconocido From caeede8451fba18f0035eb36a7cb1da934ae2c3e Mon Sep 17 00:00:00 2001 From: moludo Date: Wed, 10 Jun 2015 15:45:39 +0200 Subject: [PATCH 04/29] AddMenuNuclear --- res/drawable-hdpi/ic_menu_save.png | Bin 0 -> 3369 bytes res/drawable-hdpi/ic_settings_performance.png | Bin 0 -> 1630 bytes res/drawable-mdpi/ic_menu_save.png | Bin 0 -> 503 bytes res/drawable-mdpi/ic_settings_performance.png | Bin 0 -> 1271 bytes res/drawable-xhdpi/ic_menu_save.png | Bin 0 -> 764 bytes res/drawable-xhdpi/ic_nuclear.png | Bin 0 -> 1941 bytes .../ic_settings_performance.png | Bin 0 -> 1960 bytes res/drawable-xxhdpi/ic_menu_save.png | Bin 0 -> 1160 bytes res/drawable-xxhdpi/ic_nuclear.png | Bin 0 -> 4334 bytes .../ic_settings_performance.png | Bin 0 -> 1539 bytes res/layout/wakelock_blocker.xml | 89 ++++++ res/layout/wakelock_item.xml | 32 ++ res/values/strings.xml | 19 +- res/xml/device_info_settings.xml | 4 - res/xml/nuclear_main_settings.xml | 68 ++++ .../settings/aicp/WakeLockBlocker.java | 298 ++++++++++++++++++ .../settings/nuclear/MainSettings.java | 39 +++ 17 files changed, 544 insertions(+), 5 deletions(-) create mode 100644 res/drawable-hdpi/ic_menu_save.png create mode 100644 res/drawable-hdpi/ic_settings_performance.png create mode 100644 res/drawable-mdpi/ic_menu_save.png create mode 100644 res/drawable-mdpi/ic_settings_performance.png create mode 100644 res/drawable-xhdpi/ic_menu_save.png create mode 100644 res/drawable-xhdpi/ic_nuclear.png create mode 100644 res/drawable-xhdpi/ic_settings_performance.png create mode 100644 res/drawable-xxhdpi/ic_menu_save.png create mode 100644 res/drawable-xxhdpi/ic_nuclear.png create mode 100644 res/drawable-xxhdpi/ic_settings_performance.png create mode 100644 res/layout/wakelock_blocker.xml create mode 100644 res/layout/wakelock_item.xml create mode 100644 res/xml/nuclear_main_settings.xml create mode 100644 src/com/android/settings/aicp/WakeLockBlocker.java create mode 100644 src/com/android/settings/nuclear/MainSettings.java diff --git a/res/drawable-hdpi/ic_menu_save.png b/res/drawable-hdpi/ic_menu_save.png new file mode 100644 index 0000000000000000000000000000000000000000..bb593cfc25498b50bc1a32c7ae39740587414dcf GIT binary patch literal 3369 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 literal 0 HcmV?d00001 diff --git a/res/drawable-hdpi/ic_settings_performance.png b/res/drawable-hdpi/ic_settings_performance.png new file mode 100644 index 0000000000000000000000000000000000000000..bba579017ff985b641548e41cfcbd8ae90a7d3e9 GIT binary patch literal 1630 zcmah|Yfw{H5I#47@W?|Pz}z6MXd)mr7$V3^9fBZ9kv9scWrBcJY}IP02%-rJAtAg; z2mur;Ra9OE0a5DUqb*d62--pk+KN`7(o&V7TBzM5GtT&<)6BW&?(W&|+i&-t$ihQ| zsFrq?2qCI~9}o#|j{Y$x!Y>0p5h8pLz9Bjg5|C1AS)s6~$fH#jV5(eH zmSa*b!%vh@H2L-?%gihCFs0P#OATVrH&^EoRJk_QMP!WvQ|1y?xukMAk{&=Qo9t>z zQPgS_=4E@l_|2O)NS=-gj;w8}MZqhPBGam}0F`D#Ay^BJ7sC!bfCXk)b?048c%a<*D=ckm=j(@gNj?te= zn1m0<*LGYKVDbh#yzL|E(uw-i4gn?}lW^-5ZFGDv2E&Jrgg)4W*^g2#)-wrVXX$y< z)m)n6$fL7ViI|2DWk$Y;C$BqtSUq-x+KLmF#y<>Y7XSL<$w7whRtSX>(ne_w{*y&e zyBwbe+1R$=paAmLkhs&M#k#0vs=(fn@{g}7-FVZH4}508zu z>$fS-@7j^FbJwn&DRtJTvIRjgVGo7AR`}R&;}e|u+>yTS!J8sq8?^>s$avJ6efPGG zP^;_z&hFgT*L9Ra+V+KOw$!-zW|##zso8Dmt8ROhwRl~*bXh`4oe@syXlA<`U3-@g z-fKx8AHtq|m3e4xaF*D{#C+GR*tB8#nS|#zI+?Z3pTS_8j!gzY6gf z?n)y49&63IPx`FOub}X8z(7|ia(8xH#=u#MXUq5#Q3L%e#nFU$=hEY^-kuz8(Z0Ht zP+6K6-gKh;PDOQVW`^UU6>^d!>-ywyp2Ona*iXoX9VPu-9_gDeCWpynlkmj)PQqzk zoz`;q;na`@4l#CJpf}T%x+IlD)=ex7xK@(p!I63R-}m%ruTzzmx64O=bh!5ejeJL5 zAeUSI(d(LU$d1Lj62WBGoS`>SuV>CVPgFYc1)~EFOy3I@adWjjQIC_RQmiU{8tS^! zUQ=@0Dy;oF%KVxMlGQhs*Jaq)BWZnUcBK%dEpAS;xVJ`;b9L*-B~y%nrb)E27pC4-orZXVqZ}<>gqZk#GZHfg!g!hhsYIWGo8UN zS>P(JguV~r7GB^v?#0?RcJT5<21zFQ5=WUv_anertUtmVY^bX&J+~>qumL)>38+i# zj&VEALSwhn73n2rU2jYY*7Df zP@c6IKV1dz9j|dT5n-Rj<5d8CT|Z!RME@Cg0@SPmIHM?U%)CR_rqpv?bf~VLU}GeJ zuXwd8pub3$lWyq-y3J&5DL{Xz4i)9@Oo`5hZMSR&Tlg5yvYAqz!@-{b+IS`JM_KZ@ t5+s-KDE790^|Q;C{Q@Ut?DzYp}d6cq`<6?v2sd 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 + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/res/layout/wakelock_item.xml b/res/layout/wakelock_item.xml new file mode 100644 index 00000000000..ac8c64c5ce5 --- /dev/null +++ b/res/layout/wakelock_item.xml @@ -0,0 +1,32 @@ + + + + + + + + diff --git a/res/values/strings.xml b/res/values/strings.xml index 26e1faefb2c..ae7a68d2e91 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -6179,5 +6179,22 @@ IMEI information IMEI relative information (Slot%1$d) - + + KernelAdiutor + +Personalizacion +Version NuclearSlim +NuclearMod V1.0 +Wakelock blocker +Block system wakelocks +Save +Available wakelocks +Reload +Proceed with caution +Blocking wakelocks have the potential to cause instability, crashes or data loss +SETTINGS +Rendimiento +Ajustes Nuclear +Privacidad +Personalización diff --git a/res/xml/device_info_settings.xml b/res/xml/device_info_settings.xml index 165c56d6278..d1d219ce70d 100644 --- a/res/xml/device_info_settings.xml +++ b/res/xml/device_info_settings.xml @@ -17,10 +17,6 @@ - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/com/android/settings/aicp/WakeLockBlocker.java b/src/com/android/settings/aicp/WakeLockBlocker.java new file mode 100644 index 00000000000..897665fafd5 --- /dev/null +++ b/src/com/android/settings/aicp/WakeLockBlocker.java @@ -0,0 +1,298 @@ +/* + * Copyright (C) 2014 The LiquidSmooth 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.settings.aicp; + +import android.content.Context; +import android.os.Bundle; +import android.os.PowerManager; +import android.util.Log; +import android.view.View; +import android.view.ViewGroup; +import android.preference.PreferenceFragment; +import android.view.LayoutInflater; +import android.widget.Switch; +import android.widget.ListView; +import android.widget.ArrayAdapter; +import android.widget.TextView; +import android.widget.CheckBox; +import android.widget.CompoundButton; +import android.widget.AdapterView; +import android.provider.Settings; +import android.view.Menu; +import android.view.MenuInflater; +import android.view.MenuItem; +import android.app.AlertDialog; +import android.content.DialogInterface; + +import java.util.List; +import java.util.Iterator; +import java.util.ArrayList; +import java.util.Map; +import java.util.HashMap; +import java.util.Collections; + +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 mSeenWakeLocks; + private List mBlockedWakeLocks; + private LayoutInflater mInflater; + private Map 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 { + + public WakeLockListAdapter(Context context, int resource, List 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)); + } else { + check.setTextColor(getResources().getColor(android.R.color.primary_text_dark)); + } + } + }); + return rowView; + } + } + + @Override + public void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + Log.d("maxwen", "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(); + 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.System.putInt(getActivity().getContentResolver(), + Settings.System.WAKELOCK_BLOCKING_ENABLED, + checked?1:0); + + updateSwitches(); + } + }); + } + + @Override + public void onResume() { + super.onResume(); + } + + @Override + public void onPause() { + super.onPause(); + } + + @Override + public void onDestroy() { + super.onDestroy(); + } + + private boolean isFirstEnable() { + return Settings.System.getString(getActivity().getContentResolver(), + Settings.System.WAKELOCK_BLOCKING_ENABLED) == null; + } + + private void updateSwitches() { + mBlockerEnabled.setChecked(Settings.System.getInt(getActivity().getContentResolver(), + Settings.System.WAKELOCK_BLOCKING_ENABLED, 0)==1?true:false); + + 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("maxwen", pm.getSeenWakeLocks()); + + String seenWakeLocks = pm.getSeenWakeLocks(); + mSeenWakeLocks = new ArrayList(); + + 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.System.getString(getActivity().getContentResolver(), + Settings.System.WAKELOCK_BLOCKING_LIST); + + mBlockedWakeLocks = new ArrayList(); + + 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 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("maxwen", buffer.toString()); + Settings.System.putString(getActivity().getContentResolver(), + Settings.System.WAKELOCK_BLOCKING_LIST, buffer.toString()); + } + + private void reload(){ + mWakeLockState = new HashMap(); + updateSeenWakeLocksList(); + updateBlockedWakeLocksList(); + + mListAdapter.notifyDataSetChanged(); + } + + @Override + public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) { + menu.add(0, MENU_RELOAD, 0, R.string.wakelock_blocker_reload) + .setIcon(R.drawable.ic_menu_refresh_holo_dark) + .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_menu_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; + } + } + + 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(); + } +} diff --git a/src/com/android/settings/nuclear/MainSettings.java b/src/com/android/settings/nuclear/MainSettings.java new file mode 100644 index 00000000000..14f1ddb2bb4 --- /dev/null +++ b/src/com/android/settings/nuclear/MainSettings.java @@ -0,0 +1,39 @@ +/* + * Copyright (C) 2014 The LiquidSmooth 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.settings.nuclear; + +import android.content.Intent; +import android.content.pm.PackageManager; +import android.content.pm.ResolveInfo; +import android.os.Bundle; +import android.preference.Preference; +import android.preference.PreferenceScreen; + +import com.android.settings.R; +import com.android.settings.SettingsPreferenceFragment; + +import java.util.List; + +public class MainSettings extends SettingsPreferenceFragment { + + @Override + public void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + + addPreferencesFromResource(R.xml.nuclear_main_settings); + } +} From 09b0e464d6739bd1446bf9f0757aa9ba674ab59a Mon Sep 17 00:00:00 2001 From: david Date: Wed, 10 Jun 2015 19:14:23 +0200 Subject: [PATCH 05/29] Update --- AndroidManifest.xml | 23 ++++++++++++++++++ res/drawable-hdpi/ic_settings_privacy.png | Bin 722 -> 320 bytes .../ic_settings_privacy_guard.png | Bin 762 -> 611 bytes res/drawable-mdpi/ic_settings_privacy.png | Bin 515 -> 235 bytes res/drawable-xhdpi/ic_settings_privacy.png | Bin 1069 -> 499 bytes .../ic_settings_privacy_guard.png | Bin 818 -> 403 bytes res/drawable-xxhdpi/ic_settings_privacy.png | Bin 1611 -> 518 bytes .../ic_settings_privacy_guard.png | Bin 1471 -> 403 bytes res/drawable-xxxhdpi/ic_nuclear.png | Bin 0 -> 4782 bytes res/drawable-xxxhdpi/ic_settings_privacy.png | Bin 0 -> 1989 bytes res/values-es/slim_strings.xml | 2 +- res/values/slim_strings.xml | 4 +-- res/xml/device_info_settings.xml | 4 +++ res/xml/nuclear_main_settings.xml | 12 +++++++++ res/xml/security_settings_app_slim.xml | 4 +-- 15 files changed, 44 insertions(+), 5 deletions(-) create mode 100644 res/drawable-xxxhdpi/ic_nuclear.png create mode 100644 res/drawable-xxxhdpi/ic_settings_privacy.png diff --git a/AndroidManifest.xml b/AndroidManifest.xml index efbff40897f..66a0474cef1 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -535,6 +535,29 @@ android:resource="@id/language_settings" /> + + + + + + + + + + + + + + + + 0onf21;7H3BYyw}VoOIv0RI600RN!9r;`8x010qNS#tmY3ljhU3ljkVnw%H_ z000McNliru-v$Z`A|zO)T#f($0L@86K~!ko?U>0CgFp-fS1Ph40wQn(#B08k3kqK!Vc4D|)CA@NLl(fmCIh?tJ)Dmbv0uXqpz~pv{o<0B72pEV>VPQWHrgH#jBwXaE2J07*qoM6N<$f+;3?LjV8( delta 699 zcmV;s0!0150@4MLBYy&!NklkyKXZx-^lL2^iD_0ycuEh5t~&Mk5y5YGHHvJ-L;0$?eRW+0{Fkg~z^| zoA>tn-uGtqPt;K7M^xwd8v=pHRxl_K6!5G-Xd%x6dWU-}P=6|wT0pUkbtuv7F#k;y zMQ6&md(*uLl)?WY<1VM4ZWsRrCg=7PGHMdm1Qg(x0QejGgcTrABvzC-#UH?5!|%z8gcSh= zc)=BeE+q(TLVut@uFs5*7+Ok{=(E{kZ3%1}_IcUMzhUDU5fFYm5a=|m9a{oY&9tLf zu5M-3eH6I87CDXhj1wdgvIhdxL9+&e0{8k|(LzTAj?ua+#4O-{#NWc7#y`Mcu-t_n zM*-80QC?5+HY)dqNvsk3`M=l)U&NLK4w&}@dkVm76n|O4@2`0R0Br)~95#dv0R9JK z!}!H&#A`+YfOZ4&3wDJ~08HK?WP4uc)K$|20ND$`d2Afu^5%AXFy6}PB(3dgLIHsO z0;KFl((88z<5T>Ytp@@#fPbF^3V}Vwo<9@;)5F{%Am65eNmPH3-(L;$GkutoFAr%i z@3J`CAb)XbB0=S43*E;gXSL&yKVFgV+?3DiVXnOBOe9vBC!a~Kt6dcE&HN`ft-dV4 zOAc!SmLx8iw}@?GHwlnZ`FB{__ap1d$GKGmEJ>JD_imfY1Zn~~kx*COS%ElE`JSAn ziZgii8c3qZfP@!#ZvqwVWIGd+o7zG+{Zij{VMkg(Wtzn9^wb0OC!IxvF1C_ znr@XP_=4z)BhYkX=ZG$0&1c|gh|^jy9nlr{)B+mr(;Azb8lld_JR6R6$|ICiSz1dt z&f)twqen&g2_+@psPM>XAR3pI)SJMmdtOYjd*d4Ehq9{d2IvCwW8+td_S{aMr-Y@4 zHCO+b={nz@NiBK{^eYHh-}w%zvWp4`U4)f=A|F;urz5(WrkT=0_E&5j0&xjcV&E`K zC)G3l4M2OW0S-J!4DKD|qV3{(C~08NfsX}us0|!V>OUa@EiRZlx!zUFNrsUVJp|3X z;@?kGTeAi1dy;v9=s{Jd{Q-qtcNXnLYVsqbav_uzw5Y96K`q+25I>-zZ6Av^F8V-35~CJT z5S0r_qIP{ixRIzFDk3mHM_>N~XYev~XYL!%ee*`%fgc0!-FMFU&%5v4bM6a;0t+m# zz}BTXj#CVFF~zx*cs@7)u7fYk4L+9d=fv|s19$|cLEKrjI3IfgqP`J=L`uL8&;ec~ zC9Sh%Fa}QWwHv%ndNXJQ=fEBC(J=93qia5ad*D210$Xe)eTwJtOE3vyVBV3ldG<-Z zUx8cTGzd#1U+*%RWuEVEzgA1UH&lQ2EhCZVb0(Kh)JEmN7 zHR&N=q=ij6-)iWyPC~#YgFq{Zse|8g%@iR))jXyU%o+HtlqwCD(ggaejNg-D+&*R8 z_cT7~uH{Ls1Cwcj%_w8{n#^ef0iPuovd38v@K91fe~Q~Y3N9*RE5RiV+mvzimKp{N z8sEK=0*>&5nruJ7p*6mur!_By!;%7O!B>rd);0LuuMt48Y9$3!Xciw^0-jM!NdX1m z@_&jk8v^1St3bM>ZUetO5I`~7Z1e=B;H?J&-cc-DjZLQq0y=GPm3*)$;Jx)N7z8-3 zRGQSBoB>-i?N0}ptyS>b)3i42)i{EQ@e2HOI{+@-|?oBA0042Qfj zZVeX%k|!Ts+1S*gM*XHiuaL@?*hgWucIK$^9MTkeCfhHAq9sFyBDRC)oRFL3sotsb z%N{9-7%=Q}=Xk6?l2=5~R!R@`$EkW}&`o3gyv=@;`dRMQ)Xt5Lwdcx5j-B8NFI2S9 sT>~|__K7K?d}4}(0t+m#z}BVx1IauRerE+?AOHXW07*qoM6N<$g8ST5BLDyZ diff --git a/res/drawable-mdpi/ic_settings_privacy.png b/res/drawable-mdpi/ic_settings_privacy.png index 6fcb4312fedb163e724c1c0c6a4e153deaa778bd..fc5f9159de046750af786583dfec7278cf6a3c9a 100644 GIT binary patch delta 208 zcmZo>dCfRMxt@V7$=lt9;Xep2*t>i(0|NtRfk$L90|U1(2s1Lwnj--eWH0gbb!ETL z#>H)5y*5&D1yHEM)5S3);_%yPfqV@H9M0jJZdWn+Kj5@k|L>Rj1|iR!{nNkdUN|T* z=}Y;++D|s?E}Xs1C+Bd*hN01@Se?b|tgL{BdA(=jhV{V;42(WeOD3(HdD=gsXLVrl zyFdSbGH@o#9k^^0$hY{a%}ws!_Q3AKJ4uR~aVJ$gcQJ3FC<{VTmMpB~PwR$!fQ5YQq%4e)uO$oi#-4>0rRe&-b*6MXU)PM8)V=le&OPUz_j%suJ@?!R zgDPKPmHC5IK5rM7+74 zcM4FI?;FTJ8Gi?j8X^%f<#NI*z@zdbNcMmTdCn_!_L z0wAu1NXREt)gQ!LP**7d8xURLj2ubGpuCev){ona{CqM7QoYM{$N^2k~T7-p$wv=#0&sb7L=SUJ?mV6`4N6V)H%tQc3HH zqo74YJ`TBjF|}8zpJP*A8MjtmT<8?waKa=&$gPzp5}-u*{w2%t{EVsRam8K^*nBQ^ gE)|eEP<02s0W4X!A%A~EtN;K207*qoM6N<$f~HpDRR910 diff --git a/res/drawable-xhdpi/ic_settings_privacy.png b/res/drawable-xhdpi/ic_settings_privacy.png index 2faa6d5e546a61cea2c184024c238f270c5fd488..10591514469ed8dfcf6d403f44b7b48e06415674 100644 GIT binary patch literal 499 zcmV z6)D!e$$R&GKp+qZ1cDHhg_`AE3l)KU0@P>TkOEtB(@ZZQoO~1!YG(4mBGdxN2Z_)V zkbehUNYy~%o7j3}@*8sVVE=R{qKPR&k3{~>5`EnZ*W4(Fu=Nt5Mm%oC3;|bBZ)<(Nwcel3Lm1!=cwSZr z_3f`a4?R62H|r4cQ|G{nvS@%$>+v;ZQ91TW6NS+6YF^oH6WeiSy$+OR3uwtFzz4ZW zd(YSQ>#L=QPzvn!$hWwUQMsqdfgyQ-+vOLs&O#3zC_?hOkCg81bY|ncIdRv@v8XwX zn6B;g*1<6{O#dky!>JEq6kNSwWyxcIfoKU{3Z7cs+X pF`kIvM2qBPh0wDzAa)4s7SfK4ISe;`Z16<#j&*vXIwo~!)SUdpn zi|MT!o9k)NpJ-<@5MFp{Z@3xn01&^D*3Wws9}QL@>;%FCpAftPK)lR&FE-WZAWPc% z%Ki!fHBs*ZI|Fb1HW@H*+(<{>9? zd2x4f`|=Qo04$>HwE=)ACp4KpG1>qS+PaUoAE~<^JBLj#5gZ2qfiM7onI_6 zh-S20a9jX#05H;IR9S=*0s%nq0DS@>1k`OU^Ep6no6&8rk2G>h9WMva8;%<|zJ~4L zxPxPx+u)F2rZovJWo%-d4Dcrc<(4=nx@U7dj$>Iz=;PdA1pvP&lSkwU*s{?gFqHuG zQ^voVWdPoC>Hxy-aefW^Jy`(IjK~YvcdQQaKM+5I{X3YvD2=$)yayn3HtM=CSyya9 zP`mPqTVv++!-D(m50>`837}kir$4($b zR+Wb~%6IeAQBAy**Bk)EO=jFzF@bOt0r$&=Qb%Hc_5TV$Tz&&qkN9^L#7j{BnOxb=n}%V>&{*U_m`F8;bf@M zP9h5;1qPzKB-RfAS@SpEaQ#_abQ_zmd2v7Wn(41sv;I&u;{_49$Z%0~BZInOGAQ+K zAa{m(&Fe(Gd@XvVS%0{i6#xZ6US4!Qg~{Wr4DPP(-~e!tx`#9;=nM54q8BUOKB9Wo z02Bn>kD;=R_6U>P*-Pxt2m_TTz^&LSO(7z_fOzo$tIY{Oi6_MIIlP)65xv89=Dm18 z)QDkDs3uIO+&bpV8+Z1A5(v6EK}X!4`sZ%*P5K=A7Uq=3@t-Ao%{1 zl((2q1b~82;MdpRo0gf+GZr_@dOV@ nnt0m!3m%ZR8A*CPnfHLdKn@sRUu47900000NkvXXu0mjfs(j@s diff --git a/res/drawable-xhdpi/ic_settings_privacy_guard.png b/res/drawable-xhdpi/ic_settings_privacy_guard.png index 9c13221c7b6b5e5222fe429269605afa3983f4cf..4a9981b6b51a567ed13ca7dfbd464a0a30f09225 100644 GIT binary patch delta 377 zcmV-<0fzpv29pDjBYyw}VoOIv0RI600RN!9r;`8x010qNS#tmY3ljhU3ljkVnw%H_ z000McNliru-v$Z`1~)D9{Pq9<0U$|4K~#9!?V3RjgD?yPiJoq+V=fNEl3TVGXMaSE3O;#J}-jiWeZeHP0F;10{{SknkA}gO*o)( zqoP;~4oGWtD{{2kIKb;}Fzdp^!GSnH-mMk-`n~{^5F8I*wt)K^qg~*fdSmi<6oi1f zgMWlV?dk;~u;Pp_Wv@aAF1PtlP?m4bLJ&1t`flzBgt)`ZYiIXB+~M*SA%qY@XcWBx XQ12`KI%iVy|$qC)T@8t(xwE;unL9y}^&aKVUzI*LZzP}~1O9i$kXuIjGp z*OU6;gA8=_d+(p>bj_<0!pqCc%gf8l%gddDAgBP%;E9C(u74N~g^vNdWYMYyz-}3BG?8p&J97p?XuWDPzaLO2XIH4veT*|@_CF)G+SBWXJ~mPn-2Lfp0x9V9pXMEU!hn*n*@ zN(gqCp??8~TpCcv(13-mdx1|G88DDUZ?J=r0Y{SP2-kpL3=E(gW+l}Y?`2>>Z<6~0 zIR*yglHMHYOVEJ4NLol@S&_s}S%`B`i9vmdMlM@qSCr(wfD7PEOq>HBl^B;f?Ga9w zTU0K$!>R=*A)zLR2J8?Vg~YBpD85H<6_T3>9)DRZ{vntkI135RvGo6-pmvKmn?Ofn zzQ$NQy;T;AGzkf>kcmeXZK*F6X_Pdf5OLaPMVduhUEsMv@ib6$1@z>~$ zBFag!i_}`;%-}cb?Wg8kprH|TKHzqd;;GYID~5|u>}Gjpn0kv_%KBUP^78WX^78WH as1?7%H)sRKgk^&O0000i(0|NtRfk$L90|U1(2s1Lwnj--eWH0gbb!ETL z#>K6#T%5l>fq{W>vZsq7-O$Gs=dmoGjeu!ni$?=Qz6 z>3U3@a^y7=&-9=>nrBeGpFI{aUJQ5dIIj`uds_`UhTDvHsq^$S|w1gM7T zN_wnF)(s4uqZGHG&BfjY?)BKrJnoa{{6}e8WSG6 zB?;{-6E}BnKQ9n+V(uxkinfW151C6G_GNhdyj&nxoQVv*o<&p%=;8SA{HgglZ(-5dR4eRuDs~j&Xayn#I!t R*WU$kJzf1=);T3K0RTtS&q)9P delta 1595 zcmaKs{Xf$Q0LQ=E%nUITAnlVLBo@O?##vGZ4Q!9Ok@=zW|-Fc{a zh*px-DV=n&>%>LMd729+4=-DJ48>S>-5+rG{_*pEy*@v_v(&n^1y-Osno9CKa*8p3 zjhbUdHtJkis&di29yst_fiLR4C4odYCy;9bGfg7fz3KKAn(Cw)Yji#rmYZYkx!rqv z5GkN@TP~s`li}V>a>vaGu7;U{s#>1trtFE!SoqOTDXX#Tr#|sGv#Q0-+qdgCdYI{0 zk)}2+cC8EZ4G@I~6964aFl6c-5o*f+8QL*;M(y(q&#Pb4NB}xCje-{S-T-+9cH+OS zBoHGTCjAM853@TaY33CIh=kzuy1Kfav!gj?l_8hYuC%4u8I1}bRfIlUvxK5Rcte_* zo9I~ml>R5GUI}!fVg34~uN{KFevqr>!lZPL`A&_3;N>U;N__H~155od@Y~9`9jZ+b zfI0@7=s92Ryt_-AUo8uQf1R(U4-l7>EELVMItd^yD;XrOn*dL)m?`Qt=F=)vTAJsw zgt@|@=v5P8bH9DHK2YYa!a9yhv}d?o9@#5}`j7y7VNXFL?2l;$nyMQg3shzACQ`wJ z%iQ=#jlU}O8=;@gg$_48(Et5~7RH2f84aXK8#@$w0gV(dXCRlTf|1T{3(K}eW)#4d za0&5RMb%mE-*-`;~U*s$4WLZl&wJW?^k>mu>y*Ds0{^ojK_^EC~6ecVSHiuxNO*khr-2ilUpZi~u+U`o zx9Sg2J)Hm+Hq+vt^_9=TXB5_6hd1FN13pBL#8#s-=Vw!|h&^5?_RryInM)WJ?;6Ke z4!UTxNz5Yh8ptn#{Jic?D!t|y;#j}sUP$TT^=9NqPfFa-cBz?U^px@Gya971 zm)?qftm)>A`!o5Yz1n6=--qufHdm8K{niP9!7~(?;b&q;)RIFM!e}E`(I9w~*#|yt zI_`gAZ=V~#I5DSgfppSyPx~tBp;r3-EqTT&zGz1JaMGp{rt!`~M3Q*$d)^spTvAFwGt-o7=Peq;2_ z0xlJ!iPYtcFFDPe+qrfB!Te8G;x5JX{_z88e}*${D5)k;*Oxr?)VstvEYi{jd?drn zcSFrRanVs}A*ZKm^Q9JB&!_w6qObdJ3GkO>Y=nSG>s=U>4eQW64)d_)h<6&sEvEDE zh-`y4hg+AM%6DCrrT%-cecs&~2(|@k`zPu3DO>3DI~C)`e6^z9j-;rS@79zDAh^8q z!K~To#r739M8bKJ7rWvl2(6M8_14L*LgX>H?K;}yx-!CwX>5Qy#i6ig#MP3sh9 qe0u`ozuU>Y!{>h30df5Q`l|L;H9HhI@8Bi_pP`Zuki=fhjDG+`x!+;{ diff --git a/res/drawable-xxhdpi/ic_settings_privacy_guard.png b/res/drawable-xxhdpi/ic_settings_privacy_guard.png index 6c52ceb57272bdfefb13792e49e29a476f3fc454..4a9981b6b51a567ed13ca7dfbd464a0a30f09225 100644 GIT binary patch literal 403 zcmV;E0c`$>P)uxaX!oRRtxa5CD$}+Vqi8L((k~^rwg&peKuSnADkyr-ZOihlLMqAhLm3q! zeu=OMqE8jMkbz0HZ5ZLEm1WzDlGUc^dip=iLsZ-|_s)1`?sI0IKm1_1_wL;1JpVgq z&N=hU2?CW$rBbO>DwRs5QmIrbl}e?u$rw`$TEOiL{ave>$tL-Y;7QOAjxzoHTBBwt zout=+31BJs+Sv6C=;Y7VY35En@x#D$unK$vPMGpK!JmB`T%|@NPyQv~MR1_P#Q$GI z;2?Mfw1FDUYIMR+17pEF@GdxR+=&eA0SiGheV1nZzZcc(z&h}uh@)>a?rPv;mWWb{- zG?2QHZZPT;;yRs|tA9@+z7^6&K(0p~G=v@QXeG6iFWfHGEy;jxhYdRkUbS^QJlD7s zEC*Y`Hu^P!%fXou|FhZgY`aU60rxv>7!4`gE#E^Eq36Nj694xb*a9vtHG9QtSMmhQ zmF|&bz|9UD_I|0Z2d|w4wwIaQ4e_jdtfeb@&0(BNBpJ}*uwl1ZzT?gq$9TeWjD-&4 zY?oxf6%HHLV(G&V#5e{mgN(79MXr{++awuqp2MN%FiZa(R|_n$e(NaK3DQZEXV3~G*TNOZ8h|egN6-Qj(uZ-V?AIw*2gYJY7&>DcNNHhoe~Y$Rv-hm zNHkzYfeh%9Xu$je88BC(0j=PVgm<^7w(|?RnPNHi_56MumRXMVI={a+VZ5~Dagjs= zCUTiaT+y0+Gglyth$v%eh)JF0Si|}KG2r0@!{17`YQ06oFDFNX&78(%7=V^&G{V!-mi z7jb36;T#!2g}~E%GGH`UFyzI6?ILHt5e=&`VFmMG4h$IN@?e3Ha>1J(t;3c-&z;S(&r8bGm+4}2EYP1#+Jx4KH6s_I z>&=BmH~Nk=f;L=w%edV?^f-@pnl;0fnQ%UrI39J7d|CjctuiNRX5*Pan=LKlnw+Hi z5!_U`NtWYb>I@S;gB+(z`pblS#!c5Ox-sHhu*QVD+m;i3hIVlrr)wrBbO>DwRs5QmIrbl}e?G Z)ZbDo-V$=^CL90&002ovPDHLkV1iDb!dn0U diff --git a/res/drawable-xxxhdpi/ic_nuclear.png b/res/drawable-xxxhdpi/ic_nuclear.png new file mode 100644 index 0000000000000000000000000000000000000000..4b59164fe830cbd827ef01af2b527ea07703be01 GIT binary patch literal 4782 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 literal 0 HcmV?d00001 diff --git a/res/drawable-xxxhdpi/ic_settings_privacy.png b/res/drawable-xxxhdpi/ic_settings_privacy.png new file mode 100644 index 0000000000000000000000000000000000000000..0a9abe35cabd45a4d1819ead99a74a7dc8eae26c GIT binary patch literal 1989 zcmV;$2RitPP)1zK6eulsq-s>u2Z$u#6ABVE1jB=g??w|JAYl@Go>{r0I5ccV^D{ z{{Qn`&N)-i(9qD((9qD((9qD((9qD((9oF2$mi6L-{Y-*-5M}883OJvH63hgdf2geU;|dDA*H|g{ za40Dy7z>E`sZ@fwfS8|3B^WKvd4nEzJC3;Ah}n;6q@jPUkvlRD#h$%%76)E&^@=e*&KZhk>=g$H0^F z*_*&$^7=twSz3L9nPTRbGj>SEdIz{I2Dm7HFO`~-ivi#@`58#FPiXFh)hs=m`MU!$ z-;klE09=ycW+~7u?~Mavo(RZ${!#G_?&~0V!b)k&1!-eR2_Zy5*^pRo2m?0>TXu&u z=8pp31AV|Zz(!yjaKChVrpmc9Vl2v(5mX6}0=?vOr-7MSrR;>A@N!@~s;XJe{6=s` z#(K9zJdLW`|AuAv1N}1oXKQr6+j(sjl+mmb@F-!Qv~_u!GT|OnJwIr)GcDu%phuxg zfMw$F+U1;4P1yKV!a-?sLI#+-il7rUnX;lu=6i>nlQMpfO2pGHzuUwhNt7+TZCW91 z?X1xsG5Y{DbWDaY<_`kz%kZ*QLP#@a#`{siq_jCTQIJD8Q+qdob7Fvrgc)Bi5p=@H zgtIAYmB z+L1irG;po#_yq8y#OGJ!^|%h&kk7r2DtL{dmJ$|$ ze}Fe6SMVMm1m2Vmp922Hvd78iHdg7>DO8np2v~=zu0Bj-6F2kH0H!b!Ec^Fa@8ok} z*|&i6RgU-jaMVTM25N5MGf}`EnqN^d?+oB)?zRz305hJyuL2*S7Ulkgnml?*erq2v z2X2MYvdi}r)cej-RMm0^vlsmi0mr5D+fc>64cZ9@cic|dFt!aF9O9YShft^PW)ln)rx5;4-iVcuEXpY6ApkemC%%+eVmNJpfan(1?~=dAfV05oz?WF|NZIGt zpr$&vl$9>D0Rr5=H_SW>yan`C=zJvfTrUp0JuR7M>tOEcgEo%=&It4SuSa^h1d5GRIksjgGJ5$|$RWRW!ee&xN~T`0PqV>+%lsq2DJ;9#K$Mn19$?u;^11VJ!xtJ*g7qkz^_LL$tMUjgY+LMoUatpZv@ z35ha4IR(sBLND+hs>~Y~M&z2kNijbj1^8FOc9ME@aYD?GJ`?tj8PsNr!^Hpa?wO<; zum68Q!uO^32`7wrhoEY6yyZ-cih=dcpMWB@0yH!Avanzado Notificación Mostrar notificación con Protección de Privacidad activa. - Versión NuclearSlim + Versión SLIM Desconocido Fecha de compilación Desconocido diff --git a/res/values/slim_strings.xml b/res/values/slim_strings.xml index 5c939725e2c..68cc3bb1ca2 100644 --- a/res/values/slim_strings.xml +++ b/res/values/slim_strings.xml @@ -51,7 +51,7 @@ Show notification if privacy guard is active. - NuclearSlim version + Slim version Unknown Build date @@ -836,7 +836,7 @@ Never - NuclearSlimPIE + SlimPIE Enable pie controls Navigation size Trigger options diff --git a/res/xml/device_info_settings.xml b/res/xml/device_info_settings.xml index d1d219ce70d..3d67889a40f 100644 --- a/res/xml/device_info_settings.xml +++ b/res/xml/device_info_settings.xml @@ -17,6 +17,10 @@ + + + + + + + + diff --git a/res/xml/security_settings_app_slim.xml b/res/xml/security_settings_app_slim.xml index 088a8152b45..d6e5b39e437 100644 --- a/res/xml/security_settings_app_slim.xml +++ b/res/xml/security_settings_app_slim.xml @@ -16,7 +16,7 @@ - + From 5ed06a1f4b69126772627f8debf54d9bb340e426 Mon Sep 17 00:00:00 2001 From: lozo2010 Date: Wed, 10 Jun 2015 19:18:02 +0200 Subject: [PATCH 06/29] Update slim_strings.xml --- res/values/slim_strings.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/res/values/slim_strings.xml b/res/values/slim_strings.xml index 68cc3bb1ca2..5c939725e2c 100644 --- a/res/values/slim_strings.xml +++ b/res/values/slim_strings.xml @@ -51,7 +51,7 @@ Show notification if privacy guard is active. - Slim version + NuclearSlim version Unknown Build date @@ -836,7 +836,7 @@ Never - SlimPIE + NuclearSlimPIE Enable pie controls Navigation size Trigger options From 80df2459964108f716883670d3a4d1b7f2d62bcb Mon Sep 17 00:00:00 2001 From: lozo2010 Date: Wed, 10 Jun 2015 19:18:36 +0200 Subject: [PATCH 07/29] Update slim_strings.xml --- res/values-es/slim_strings.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/res/values-es/slim_strings.xml b/res/values-es/slim_strings.xml index 8777adf04c1..8bd6c121d5d 100644 --- a/res/values-es/slim_strings.xml +++ b/res/values-es/slim_strings.xml @@ -37,7 +37,7 @@ Avanzado Notificación Mostrar notificación con Protección de Privacidad activa. - Versión SLIM + Versión NuclearSlim Desconocido Fecha de compilación Desconocido From 7dbb019b1fc2da2905e7fc7b96470fdcd486ee69 Mon Sep 17 00:00:00 2001 From: camcory Date: Fri, 10 Apr 2015 17:11:54 -0400 Subject: [PATCH 08/29] Layers 2.1 (backwards compatible) This is a rework of the initial layers type 2 commit: Layers : Exposing hard coded resources for type 2 overlay access [2/6] Author: bgill55 https://github.com/BitSyko/platform_packages_apps_Settings/commit/0626c475be8b50748eb75d6f237f885ad5cf91ab Layers_: Add exposed values for Data Usage Chart Author: Thyrus11 https://github.com/BitSyko/platform_packages_apps_Settings/commit/fa61e972a5808f1840c02fe0ddb7c732bab9e078 Changes naming conventions to coexist with CMTE/AOSP naming New colors files for state handling: Thanks to Andrew Dodd's commit: https://gerrit.omnirom.org/#/c/11868/ Add new colors exposed in layouts and colors from CM commit: Expose hardcoded and @android colors from layouts Author:0xD34D https://github.com/CyanogenMod/android_packages_apps_Settings/commit/95b3de6bbaa6bb0d344b87ffe72ca3f9a9321724 Make colors backwards compatible with layers previous commits based on: Author: Andrew Dodd https://gerrit.omnirom.org/#/c/12695/ Change-Id: I431c50e5c1720b3c3d70c4c2f9b5f58eed48de81 --- res/color/secondary_text_material_light.xml | 22 ++++++++++ res/layout-land/choose_lock_password.xml | 2 +- res/layout-land/confirm_lock_password.xml | 2 +- res/layout-land/setup_preference.xml | 2 +- .../choose_lock_password.xml | 4 +- .../confirm_lock_password.xml | 4 +- res/layout-sw600dp-land/setup_preference.xml | 2 +- res/layout-sw600dp/choose_lock_password.xml | 2 +- res/layout-sw600dp/confirm_lock_password.xml | 2 +- res/layout-sw600dp/setup_preference.xml | 2 +- res/layout/battery_history_chart.xml | 4 +- res/layout/bluetooth_pin_confirm.xml | 6 +-- res/layout/bluetooth_pin_entry.xml | 2 +- res/layout/choose_lock_password.xml | 2 +- res/layout/confirm_lock_password.xml | 2 +- ...edentials_disallowed_preference_screen.xml | 6 +-- res/layout/crypt_keeper_emergency_button.xml | 2 +- res/layout/crypt_keeper_status.xml | 4 +- res/layout/dashboard_category.xml | 2 +- res/layout/data_usage_chart.xml | 16 ++++---- res/layout/installed_app_details.xml | 2 +- .../keyguard_appwidget_picker_layout.xml | 2 +- res/layout/master_clear_disallowed_screen.xml | 6 +-- res/layout/multi_sim_dialog.xml | 6 +-- res/layout/nfc_payment.xml | 2 +- res/layout/notification_app_list.xml | 6 +-- res/layout/ownerinfo.xml | 6 +-- res/layout/preference_empty_list.xml | 2 +- res/layout/preference_list_fragment.xml | 2 +- res/layout/setup_preference.xml | 2 +- res/layout/user_dictionary_add_word.xml | 2 +- res/values/custom_colors.xml | 41 +++++++++++++++++++ res/values/layers_colors.xml | 29 +++++++++++++ res/values/styles.xml | 2 +- res/values/themes.xml | 21 ++++++++++ 35 files changed, 167 insertions(+), 54 deletions(-) create mode 100644 res/color/secondary_text_material_light.xml create mode 100644 res/values/custom_colors.xml create mode 100644 res/values/layers_colors.xml diff --git a/res/color/secondary_text_material_light.xml b/res/color/secondary_text_material_light.xml new file mode 100644 index 00000000000..cb6b9621829 --- /dev/null +++ b/res/color/secondary_text_material_light.xml @@ -0,0 +1,22 @@ + + + + + + + diff --git a/res/layout-land/choose_lock_password.xml b/res/layout-land/choose_lock_password.xml index 8575fa65a09..94521c09939 100644 --- a/res/layout-land/choose_lock_password.xml +++ b/res/layout-land/choose_lock_password.xml @@ -62,7 +62,7 @@ android:layout_alignParentBottom="true" android:layout_width="match_parent" android:layout_height="wrap_content" - android:background="#00000000" + android:background="@color/background_color_transparent" android:keyBackground="@*android:drawable/btn_keyboard_key_fulltrans" android:visibility="gone" /> diff --git a/res/layout-land/confirm_lock_password.xml b/res/layout-land/confirm_lock_password.xml index 4158c88486e..2b48c9bd61d 100644 --- a/res/layout-land/confirm_lock_password.xml +++ b/res/layout-land/confirm_lock_password.xml @@ -69,7 +69,7 @@ android:layout_alignParentBottom="true" android:layout_width="match_parent" android:layout_height="wrap_content" - android:background="#00000000" + android:background="@color/background_color_transparent" android:keyBackground="@*android:drawable/btn_keyboard_key_fulltrans" android:visibility="gone" /> diff --git a/res/layout-land/setup_preference.xml b/res/layout-land/setup_preference.xml index b525b689f32..c7026e3f54a 100644 --- a/res/layout-land/setup_preference.xml +++ b/res/layout-land/setup_preference.xml @@ -51,7 +51,7 @@ android:layout_width="match_parent" android:layout_height="0dp" android:layout_weight="1" - android:cacheColorHint="@android:color/transparent" + android:cacheColorHint="@color/background_color_transparent" android:clipToPadding="false" android:drawSelectorOnTop="false" android:headerDividersEnabled="false" diff --git a/res/layout-sw600dp-land/choose_lock_password.xml b/res/layout-sw600dp-land/choose_lock_password.xml index 199c9ac4cb9..290ee2e1b3f 100644 --- a/res/layout-sw600dp-land/choose_lock_password.xml +++ b/res/layout-sw600dp-land/choose_lock_password.xml @@ -82,9 +82,9 @@ android:layout_alignParentBottom="true" android:layout_width="match_parent" android:layout_height="wrap_content" - android:background="#00000000" + android:background="@color/background_color_transparent" android:keyBackground="@*android:drawable/btn_keyboard_key_fulltrans" android:visibility="gone" /> - \ No newline at end of file + diff --git a/res/layout-sw600dp-land/confirm_lock_password.xml b/res/layout-sw600dp-land/confirm_lock_password.xml index cbaad7ad8f5..4426ba57ca4 100644 --- a/res/layout-sw600dp-land/confirm_lock_password.xml +++ b/res/layout-sw600dp-land/confirm_lock_password.xml @@ -83,9 +83,9 @@ android:layout_alignParentBottom="true" android:layout_width="match_parent" android:layout_height="wrap_content" - android:background="#00000000" + android:background="@color/background_color_transparent" android:keyBackground="@*android:drawable/btn_keyboard_key_fulltrans" android:visibility="gone" /> - \ No newline at end of file + diff --git a/res/layout-sw600dp-land/setup_preference.xml b/res/layout-sw600dp-land/setup_preference.xml index 814bc915ced..6bd087f8454 100644 --- a/res/layout-sw600dp-land/setup_preference.xml +++ b/res/layout-sw600dp-land/setup_preference.xml @@ -67,7 +67,7 @@ android:layout_width="match_parent" android:layout_height="0dp" android:layout_weight="1" - android:cacheColorHint="@android:color/transparent" + android:cacheColorHint="@color/background_color_transparent" android:clipToPadding="false" android:drawSelectorOnTop="false" android:headerDividersEnabled="false" diff --git a/res/layout-sw600dp/choose_lock_password.xml b/res/layout-sw600dp/choose_lock_password.xml index ca8975ee5db..b39caf35ba2 100644 --- a/res/layout-sw600dp/choose_lock_password.xml +++ b/res/layout-sw600dp/choose_lock_password.xml @@ -56,7 +56,7 @@ android:layout_alignParentBottom="true" android:layout_width="match_parent" android:layout_height="wrap_content" - android:background="#00000000" + android:background="@color/background_color_transparent" android:layout_marginBottom="30dip" android:keyBackground="@*android:drawable/btn_keyboard_key_fulltrans" android:visibility="gone" diff --git a/res/layout-sw600dp/confirm_lock_password.xml b/res/layout-sw600dp/confirm_lock_password.xml index 12b6ab27fcc..f3b1aea12c0 100644 --- a/res/layout-sw600dp/confirm_lock_password.xml +++ b/res/layout-sw600dp/confirm_lock_password.xml @@ -67,7 +67,7 @@ android:layout_alignParentBottom="true" android:layout_width="match_parent" android:layout_height="wrap_content" - android:background="#00000000" + android:background="@color/background_color_transparent" android:layout_marginBottom="30dip" android:keyBackground="@*android:drawable/btn_keyboard_key_fulltrans" android:visibility="gone" diff --git a/res/layout-sw600dp/setup_preference.xml b/res/layout-sw600dp/setup_preference.xml index ec6d2ac9323..bed40caa04e 100644 --- a/res/layout-sw600dp/setup_preference.xml +++ b/res/layout-sw600dp/setup_preference.xml @@ -65,7 +65,7 @@ android:layout_width="match_parent" android:layout_height="0dp" android:layout_weight="1" - android:cacheColorHint="@android:color/transparent" + android:cacheColorHint="@color/background_color_transparent" android:clipToPadding="false" android:drawSelectorOnTop="false" android:headerDividersEnabled="false" diff --git a/res/layout/battery_history_chart.xml b/res/layout/battery_history_chart.xml index 0e3cf88f5e2..211e20a3143 100644 --- a/res/layout/battery_history_chart.xml +++ b/res/layout/battery_history_chart.xml @@ -28,7 +28,7 @@ android:gravity="center_vertical" android:id="@+id/battery_history_chart" android:textAppearance="?android:attr/textAppearanceSmall" - android:textColor="#ff000000" + android:textColor="@color/text_color_black" app:headerAppearance="?android:attr/textAppearanceMedium" android:shadowRadius="4" android:shadowColor="?android:attr/colorBackground" @@ -39,4 +39,4 @@ app:chartMinHeight="@dimen/battery_history_chart_height"> - \ No newline at end of file + diff --git a/res/layout/bluetooth_pin_confirm.xml b/res/layout/bluetooth_pin_confirm.xml index 08f5d9fc56e..d074ce88273 100644 --- a/res/layout/bluetooth_pin_confirm.xml +++ b/res/layout/bluetooth_pin_confirm.xml @@ -38,7 +38,7 @@ android:layout_marginTop="@dimen/bluetooth_dialog_padding" android:gravity="center_vertical" android:textAppearance="@android:style/TextAppearance.Material.Body1" - android:textColor="@*android:color/secondary_text_material_light" /> + android:textColor="@color/secondary_text_material_light" /> + android:textColor="@color/secondary_text_material_light" /> + android:textColor="@color/secondary_text_material_light"/> diff --git a/res/layout/confirm_lock_password.xml b/res/layout/confirm_lock_password.xml index c9a0bbed943..475c0f61fd1 100644 --- a/res/layout/confirm_lock_password.xml +++ b/res/layout/confirm_lock_password.xml @@ -57,7 +57,7 @@ android:layout_alignParentBottom="true" android:layout_width="match_parent" android:layout_height="wrap_content" - android:background="#00000000" + android:background="@color/background_color_transparent" android:keyBackground="@*android:drawable/btn_keyboard_key_fulltrans" android:visibility="gone" /> diff --git a/res/layout/credentials_disallowed_preference_screen.xml b/res/layout/credentials_disallowed_preference_screen.xml index c4e8934c284..212dfcf96ab 100644 --- a/res/layout/credentials_disallowed_preference_screen.xml +++ b/res/layout/credentials_disallowed_preference_screen.xml @@ -26,8 +26,8 @@ android:layout_height="match_parent" android:drawSelectorOnTop="false" android:scrollbarStyle="insideOverlay" - android:background="@android:color/white" - android:cacheColorHint="@android:color/white" + android:background="@color/background_color_white" + android:cacheColorHint="@color/background_color_white" android:fadingEdgeLength="16dip" /> - \ No newline at end of file + diff --git a/res/layout/crypt_keeper_emergency_button.xml b/res/layout/crypt_keeper_emergency_button.xml index 0b6f810b621..791efdb0252 100644 --- a/res/layout/crypt_keeper_emergency_button.xml +++ b/res/layout/crypt_keeper_emergency_button.xml @@ -33,7 +33,7 @@ android:layout_gravity="center_horizontal" android:textSize="14sp" android:fontFamily="sans-serif" - android:textColor="#FFFFFF" + android:textColor="@color/text_color_white" style="?android:attr/borderlessButtonStyle" /> diff --git a/res/layout/crypt_keeper_status.xml b/res/layout/crypt_keeper_status.xml index bddff1ad574..c07a70b8de2 100644 --- a/res/layout/crypt_keeper_status.xml +++ b/res/layout/crypt_keeper_status.xml @@ -35,7 +35,7 @@ android:layout_marginEnd="8dip" android:textSize="16sp" android:fontFamily="sans-serif" - android:textColor="@android:color/white" + android:textColor="@color/text_color_white" android:text="@string/enter_password" android:layout_gravity="center_horizontal" android:gravity="center_horizontal" /> @@ -52,7 +52,7 @@ android:marqueeRepeatLimit ="marquee_forever" android:textSize="16sp" android:fontFamily="sans-serif" - android:textColor="#B3FFFFFF" + android:textColor="@color/text_color_translucent_white" android:gravity="center_horizontal" /> diff --git a/res/layout/dashboard_category.xml b/res/layout/dashboard_category.xml index 01afa5d34a5..1ceeebf0b62 100644 --- a/res/layout/dashboard_category.xml +++ b/res/layout/dashboard_category.xml @@ -21,7 +21,7 @@ android:paddingStart="@dimen/dashboard_category_padding_start" android:paddingEnd="@dimen/dashboard_category_padding_end" android:orientation="vertical" - android:background="@android:color/white" + android:background="@color/dashboard_category_background_color" android:layout_marginBottom="8dip" android:elevation="@dimen/dashboard_category_elevation"> diff --git a/res/layout/data_usage_chart.xml b/res/layout/data_usage_chart.xml index 2f9d962325b..998bb845c2c 100644 --- a/res/layout/data_usage_chart.xml +++ b/res/layout/data_usage_chart.xml @@ -42,9 +42,9 @@ android:layout_width="match_parent" android:layout_height="match_parent" android:layout_gravity="start|bottom" - settings:strokeColor="#00000000" - settings:fillColor="#ff009688" - settings:fillColorSecondary="#ff80cbc4" + settings:strokeColor="@color/data_usage_stroke_color" + settings:fillColor="@color/data_usage_fill_color" + settings:fillColorSecondary="@color/data_usage_secondary_fill_color" settings:safeRegion="3dp" /> diff --git a/res/layout/installed_app_details.xml b/res/layout/installed_app_details.xml index 5b923fca81d..3883de01710 100644 --- a/res/layout/installed_app_details.xml +++ b/res/layout/installed_app_details.xml @@ -420,7 +420,7 @@ android:text="@string/permissions_label" /> diff --git a/res/layout/master_clear_disallowed_screen.xml b/res/layout/master_clear_disallowed_screen.xml index 80326caeafa..dafb7cb6a29 100644 --- a/res/layout/master_clear_disallowed_screen.xml +++ b/res/layout/master_clear_disallowed_screen.xml @@ -26,8 +26,8 @@ android:layout_height="match_parent" android:drawSelectorOnTop="false" android:scrollbarStyle="insideOverlay" - android:background="@android:color/white" - android:cacheColorHint="@android:color/white" + android:background="@color/background_color_white" + android:cacheColorHint="@color/background_color_white" android:fadingEdgeLength="16dip" /> - \ No newline at end of file + diff --git a/res/layout/multi_sim_dialog.xml b/res/layout/multi_sim_dialog.xml index 01ba83a1e0f..92a652166d2 100644 --- a/res/layout/multi_sim_dialog.xml +++ b/res/layout/multi_sim_dialog.xml @@ -44,7 +44,7 @@ android:hint="@string/sim_name_hint" android:inputType="textNoSuggestions" android:maxLength="@integer/sim_name_length" - android:textColor="@android:color/black" + android:textColor="@color/text_color_black" style="?android:attr/textAppearanceMedium" /> @@ -62,7 +62,7 @@ android:text="@string/sim_editor_carrier" /> diff --git a/res/layout/nfc_payment.xml b/res/layout/nfc_payment.xml index d6f9fa44f99..19da06c0496 100644 --- a/res/layout/nfc_payment.xml +++ b/res/layout/nfc_payment.xml @@ -32,7 +32,7 @@ android:textSize="20sp" android:textStyle="italic" android:visibility="gone" - android:textColor="@android:color/holo_blue_light" + android:textColor="@color/text_color_holo_blue_light" android:paddingTop="16dp" android:text="@string/nfc_payment_learn_more"/> diff --git a/res/layout/notification_app_list.xml b/res/layout/notification_app_list.xml index 2eac287ce6f..fe3662576ae 100644 --- a/res/layout/notification_app_list.xml +++ b/res/layout/notification_app_list.xml @@ -26,10 +26,10 @@ android:layout_height="match_parent" android:paddingStart="@dimen/settings_side_margin" android:paddingEnd="@dimen/settings_side_margin" - android:divider="#0000" + android:divider="@color/background_color_transparent" android:dividerHeight="0px" android:fastScrollEnabled="true" - android:listSelector="#0000" + android:listSelector="@color/background_color_transparent" android:scrollbarStyle="outsideInset" /> - \ No newline at end of file + diff --git a/res/layout/ownerinfo.xml b/res/layout/ownerinfo.xml index 6adec7d99ea..58d2953e85c 100644 --- a/res/layout/ownerinfo.xml +++ b/res/layout/ownerinfo.xml @@ -18,7 +18,7 @@ android:layout_height="wrap_content" android:orientation="vertical" android:scrollbars="vertical" - android:background="@android:color/white"> + android:background="@color/background_color_white"> + android:background="@color/background_color_transparent"> + android:background="@color/background_color_transparent"> + android:background="@color/background_color_holo_blue_light" /> + + + + + @android:color/holo_blue_light + @android:color/transparent + @color/exposed_bg_dark + @color/exposed_primary_text_light + @android:color/holo_blue_light + + @color/exposed_secondary_text_light + + #B3FFFFFF + @color/exposed_primary_text_dark + + @color/exposed_bg_dark + + #00000000 + @color/exposed_datachartfillcolor + @color/exposed_datachartfillcolor_secondary + @color/exposed_data_limit_chart_labelcolor + @color/exposed_data_warning_chart_labelcolor + + #ff404040 + + #ffffb060 + diff --git a/res/values/layers_colors.xml b/res/values/layers_colors.xml new file mode 100644 index 00000000000..bc84172c683 --- /dev/null +++ b/res/values/layers_colors.xml @@ -0,0 +1,29 @@ + + + + + + @android:color/white + @android:color/black + #8a000000 + @android:color/white + #ff009688 + @color/material_empty_color_light + #ff009688 + #ff80cbc4 + #ff37474f + #fff4511e + diff --git a/res/values/styles.xml b/res/values/styles.xml index 626fc27ddbc..65ab16a8f10 100644 --- a/res/values/styles.xml +++ b/res/values/styles.xml @@ -343,6 +343,6 @@ diff --git a/res/values/themes.xml b/res/values/themes.xml index 87a551cfb14..13f2e46a84b 100644 --- a/res/values/themes.xml +++ b/res/values/themes.xml @@ -90,6 +90,13 @@ @*android:drawable/ic_menu_moreoverflow_material @drawable/ic_wps_dark @drawable/wifi_signal_dark + + + @color/theme_primary + + @color/theme_primary_dark + + @color/theme_accent diff --git a/res/values/themes.xml b/res/values/themes.xml index 87a551cfb14..4dfb9b0f265 100644 --- a/res/values/themes.xml +++ b/res/values/themes.xml @@ -90,6 +90,13 @@ @*android:drawable/ic_menu_moreoverflow_material @drawable/ic_wps_dark @drawable/wifi_signal_dark + + + @color/theme_primary + + @color/theme_primary_dark + + @color/theme_accent