Skip to content

merge ten-staging into ten #1

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.

Sign up for GitHub

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

Open
IPSBHANGU wants to merge 15 commits into
base: ten
Choose a base branch
from
Open

merge ten-staging into ten #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
cd69db7
OneCustoms: Bring back Gaming mode [3/3]
neobuddy89 Nov 17, 2019
ff6b410
optional miui-like brightness slider [3/3]
00day0 Feb 3, 2020
a35d076
add pref for qs brightness slider position (2/2)
maxwen Jan 24, 2020
571ccb9
Update Team
IPSBHANGU Apr 11, 2020
cc16746
OneCustoms: Add OneParts to main menu
xyyx Nov 18, 2017
37e0dab
OneCustoms: Screen off FOD [3/3]
00day0 Apr 10, 2020
b691d8d
OneCustoms: Show icon when Screen Off FOD is enabled [2/2]
SKULSHADY May 5, 2020
539d25c
FOD icon picker [2/2]
00day0 Dec 16, 2019
74d5b8a
Revert "FOD icon picker [2/2]"
IPSBHANGU May 19, 2020
2e050d3
Revert "OneCustoms: Add OneParts to main menu"
IPSBHANGU Jun 25, 2020
c287962
OneCustoms: Remove old Status network traffic
IPSBHANGU Jun 25, 2020
cb320c3
OneCustoms: Statusbar network traffic [2/2]
ezio84 Oct 20, 2019
1f8d99f
OneCustoms: CleanUp Network traffic
IPSBHANGU Jul 7, 2020
9a9c292
OneCustoms: Network Traffic: Customize refresh interval [2/2]
neobuddy89 May 17, 2020
a0bd78a
ConfigCenter: Network Traffic: Allow to choose display mode [1/2]
SKULSHADY May 17, 2020
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
17 changes: 17 additions & 0 deletions res/color/master_setting_switch_bar_bg.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Copyright (C) 2019 The LineageOS 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.
-->

<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:color="#ff757575" android:state_activated="false" />
<item android:color="?android:attr/colorAccent" android:state_activated="true" />
</selector>
27 changes: 27 additions & 0 deletions res/drawable/ic_menu_add_white.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
Copyright (C) 2017-2019 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.
-->
<vector
xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportWidth="24.0"
android:viewportHeight="24.0"
android:tint="?android:attr/colorControlNormal">
<path
android:fillColor="#FFFFFFFF"
android:pathData="M19,13H13V19H11V13H5V11H11V5H13V11H19V13Z"/>
</vector>
23 changes: 23 additions & 0 deletions res/drawable/ic_settings_lockscreen.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
<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="M0,0h24v24H0V0z" />
<path
android:pathData="M0,0h24v24H0V0z" />
<path
android:fillColor="#000000"
android:pathData="M18,8h-1V6c0-2.8-2.2-5-5-5S7,3.2,7,6v2H6c-1.1,0-2,0.9-2,2v10c0,1.1,0.9,2,2,2h12c1.1,0,2-0.9,2-2V10C20,8.9,19.1,8,18,8z M9,6c0-1.7,1.3-3,3-3s3,1.3,3,3v2H9V6z M18,20H6V10h12V20z" />
<path
android:strokeColor="#000000"
android:strokeWidth="2"
android:pathData="M 12 12 L 12 18" />
<path
android:strokeColor="#000000"
android:strokeWidth="2"
android:pathData="M 15 15 L 9 15" />
</vector>
17 changes: 17 additions & 0 deletions res/drawable/master_setting_switchbar_background.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Copyright (C) 2019 The LineageOS 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.
-->

<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<solid android:color="@color/master_setting_switch_bar_bg" />
</shape>
67 changes: 67 additions & 0 deletions res/layout/applist_preference_icon.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,67 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Copyright (C) 2006 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.
-->

<!-- Layout for a Preference in a PreferenceActivity. The
Preference is able to place a specific widget for its particular
type in the "widget_frame" layout. -->
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@android:id/widget_frame"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:minHeight="?android:attr/listPreferredItemHeightSmall"
android:gravity="center_vertical"
android:paddingStart="?android:attr/listPreferredItemPaddingStart"
android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"
android:background="?android:attr/selectableItemBackground">

<ImageView
android:id="@+id/icon"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginEnd="12dip"
android:padding="2dp"
android:maxWidth="36dip"
android:maxHeight="36dip"
android:adjustViewBounds="true"
android:layout_gravity="center" />

<RelativeLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="2dip"
android:layout_marginEnd="6dip"
android:layout_marginTop="6dip"
android:layout_marginBottom="6dip"
android:layout_weight="1">

<TextView android:id="@android:id/title"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:singleLine="true"
android:textAppearance="?android:attr/textAppearanceListItem"
android:textColor="?android:attr/textColorPrimary"
android:ellipsize="marquee"
android:fadingEdge="horizontal" />

<TextView android:id="@android:id/summary"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@android:id/title"
android:layout_alignStart="@android:id/title"
android:textAppearance="?android:attr/textAppearanceListItemSecondary"
android:textColor="?android:attr/textColorSecondary"
android:maxLines="2" />

</RelativeLayout>

</LinearLayout>
27 changes: 27 additions & 0 deletions res/layout/master_setting_switch.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
/*
** Copyright 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.
*/
-->

<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:orientation="vertical"
android:layout_height="match_parent"
android:layout_width="match_parent">

<include layout="@layout/master_setting_switch_bar" />

</LinearLayout>
45 changes: 45 additions & 0 deletions res/layout/master_setting_switch_bar.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Copyright (C) 2016 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:id="@+id/switch_bar"
android:layout_width="match_parent"
android:layout_height="?android:attr/actionBarSize"
android:background="@drawable/master_setting_switchbar_background"
android:paddingStart="16dp"
android:paddingEnd="16dp"
android:clickable="true"
android:gravity="center">

<TextView android:id="@+id/switch_text"
android:layout_height="wrap_content"
android:layout_width="0dp"
android:layout_weight="1"
android:layout_gravity="center_vertical"
android:paddingStart="56dp"
android:maxLines="2"
android:ellipsize="end"
android:textAppearance="@style/TextAppearance.Switch"
android:textColor="?android:attr/textColorPrimaryInverse"
android:textSize="18sp"
android:textAlignment="viewStart" />

<Switch
android:id="@android:id/switch_widget"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:background="@null"
android:theme="@style/Widget.SwitchBar.Switch" />

</LinearLayout>
49 changes: 49 additions & 0 deletions res/values/one_arrays.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,4 +15,53 @@
<item>300</item>
<item>600</item>
</string-array>

<!-- Gaming mode -->
<string-array name="gaming_mode_ringer_entries">
<item>@string/gaming_mode_ringer_off_title</item>
<item>@string/gaming_mode_ringer_vibrate_title</item>
<item>@string/gaming_mode_ringer_dnd_title</item>
<item>@string/gaming_mode_ringer_silent_title</item>
</string-array>
<string-array name="gaming_mode_ringer_values" translatable="false">
<item>0</item>
<item>1</item>
<item>2</item>
<item>3</item>
</string-array>

<string-array name="gaming_mode_notifications_entries">
<item>@string/gaming_mode_notifications_off_title</item>
<item>@string/gaming_mode_notifications_notif_title</item>
<item>@string/gaming_mode_notifications_toast_title</item>
<item>@string/gaming_mode_notifications_all_title</item>
</string-array>
<string-array name="gaming_mode_notifications_values" translatable="false">
<item>0</item>
<item>1</item>
<item>2</item>
<item>3</item>
</string-array>

<!-- Network traffic -->
<string-array name="network_traffic_location_entries" translatable="false">
<item>@string/network_traffic_statusbar</item>
<item>@string/network_traffic_qs_header</item>
</string-array>
<string-array name="network_traffic_location_values" translatable="false">
<item>0</item>
<item>1</item>
</string-array>

<string-array name="network_traffic_mode_entries" translatable="false">
<item>@string/network_traffic_dynamic</item>
<item>@string/network_traffic_download</item>
<item>@string/network_traffic_upload</item>
</string-array>
<string-array name="network_traffic_mode_values" translatable="false">
<item>0</item>
<item>1</item>
<item>2</item>
</string-array>

</resources>
64 changes: 57 additions & 7 deletions res/values/one_strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
<string name="misc_title">Miscellaneous</string>
<string name="statusbar_title">Status bar</string>
<string name="about_title">About</string>
<string name="lockscreen_title">Lock Screen</string>

<!-- General strings -->
<string name="ok">OK</string>
Expand All @@ -27,9 +28,58 @@
<string name="save">Save</string>

<!-- Statusbar net monitor -->
<string name="network_traffic_state_title">Network traffic</string>
<string name="network_traffic_state_summary">Show net activity in statusbar</string>
<string name="network_traffic_autohide_threshold_title">Net activity autohide threshold (KB/s)</string>
<string name="statusbar_ntraffic">Network</string>
<string name="network_traffic_state_title">Network speed</string>
<string name="network_traffic_state_summary">Show network speed in the status bar</string>
<string name="network_traffic_location_title">Location</string>
<string name="network_traffic_statusbar">Status bar</string>
<string name="network_traffic_qs_header">QS header</string>
<string name="network_traffic_mode_title">Display mode</string>
<string name="network_traffic_dynamic">Dynamic</string>
<string name="network_traffic_download">Download</string>
<string name="network_traffic_upload">Upload</string>
<string name="network_traffic_autohide_threshold_title">Auto-hide threshold</string>
<string name="network_traffic_refresh_interval_title">Refresh interval</string>

<!-- Screen off FOD -->
<string name="screen_off_fod_title">Screen off FOD</string>
<string name="screen_off_fod_summary">Use fingerprint reader also when the screen is off</string>
<string name="screen_off_fod_icon_title">Show icon</string>
<string name="screen_off_fod_icon_summary">Show fingerprint icon when the screen is off</string>

<!-- Brightness Slider(TODO- Make new menu for UI-tunning) -->
<string name="brightness_slider_qs_unexpanded">New Brightness slider (beta)</string>
<string name="brightness_slider_qs_unexpanded_summary">Shows brightness slider below qs panel</string>
<string name="qs_brightness_position_bottom_title">Brightness slider at bottom</string>
<string name="qs_brightness_position_bottom_summary">Show a brightness slider on bottom quick settings</string>

<!-- Gaming mode -->
<string name="gaming_mode_title">Gaming Mode</string>
<string name="gaming_mode_summary">Customize gaming mode preferences</string>
<string name="gaming_mode_app_picker_title">Automatically turn on for these apps</string>
<string name="add_gaming_mode_package_title">Add apps for Gaming mode</string>
<string name="add_gaming_mode_package_summary">Gaming mode will turn on automatically when these apps are opened and turn off when they are closed</string>
<string name="gaming_mode_headsup_title">Block notifications</string>
<string name="gaming_mode_headsup_summary">Block all headsup messages except calls</string>
<string name="gaming_mode_hardware_keys_title">Lock buttons</string>
<string name="gaming_mode_hardware_keys_summary">Disable hardware buttons when Gaming mode is turned on</string>
<string name="gaming_mode_brightness_title">Disable automatic brightness</string>
<string name="gaming_mode_brightness_summary">Lock screen brightness when Gaming mode is turned on</string>
<string name="gaming_mode_ringer_title">Ringer in gaming mode</string>
<string name="gaming_mode_ringer_off_title">Do not change</string>
<string name="gaming_mode_ringer_vibrate_title">Vibrate</string>
<string name="gaming_mode_ringer_dnd_title">Do Not Disturb</string>
<string name="gaming_mode_ringer_silent_title">Silent</string>
<string name="gaming_mode_notifications_title">Gaming mode indication</string>
<string name="gaming_mode_notifications_off_title">Disabled</string>
<string name="gaming_mode_notifications_notif_title">Show notification</string>
<string name="gaming_mode_notifications_toast_title">Show toasts</string>
<string name="gaming_mode_notifications_all_title">Show toasts and notification</string>
<string name="gaming_mode_dynamic_title">Dynamic mode</string>
<string name="gaming_mode_dynamic_summary">Try detecting and adding gaming apps automatically</string>
<string name="profile_choose_app">Choose app</string>
<string name="dialog_delete_title">Delete</string>
<string name="dialog_delete_message">Remove selected item?</string>

<!-- Three-fingers-swipe to screenshot -->
<string name="three_finger_gesture">Swipe to screenshot</string>
Expand All @@ -47,12 +97,12 @@
<!-- About -->
<string name="developers_category_title">Developers</string>
<string name="support_category_title">Support Team</string>
<string name="one_developers_ipsbhangu" translatable="false">• Co-Founder \n• Core Developer \n• UI/UX Designer\n• Maintainer</string>
<string name="one_developers_androiabledroid" translatable="false">• Founder \n• Core Developer\n• Maintainer</string>
<string name="one_developers_ipsbhangu" translatable="false">• Founder \n• Core Developer \n• UI/UX Designer\n• Maintainer</string>
<string name="one_developers_androiabledroid" translatable="false">• Co-Founder \n• Core Developer\n• Maintainer</string>
<string name="one_support_ashley" translatable="false">• The One whos Effort made this</string>
<string name="one_support_gautam" translatable="false">• Teams Inspiration</string>
<string name="one_support_prathamesh" translatable="false">• Feature Hungry</string>
<string name="one_support_kb" translatable="false">• Support Group Moderator</string>
<string name="one_support_abuzar" translatable="false">• Feature Bringer</string>
<string name="one_support_device" translatable="false">Device Support</string>
<string name="one_links">Links</string>
<string name="one_announcements_title">Announcements</string>
<string name="one_announcements_summary">Official announcements channel</string>
Expand Down
Loading