Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

expose build date #20

Open
wants to merge 8 commits into
base: kk4.4
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -1756,6 +1756,8 @@
android:value="com.android.settings.slim.DisplayRotation" />
</activity>

<activity android:name=".slim.Halo" />

<!-- Pseudo-activity used to provide an intent-filter entry point to encryption settings -->
<activity android:name="Settings$CryptKeeperSettingsActivity"
android:label="@string/crypt_keeper_encrypt_title">
Expand Down
Binary file added res/drawable-xhdpi/bloqueo.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added res/drawable-xhdpi/cortina.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added res/drawable-xhdpi/horassilencio.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added res/drawable-xhdpi/ic_settings_halo.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added res/drawable-xhdpi/multi.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added res/drawable-xhdpi/navbar.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added res/drawable-xhdpi/power.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added res/drawable-xhdpi/status.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
7 changes: 7 additions & 0 deletions res/layout/installed_app_details.xml
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,13 @@
android:layout_marginTop="4dip"
android:text="@string/app_notifications_switch_label" />

<!-- HALO notification state for this package -->
<CheckBox android:id="@+id/halo_state"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="start"
android:layout_marginTop="4dip" />

</LinearLayout>

<TextView
Expand Down
51 changes: 51 additions & 0 deletions res/values/slim_arrays.xml
Original file line number Diff line number Diff line change
Expand Up @@ -899,4 +899,55 @@
<item>2</item>
</string-array>

<string-array name="entries_halo_state">
<item>@string/halo_state_black</item>
<item>@string/halo_state_white</item>
</string-array>

<string-array name="values_halo_state" translatable="false">
<item>1</item>
<item>0</item>
</string-array>

<string-array name="entries_halo_size">
<item>@string/halo_size_miniscule</item>
<item>@string/halo_size_small</item>
<item>@string/halo_size_default</item>
<item>@string/halo_size_large</item>
<item>@string/halo_size_gigantic</item>
<item>@string/halo_size_monster</item>
</string-array>
<string-array name="values_halo_size" translatable="false">
<item>0.6</item>
<item>0.8</item>
<item>1.0</item>
<item>1.2</item>
<item>1.4</item>
<item>1.6</item>
</string-array>

<string-array name="entries_halo_notification_count">
<item>@string/halo_notification_count_none</item>
<item>@string/halo_notification_count_total</item>
<item>@string/halo_notification_count_individual</item>
<item>@string/halo_notification_count_both</item>
</string-array>

<string-array name="values_halo_notification_count">
<item>1</item>
<item>2</item>
<item>3</item>
<item>4</item>
</string-array>

<string-array name="entries_halo_msgbox_animation">
<item>@string/halo_msgbox_animation_none</item>
<item>@string/halo_msgbox_animation_flip</item>
</string-array>

<string-array name="values_halo_msgbox_animation">
<item>1</item>
<item>2</item>
</string-array>

</resources>
57 changes: 57 additions & 0 deletions res/values/slim_strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -823,4 +823,61 @@ two in order to insert additional control points. \'Remove\' deletes the selecte
<string name="quick_pulldown_left">Left</string>
<string name="quick_pulldown_right">Right</string>

<!-- About phone screen, build date of ROM -->
<string name="build_date">revolution build date</string>
<string name="build_date_default">2012-01-01-0000</string>

<!-- Halo -->
<string name="halo_settings_title">Halo</string>
<string name="halo_behavior_title">Halo Behavior</string>
<string name="halo_hide_title">Hide Halo after activity</string>
<string name="halo_hide_summary">Halo will appear for incoming tasks and scroll out of sight after a while</string>
<string name="halo_reversed_title">Reverse Halo</string>
<string name="halo_reversed_summary">Applies for task switching and moving gestures</string>
<string name="halo_state_title">Halo policy</string>
<string name="halo_state_summary">Enables black/white listing notifications</string>
<string name="halo_state_black">Black list</string>
<string name="halo_state_white">White list</string>
<string name="halo_pause_title">Pause active app</string>
<string name="halo_pause_summary">When opening an app with Halo the underlying app will get paused</string>
<string name="halo_ninja_title">Ninja mode</string>
<string name="halo_ninja_summary">Halo will disappear completely when empty</string>
<string name="halo_notification_msgbox_title">Enable message pop-up</string>
<string name="halo_notification_msgbox_summary">Show message box for incoming notifications</string>
<string name="halo_unlock_ping_title">Ping on unlock</string>
<string name="halo_unlock_ping_summary">Halo will ping when device is unlocked if new notifications were received</string>

<string name="halo_size_title">Halo size</string>
<string name="halo_size_summary">Defines how big Halo is going to be</string>
<string name="halo_size_miniscule">Miniscule</string>
<string name="halo_size_small">Small</string>
<string name="halo_size_default">Normal (default)</string>
<string name="halo_size_large">Large</string>
<string name="halo_size_gigantic">Gigantic</string>
<string name="halo_size_monster">Monster</string>

<string name="halo_notification_count_title">Notification count</string>
<string name="halo_notification_count_summary">Display notification counts on Halo</string>
<string name="halo_notification_count_none">None</string>
<string name="halo_notification_count_total">Total</string>
<string name="halo_notification_count_individual">Per app</string>
<string name="halo_notification_count_both">Both</string>

<string name="halo_msgbox_animation_title">Message box animation</string>
<string name="halo_msgbox_animation_summary">Halo message box animation for incoming notifications</string>
<string name="halo_msgbox_animation_none">None</string>
<string name="halo_msgbox_animation_flip">Flip</string>

<!-- Label for are-halo-notifications-allowed checkbox in app details [CHAR LIMIT=20] -->
<string name="app_halo_label_black">Blacklist from HALO</string>
<string name="app_halo_label_white">Whitelist from HALO</string>

<!-- Quick access ribbon -->
<string name="cm_style_tiles">Quick Access ribbon</string>
<string name="slim_style_tiles">Quick Setting tiles</string>
<string name="quick_settings_misc_cat">Misc</string>
<string name="title_quick_access">Show in drawer</string>
<string name="title_quick_access_linked">Linked layout</string>
<string name="summary_quick_access_linked">Use the same tiles and layout as the Quick Settings panel</string>

</resources>
6 changes: 6 additions & 0 deletions res/xml/device_info_settings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -137,6 +137,12 @@
android:title="@string/build_number"
android:summary="@string/device_info_default"/>

<!-- revolution build date -->
<Preference android:key="build_date"
style="?android:preferenceInformationStyle"
android:title="@string/build_date"
android:summary="@string/build_date_default" />

<!-- SELinux status information -->
<Preference android:key="selinux_status"
style="?android:preferenceInformationStyle"
Expand Down
87 changes: 87 additions & 0 deletions res/xml/halo_settings.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,87 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Copyright (C) 2013 ParanoidAndroid 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.
-->

<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
android:title="@string/halo_settings_title">

<ListPreference
android:key="halo_state"
android:dialogTitle="@string/halo_state_title"
android:title="@string/halo_state_title"
android:summary="@string/halo_state_summary"
android:entries="@array/entries_halo_state"
android:entryValues="@array/values_halo_state" />

<ListPreference
android:key="halo_size"
android:dialogTitle="@string/halo_size_title"
android:title="@string/halo_size_title"
android:summary="@string/halo_size_summary"
android:entries="@array/entries_halo_size"
android:entryValues="@array/values_halo_size" />

<CheckBoxPreference
android:key="halo_hide"
android:title="@string/halo_hide_title"
android:summary="@string/halo_hide_summary"
android:defaultValue="false" />

<CheckBoxPreference
android:key="halo_ninja"
android:title="@string/halo_ninja_title"
android:summary="@string/halo_ninja_summary"
android:defaultValue="false" />

<ListPreference
android:key="halo_notify_count"
android:dialogTitle="@string/halo_notification_count_title"
android:title="@string/halo_notification_count_title"
android:summary="@string/halo_notification_count_summary"
android:entries="@array/entries_halo_notification_count"
android:entryValues="@array/values_halo_notification_count" />

<CheckBoxPreference
android:key="halo_msgbox"
android:title="@string/halo_notification_msgbox_title"
android:summary="@string/halo_notification_msgbox_summary"
android:defaultValue="true" />

<ListPreference
android:key="halo_msgbox_animation"
android:dialogTitle="@string/halo_msgbox_animation_title"
android:title="@string/halo_msgbox_animation_title"
android:summary="@string/halo_msgbox_animation_summary"
android:entries="@array/entries_halo_msgbox_animation"
android:entryValues="@array/values_halo_msgbox_animation" />

<CheckBoxPreference
android:key="halo_reversed"
android:title="@string/halo_reversed_title"
android:summary="@string/halo_reversed_summary"
android:defaultValue="true" />

<CheckBoxPreference
android:key="halo_pause"
android:title="@string/halo_pause_title"
android:summary="@string/halo_pause_summary" />

<CheckBoxPreference
android:key="halo_unlock_ping"
android:title="@string/halo_unlock_ping_title"
android:summary="@string/halo_unlock_ping_summary"
android:defaultValue="false" />

</PreferenceScreen>
39 changes: 39 additions & 0 deletions res/xml/quick_settings.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- Copyright (C) 2013 The Dirty Unicorns 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.
-->

<PreferenceScreen
xmlns:android="http://schemas.android.com/apk/res/android"
android:title="@string/cm_style_tiles">

<PreferenceCategory
android:key="quicksettings_tiles_style"
android:title="@string/cm_style_tiles">
</PreferenceCategory>

<CheckBoxPreference
android:key="qs_quick_access"
android:title="@string/title_quick_access"
android:defaultValue="false" />

<CheckBoxPreference
android:key="qs_quick_access_linked"
android:title="@string/title_quick_access_linked"
android:summary="@string/summary_quick_access_linked"
android:defaultValue="true"
android:dependency="qs_quick_access"
android:disableDependentsState="true" />

</PreferenceScreen>
7 changes: 7 additions & 0 deletions res/xml/settings_headers.xml
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,13 @@
android:targetClass="com.slim.center.SlimCenter" />
</header>

<!-- HALO -->
<header
android:id="@+id/halo_settings"
android:fragment="com.android.settings.omnikang.Halo"
android:icon="@drawable/ic_settings_halo"
android:title="@string/halo_settings_title" />

<!-- DEVICE -->
<header android:id="@+id/device_section"
android:title="@string/header_category_device" />
Expand Down
4 changes: 4 additions & 0 deletions res/xml/slim_interface_settings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -34,4 +34,8 @@
android:fragment="com.android.settings.slim.StatusBar"
android:title="@string/status_bar_title" />

<PreferenceScreen
android:fragment="com.android.settings.slim.QuickSettings"
android:title="@string/cm_style_tiles" />

</PreferenceScreen>
2 changes: 2 additions & 0 deletions src/com/android/settings/DeviceInfoSettings.java
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,7 @@ public class DeviceInfoSettings extends RestrictedSettingsFragment {
private static final String KEY_EQUIPMENT_ID = "fcc_equipment_id";
private static final String PROPERTY_EQUIPMENT_ID = "ro.ril.fccid";
private static final String KEY_SLIM_VERSION = "slim_version";
private static final String KEY_MOD_BUILD_DATE = "build_date";

static final int TAPS_TO_BE_A_DEVELOPER = 7;

Expand Down Expand Up @@ -95,6 +96,7 @@ public void onCreate(Bundle icicle) {
findPreference(KEY_BUILD_NUMBER).setEnabled(true);
findPreference(KEY_KERNEL_VERSION).setSummary(getFormattedKernelVersion());
setValueSummary(KEY_SLIM_VERSION, "ro.slim.version");
setValueSummary(KEY_MOD_BUILD_DATE, "ro.build.date");

if (!SELinux.isSELinuxEnabled()) {
String status = getResources().getString(R.string.selinux_status_disabled);
Expand Down
Loading