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

PR #1 #2

Open
wants to merge 5 commits into
base: 10.0
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
58 changes: 58 additions & 0 deletions core/java/android/provider/Settings.java
Original file line number Diff line number Diff line change
Expand Up @@ -4650,6 +4650,44 @@ public boolean validate(@Nullable String value) {
*/
public static final String GLOBAL_ACTIONS_EMERGENCY = "global_actions_emergency";

/**
* volume answer
* @hide
*/
public static final String ANSWER_VOLUME_BUTTON_BEHAVIOR_ANSWER = "call_volume_answer";
/** @hide */
private static final Validator ANSWER_VOLUME_BUTTON_BEHAVIOR_ANSWER_VALIDATOR =
BOOLEAN_VALIDATOR;

/**
* Volume rocker wake
* @hide
*/
public static final String VOLUME_ROCKER_WAKE = "volume_rocker_wake";
/** @hide */
private static final Validator VOLUME_ROCKER_WAKE_VALIDATOR =
BOOLEAN_VALIDATOR;

/**
* @hide
*/
public static final String LOCK_SHOW_STATUS_BAR = "lockscreen_show_status_bar";

/** @hide */
private static final Validator LOCK_SHOW_STATUS_BAR_VALIDATOR =
BOOLEAN_VALIDATOR;

/**
* Whether to show the kill app button in notification guts
* @hide
*/
public static final String NOTIFICATION_GUTS_KILL_APP_BUTTON =
"notification_guts_kill_app_button";

/** @hide */
private static final Validator NOTIFICATION_GUTS_KILL_APP_BUTTON_VALIDATOR =
BOOLEAN_VALIDATOR;

/**
* Settings to backup. This is here so that it's in the same place as the settings
* keys and easy to update.
Expand Down Expand Up @@ -4716,6 +4754,10 @@ public boolean validate(@Nullable String value) {
ALARM_ALERT,
NOTIFICATION_LIGHT_PULSE,
USE_OLD_MOBILETYPE,
ANSWER_VOLUME_BUTTON_BEHAVIOR_ANSWER,
VOLUME_ROCKER_WAKE,
LOCK_SHOW_STATUS_BAR,
NOTIFICATION_GUTS_KILL_APP_BUTTON,
};

/**
Expand Down Expand Up @@ -4840,6 +4882,10 @@ public boolean validate(@Nullable String value) {
PRIVATE_SETTINGS.add(BUTTON_BRIGHTNESS);
PRIVATE_SETTINGS.add(PROXIMITY_ON_WAKE);
PRIVATE_SETTINGS.add(USE_OLD_MOBILETYPE);
PRIVATE_SETTINGS.add(ANSWER_VOLUME_BUTTON_BEHAVIOR_ANSWER);
PRIVATE_SETTINGS.add(VOLUME_ROCKER_WAKE);
PRIVATE_SETTINGS.add(LOCK_SHOW_STATUS_BAR);
PRIVATE_SETTINGS.add(NOTIFICATION_GUTS_KILL_APP_BUTTON);
}

/**
Expand Down Expand Up @@ -4938,6 +4984,10 @@ public boolean validate(@Nullable String value) {
VALIDATORS.put(PROXIMITY_ON_WAKE, PROXIMITY_ON_WAKE_VALIDATOR);
VALIDATORS.put(BUTTON_BACKLIGHT_ONLY_WHEN_PRESSED, BUTTON_BACKLIGHT_ONLY_WHEN_PRESSED_VALIDATOR);
VALIDATORS.put(USE_OLD_MOBILETYPE, USE_OLD_MOBILETYPE_VALIDATOR);
VALIDATORS.put(ANSWER_VOLUME_BUTTON_BEHAVIOR_ANSWER,ANSWER_VOLUME_BUTTON_BEHAVIOR_ANSWER_VALIDATOR);
VALIDATORS.put(VOLUME_ROCKER_WAKE, VOLUME_ROCKER_WAKE_VALIDATOR);
VALIDATORS.put(LOCK_SHOW_STATUS_BAR,LOCK_SHOW_STATUS_BAR_VALIDATOR);
VALIDATORS.put(NOTIFICATION_GUTS_KILL_APP_BUTTON, NOTIFICATION_GUTS_KILL_APP_BUTTON_VALIDATOR);
}

/**
Expand Down Expand Up @@ -13800,6 +13850,14 @@ public boolean validate(@Nullable String value) {
*/
public static final String SAFE_BOOT_DISALLOWED = "safe_boot_disallowed";


/**
* Whether to wake the display when plugging or unplugging the charger
*
* @hide
*/
public static final String WAKE_WHEN_PLUGGED_OR_UNPLUGGED = "wake_when_plugged_or_unplugged";

/**
* Indicates whether this device is currently in retail demo mode. If true, the device
* usage is severely limited.
Expand Down
1 change: 1 addition & 0 deletions packages/SystemUI/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -105,6 +105,7 @@
<uses-permission android:name="android.permission.START_ACTIVITY_AS_CALLER" />
<uses-permission android:name="android.permission.START_TASKS_FROM_RECENTS" />
<uses-permission android:name="android.permission.GET_INTENT_SENDER_INTENT" />
<uses-permission android:name="android.permission.FORCE_STOP_PACKAGES" />

<!-- WindowManager -->
<uses-permission android:name="android.permission.INTERNAL_SYSTEM_WINDOW" />
Expand Down
10 changes: 9 additions & 1 deletion packages/SystemUI/res/layout/notification_info.xml
Original file line number Diff line number Diff line change
Expand Up @@ -328,7 +328,7 @@ asked for it -->
<RelativeLayout
android:id="@+id/bottom_buttons"
android:layout_width="match_parent"
android:layout_height="60dp"
android:layout_height="120dp"
android:gravity="center_vertical"
android:paddingStart="4dp"
android:paddingEnd="4dp"
Expand All @@ -344,6 +344,14 @@ asked for it -->
android:minHeight="@dimen/notification_importance_toggle_size"
android:maxWidth="200dp"
style="@style/TextAppearance.NotificationInfo.Button"/>
<TextView
android:id="@+id/notification_inspect_kill"
android:text="@string/guts_force_close_app"
android:gravity="start|center_vertical"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:layout_marginEnd="8dp"
style="@style/TextAppearance.NotificationInfo.Button"/>
<TextView
android:id="@+id/done"
android:text="@string/inline_ok_button"
Expand Down
8 changes: 8 additions & 0 deletions packages/SystemUI/res/values/blaze_strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -41,4 +41,12 @@
<string name="global_action_restart_bootloader">Bootloader</string-->
<string name="global_action_screenshot">Screenshot</string>
<string name="global_action_flashlight">Flashlight</string>

<!-- Kill button in notification guts -->
<string name="force_stop_dlg_title">Force stop?</string>
<string name="force_stop_dlg_text">If you force stop an app, it may misbehave.</string>
<string name="dlg_ok">@android:string/ok</string>
<string name="dlg_cancel">@android:string/cancel</string>
<string name="guts_force_close_app">Close App</string>

</resources>
199 changes: 199 additions & 0 deletions packages/SystemUI/res/values/evolution_strings.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,199 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
Copyright (C) 2019 The Evolution X 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.
-->
<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<!-- QS Config -->
<string name="qs_menu_item_columns">Columns</string>
<string name="qs_menu_item_columns_landscape">Columns landscape</string>
<string name="qs_menu_item_columns_three">3</string>
<string name="qs_menu_item_columns_four">4</string>
<string name="qs_menu_item_columns_five">5</string>
<string name="qs_menu_item_columns_six">6</string>
<string name="qs_menu_item_columns_seven">7</string>
<string name="qs_menu_item_columns_eight">8</string>
<string name="qs_menu_item_columns_nine">9</string>
<string name="qs_menu_item_reset">Reset</string>
<string name="qs_menu_item_titles">Show labels</string>
<string name="qs_menu_item_qs_columns">Quickbar columns</string>
<string name="qs_menu_item_columns_auto">Automatic</string>

<!-- Screenshot Delete Toast -->
<string name="delete_screenshot_toast">Screenshot deleted</string>

<!-- Advanced reboot -->
<string name="global_action_restart_advanced">Advanced</string>
<string name="global_action_restart_recovery">Recovery</string>
<string name="global_action_restart_bootloader">Bootloader</string>
<string name="global_action_restart_ui">SystemUI</string>

<!-- Screenshot QS tile -->
<string name="quick_settings_screenshot_label">Screenshot</string>
<string name="quick_settings_region_screenshot_label">Partial screenshot</string>

<!-- Sound Search tile -->
<string name="quick_settings_sound_search">Sound search</string>
<string name="quick_settings_sound_search_no_app">Sorry, but this doesn\'t work if you don\'t have a Sound search app.</string>

<!-- USB Tethering tile -->
<string name="accessibility_quick_settings_usb_tether_off">USB tethering off</string>
<string name="accessibility_quick_settings_usb_tether_on">USB tethering on</string>
<string name="accessibility_quick_settings_usb_tether_changed_off">USB tethering turned off</string>
<string name="accessibility_quick_settings_usb_tether_changed_on">USB tethering turned on</string>
<string name="quick_settings_usb_tether_label">USB tethering</string>

<!-- AOD QS tile -->
<string name="quick_settings_aod_label">AOD</string>

<!-- Sound QS Tile -->
<string name="quick_settings_sound_label">Sound</string>
<string name="quick_settings_sound_mute">Mute</string>
<string name="quick_settings_sound_ring">Ring</string>
<string name="quick_settings_sound_vibrate">Vibrate</string>

<!-- Caffeine QS tile -->
<string name="quick_settings_caffeine_label">Caffeine</string>
<string name="accessibility_quick_settings_caffeine_off">Caffeine off</string>
<string name="accessibility_quick_settings_caffeine_on">Caffeine on</string>

<!-- Heads Up QS Tile -->
<string name="quick_settings_heads_up_label">Heads up</string>
<string name="accessibility_quick_settings_heads_up_off">Heads up off</string>
<string name="accessibility_quick_settings_heads_up_on">Heads up on</string>
<string name="accessibility_quick_settings_heads_up_changed_off">Heads up turned off</string>
<string name="accessibility_quick_settings_heads_up_changed_on">Heads up turned on</string>

<!-- Sync QS Tile -->
<string name="quick_settings_sync_label">Sync</string>
<string name="accessibility_quick_settings_sync_off">Sync off</string>
<string name="accessibility_quick_settings_sync_on">Sync on</string>
<string name="accessibility_quick_settings_sync_changed_off">Sync turned off</string>
<string name="accessibility_quick_settings_sync_changed_on">Sync turned on</string>

<!-- Volume panel QS tile -->
<string name="quick_settings_volume_panel_label">Volume panel</string>

<!-- Music tile -->
<string name="quick_settings_music_label">Music</string>
<string name="quick_settings_music_play">Play</string>
<string name="quick_settings_music_pause">Pause</string>

<!-- Compass QS Tile -->
<string name="quick_settings_compass_label">Compass</string>
<string name="quick_settings_compass_value"><xliff:g id="degrees">%1$.0f</xliff:g>\u00b0 <xliff:g id="direction">%2$s</xliff:g></string>
<string name="quick_settings_compass_init">Initializing\u2026</string>
<string name="accessibility_quick_settings_compass_off">Compass off</string>
<string name="accessibility_quick_settings_compass_on">Compass on</string>
<string name="accessibility_quick_settings_compass_changed_off">Compass turned off</string>
<string name="accessibility_quick_settings_compass_changed_on">Compass turned on</string>
<string name="quick_settings_compass_N">N</string>
<string name="quick_settings_compass_NE">NE</string>
<string name="quick_settings_compass_E">E</string>
<string name="quick_settings_compass_SE">SE</string>
<string name="quick_settings_compass_S">S</string>
<string name="quick_settings_compass_SW">SW</string>
<string name="quick_settings_compass_W">W</string>
<string name="quick_settings_compass_NW">NW</string>

<!-- Ambient display QS tile -->
<string name="quick_settings_ambient_display_label">Ambient display</string>
<string name="accessibility_quick_settings_ambient_display_off">Ambient display off</string>
<string name="accessibility_quick_settings_ambient_display_on">Ambient display on</string>
<string name="accessibility_quick_settings_ambient_display_changed_off">Ambient display turned off</string>
<string name="accessibility_quick_settings_ambient_display_changed_on">Ambient display turned on</string>

<!-- SleepScreen QS Tile -->
<string name="quick_settings_sleepscreen_label">Sleep Screen</string>

<!-- VPN QS tile -->
<string name="quick_settings_vpn_label">VPN</string>
<string name="quick_settings_vpn_connect_dialog_title">Connect to\u2026</string>
<string name="vpn_credentials_hint">Please enter your credentials for connecting to <xliff:g id="name">%s</xliff:g></string>
<string name="vpn_credentials_username">Username</string>
<string name="vpn_credentials_password">Password</string>
<string name="vpn_credentials_dialog_connect">Connect</string>

<!-- Reboot/Recovery QS Tile -->
<string name="quick_settings_reboot_label">Reboot</string>
<string name="quick_settings_reboot_recovery_label">Recovery</string>

<!-- LTE QS Tile -->
<string name="qs_lte_label">LTE</string>
<string name="lte_on">LTE ON </string>
<string name="lte_off">LTE OFF</string>

<!-- Advance location quick setting tile -->
<string name="quick_settings_secondary_location_off"></string>
<string name="quick_settings_location_secondary_battery_saving">Battery Saving</string>
<string name="accessibility_quick_settings_location_battery_saving">Location reporting: battery saving mode.</string>
<string name="quick_settings_location_secondary_gps_only">Sensors Only</string>
<string name="accessibility_quick_settings_location_gps_only">Location reporting: sensors only mode.</string>
<string name="quick_settings_location_secondary_high_accuracy">High Accuracy</string>
<string name="accessibility_quick_settings_location_high_accuracy">Location reporting: high accuracy mode.</string>

<!-- Indication on the keyguard that is shown when the device is charging with a dash charger. Should match keyguard_plugged_in_dash_charging [CHAR LIMIT=40]-->
<string name="keyguard_indication_dash_charging_time"><xliff:g id="percentage">%2$s</xliff:g> • Dash Charging (<xliff:g id="charging_time_left" example="4 hours and 2 minutes">%s</xliff:g> until full)</string>
<string name="keyguard_plugged_in_dash_charging">Dash Charging</string>

<!-- Reader mode QS tile -->
<string name="quick_settings_reading_mode">Reading mode</string>
<string name="accessibility_quick_settings_reading_mode_on">Reading mode on.</string>
<string name="accessibility_quick_settings_reading_mode_off">Reading mode off.</string>
<string name="accessibility_quick_settings_reading_mode_changed_on">Reading mode turned on.</string>
<string name="accessibility_quick_settings_reading_mode_changed_off">Reading mode turned off.</string>

<string name="statusbar_items_title">Statusbar icon</string>

<string name="lockscreen_default">Default</string>
<string name="lockscreen_hidden">None</string>

<!-- Shows when people have clicked on the custom lockscreen shortcut [CHAR LIMIT=60] -->
<string name="custom_hint">Swipe from icon to launch</string>

<!--Screenrecord Tile-->
<string name="screenrecorder_title_tile">Screenrecord</string>

<!-- HW Keys Tile -->
<string name="accessibility_quick_settings_hwkeys_on">HW keys on</string>
<string name="accessibility_quick_settings_hwkeys_off">HW keys off</string>
<string name="quick_settings_hwkeys_label">HW keys</string>

<!-- Gaming Mode -->
<string name="gaming_mode_tile_title">Gaming Mode</string>
<string name="gaming_mode_tile_toast">Gaming mode enabled</string>
<string name="gaming_mode_tile_toast_disabled">Gaming mode disabled</string>
<string name="gaming_mode_dialog_title">Gaming Mode</string>
<string name="gaming_mode_dialog_message">When gaming mode is enabled, all heads-up messages will be disabled and hardware keys will be turned off. All the disabled settings will be reset to default once you exit Gaming Mode.</string>
<string name="accessibility_quick_settings_gaming_mode_on">Gaming mode on</string>
<string name="accessibility_quick_settings_gaming_mode_off">Gaming mode off</string>

<!-- Status bar icons -->
<string name="status_bar_data_disabled">Data disabled</string>
<string name="status_bar_data_saver">Data saver</string>
<string name="status_bar_nfc">NFC</string>
<string name="status_bar_roaming">Roaming</string>
<string name="status_bar_vpn">VPN</string>

<!-- Accessibility label for nfc icon (not shown on screen) [CHAR LIMIT=NONE] -->
<string name="accessibility_status_bar_nfc">Nfc</string>

<!-- Kill button in notification guts -->
<string name="force_stop_dlg_title">Force stop?</string>
<string name="force_stop_dlg_text">If you force stop an app, it may misbehave.</string>
<string name="dlg_ok">@android:string/ok</string>
<string name="dlg_cancel">@android:string/cancel</string>
<string name="guts_force_close_app">Close App</string>

</resources>
Loading