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

settings: Switch from List preference to Animation Scale Preference #27

Draft
wants to merge 30 commits into
base: 14
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
30 commits
Select commit Hold shift + click to select a range
0fd5b19
Settings: Use seekbar to allow setting arbitrary animation values
hyperb1iss May 2, 2014
8505130
Settings: AnimationScale: Fix force close when not using english
mydongistiny Sep 22, 2018
d05ebf9
settings: move animation preference to different class
kazerine Nov 19, 2020
e2eec4a
Revert "Settings: Contionally enable some haptic feedback option"
NurKeinNeid Jun 21, 2024
20cf514
Revert "Settings: Relax slider haptic feedback"
NurKeinNeid Jun 22, 2024
996d704
Revert "Settings: Use VibratorHelper for custom haptic feedback"
NurKeinNeid Jun 22, 2024
be38da6
Partially revert "Settings: Add haptic feedback on sliders [2/2]"
NurKeinNeid Jun 22, 2024
3b47dcb
Merge tag 'android-14.0.0_r50' of https://android.googlesource.com/pl…
NurKeinNeid Jun 22, 2024
3d2e017
Settings: Allow limiting custom app actions in QS media player [2/2]
idoybh Jun 4, 2024
575f887
Settings: Allow using QS media player time as next & previous [2/2]
idoybh Jun 5, 2024
77346f2
fixup! Implement notificationlight settings
iKeramat May 16, 2024
a81cc8c
Settings: Don't directly call onStart/onStop on dialogs
SebaUbuntu Jun 23, 2024
1bfb828
Settings: Skip auth for WiFi net share when unlocked in the last 60s
idoybh Jun 23, 2024
af335dd
Settings: Add Simplified Chinese translation
ianchb Apr 13, 2024
f06256d
Settings: Changes for LiveDisplay
jhenrique09 Jun 9, 2024
2418139
Settings: Add dialog handling for ApplicationLightPreference
ShionKanagawa Jun 25, 2024
ce003f0
Revert "[Sim UI enhancement] remove the "Tap to show info""
althafvly Jun 27, 2024
ca61195
Partially revert "Remove feedback and bug report stuff"
NurKeinNeid Jun 29, 2024
22e29a4
Settings: Add dialog handling for BrightnessPreference and ButtonBack…
ShionKanagawa Jun 29, 2024
c510286
Revert "Settings: Add toggle for 60Hz refresh rate on battery saver"
NurKeinNeid Jun 30, 2024
f1cdd9b
Merge tag 'android-14.0.0_r53' of https://android.googlesource.com/pl…
NurKeinNeid Jul 3, 2024
2dbdc39
fixup! Implement notificationlight settings
NurKeinNeid Jul 7, 2024
06dd56d
Automatic translation import
lineageos-gerrit Jul 16, 2024
65050d8
Settings: Fix choose pattern size activity theme issues
Dhina17 Jul 15, 2024
8a9358c
ChooseLockPatternSize: Remove header start padding in SuW
Dhina17 Jul 15, 2024
6d7bdcd
Settings: Remove unused pattern sizes layout
Dhina17 Jul 15, 2024
fa06000
Revert "Settings: Suppress notifications sound if screen is ON [2/2]"
NurKeinNeid Jul 27, 2024
5dc569f
Automatic translation import
lineageos-gerrit Aug 1, 2024
a085464
Merge tag 'android-14.0.0_r56' of https://android.googlesource.com/pl…
NurKeinNeid Aug 7, 2024
bd17c07
Revert "Restrict "Turn on wifi automatically" to USA and Canada"
NurKeinNeid Aug 9, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
25 changes: 9 additions & 16 deletions Android.bp
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
package {
default_team: "trendy_team_android_settings_app",
default_applicable_licenses: ["packages_apps_Settings_license"],
}

Expand All @@ -23,8 +24,8 @@ java_library {
genrule {
name: "statslog-settings-java-gen",
tools: ["stats-log-api-gen"],
cmd: "$(location stats-log-api-gen) --java $(out) --module settings"
+ " --javaPackage com.android.settings.core.instrumentation --javaClass SettingsStatsLog",
cmd: "$(location stats-log-api-gen) --java $(out) --module settings" +
" --javaPackage com.android.settings.core.instrumentation --javaClass SettingsStatsLog",
out: ["com/android/settings/core/instrumentation/SettingsStatsLog.java"],
}

Expand All @@ -45,9 +46,9 @@ java_library {

android_library {
name: "Settings-core",
platform_apis: true,
defaults: [
"SettingsLib-search-defaults",
"SettingsLintDefaults",
"SpaPrivilegedLib-defaults",
],

Expand All @@ -56,9 +57,8 @@ android_library {
"src/**/*.kt",
"DerpSpace/src/**/*.java",
],

exclude_srcs: [
"src/com/android/settings/biometrics/fingerprint2/shared/**/*.kt",
"src/com/android/settings/biometrics/fingerprint2/lib/**/*.kt",
],
use_resource_processor: true,

Expand Down Expand Up @@ -101,6 +101,7 @@ android_library {
"MediaDrmSettingsFlagsLib",
"Settings-change-ids",
"SettingsLib",
"SettingsLibDataStore",
"SettingsLibActivityEmbedding",
"aconfig_settings_flags_lib",
"accessibility_settings_flags_lib",
Expand All @@ -118,17 +119,9 @@ android_library {
"settings-logtags",
"settings-telephony-protos-lite",
"statslog-settings",
"zxing-core-1.7",
"android.hardware.dumpstate-V1.0-java",
"android.hardware.dumpstate-V1.1-java",
"android.hardware.dumpstate-V1-java",
"lottie",
"WifiTrackerLib",
"SettingsLibActivityEmbedding",
"Settings-change-ids",
"androidx.room_room-runtime",
"SystemUISharedLib",
"SystemUIUnfoldLib",
"androidx.test.rules",
"telephony_flags_core_java_lib",
"setupdesign-lottie-loading-layout",
"vendor.lineage.fastcharge-V1.0-java",
"VendorSupport-preference",
"glide",
Expand Down
226 changes: 169 additions & 57 deletions AndroidManifest.xml

Large diffs are not rendered by default.

1 change: 0 additions & 1 deletion OWNERS
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ [email protected]
[email protected]
[email protected]
[email protected]
[email protected]

# Android Settings extended
[email protected]
Expand Down
10 changes: 8 additions & 2 deletions TEST_MAPPING
Original file line number Diff line number Diff line change
Expand Up @@ -6,14 +6,20 @@
{
"name": "SettingsUnitTests",
"options": [
{
"include-filter": "com.android.settings.biometrics"
},
{
"include-filter": "com.android.settings.biometrics2"
},
{
"include-filter": "com.android.settings.password"
},
{
"include-filter": "com.android.settings.biometrics"
"include-filter": "com.android.settings.safetycenter"
},
{
"include-filter": "com.android.settings.biometrics2"
"include-filter": "com.android.settings.security"
}
]
}
Expand Down
8 changes: 7 additions & 1 deletion aconfig/Android.bp
Original file line number Diff line number Diff line change
@@ -1,10 +1,12 @@
package {
default_team: "trendy_team_android_settings_app",
default_applicable_licenses: ["packages_apps_Settings_license"],
}

aconfig_declarations {
name: "aconfig_settings_flags",
package: "com.android.settings.flags",
container: "system",
srcs: [
"*.aconfig",
],
Expand All @@ -18,6 +20,7 @@ java_aconfig_library {
aconfig_declarations {
name: "factory_reset_flags",
package: "com.android.settings.factory_reset",
container: "system",
srcs: ["factory_reset/*.aconfig"],
}

Expand All @@ -29,6 +32,7 @@ java_aconfig_library {
aconfig_declarations {
name: "media_drm_flags",
package: "com.android.settings.media_drm",
container: "system",
srcs: ["media_drm/*.aconfig"],
}

Expand All @@ -40,6 +44,7 @@ java_aconfig_library {
aconfig_declarations {
name: "accessibility_flags",
package: "com.android.settings.accessibility",
container: "system",
srcs: ["accessibility/*.aconfig"],
}

Expand All @@ -51,8 +56,9 @@ java_aconfig_library {
aconfig_declarations {
name: "development_settings_flags",
package: "com.android.settings.development",
container: "system",
srcs: [
"development/**/*.aconfig"
"development/**/*.aconfig",
],
}

Expand Down
31 changes: 30 additions & 1 deletion aconfig/accessibility/accessibility_flags.aconfig
Original file line number Diff line number Diff line change
@@ -1,10 +1,39 @@
package: "com.android.settings.accessibility"
container: "system"

# NOTE: Keep alphabetized to help limit merge conflicts from multiple simultaneous editors.

flag {
name: "edit_shortcuts_in_full_screen"
namespace: "accessibility"
description: "Show the edit shorcuts screen in full screen, since the shortcut options are increasing."
bug: "300302098"
}

flag {
name: "enable_hearing_aid_preset_control"
namespace: "accessibility"
description: "Allows users to control hearing aid preset in the Bluetooth device details page."
bug: "300015207"
}

flag {
name: "enable_hearing_aid_volume_offset_control"
namespace: "accessibility"
description: "Allows users to control hearing aid volume offset in the Bluetooth device details page."
bug: "301198830"
}

flag {
name: "remove_qs_tooltip_in_suw"
namespace: "accessibility"
description: "Don't show quick settings tooltip in SUW, since the user can't use quick settings there."
bug: "294560581"
}
}

flag {
name: "enable_color_contrast_control"
namespace: "accessibility"
description: "Allows users to control color contrast in the Accessibility settings page."
bug: "246577325"
}
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
package: "com.android.settings.development"
container: "system"

flag {
name: "deprecate_list_activity"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
package: "com.android.settings.factory_reset"
container: "system"

flag {
name: "enable_factory_reset_wizard"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
package: "com.android.settings.media_drm"
container: "system"

flag {
name: "force_l3_enabled"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
package: "com.android.settings.flags"
container: "system"

# NOTE: Don't add new accessibility flags here, since the package name doesn't follow
# the best practice for setting's feature flag go/settings-trunk-stable
Expand Down Expand Up @@ -32,7 +33,7 @@ flag {
flag {
name: "new_hearing_device_pairing_page"
namespace: "accessibility"
description: "New hearing device pairing page with deny list method"
description: "New hearing device pairing page with extra MFi+ASHA filtering"
bug: "307473972"
}

Original file line number Diff line number Diff line change
@@ -1,8 +1,16 @@
package: "com.android.settings.flags"
container: "system"

flag {
name: "biometric_settings_provider"
namespace: "biometrics_framework"
description: "This flag enables or disables the BiometricSettingsProvider"
bug: "303595205"
}

flag {
name: "fingerprint_v2_enrollment"
namespace: "biometrics_framework"
description: "This flag enables or disables the Fingerprint v2 enrollment"
bug: "295206723"
}
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
package: "com.android.settings.flags"
container: "system"

flag {
name: "sfps_enroll_refinement"
Expand Down
8 changes: 8 additions & 0 deletions aconfig/settings_bluetooth_declarations.aconfig
Original file line number Diff line number Diff line change
@@ -1,8 +1,16 @@
package: "com.android.settings.flags"
container: "system"

flag {
name: "enable_offload_bluetooth_operations_to_background_thread"
namespace: "pixel_cross_device_control"
description: "Gates whether to offload bluetooth operations to background thread"
bug: "305636727"
}

flag {
name: "enable_bluetooth_profile_toggle_visibility_checker"
namespace: "pixel_cross_device_control"
description: "Gates whether to enable checker for bluetooth profile toggle visibility"
bug: "321178209"
}
15 changes: 8 additions & 7 deletions aconfig/settings_connecteddevice_flag_declarations.aconfig
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
package: "com.android.settings.flags"
container: "system"

flag {
name: "enable_subsequent_pair_settings_integration"
Expand All @@ -8,15 +9,15 @@ flag {
}

flag {
name: "enable_le_audio_sharing"
namespace: "pixel_cross_device_control"
description: "Gates whether to enable LE audio sharing"
bug: "305620450"
name: "enable_auth_challenge_for_usb_preferences"
namespace: "safety_center"
description: "Gates whether to require an auth challenge for changing USB preferences"
bug: "317367746"
}

flag {
name: "enable_le_audio_qr_code_private_broadcast_sharing"
name: "enable_saved_devices_order_by_recency"
namespace: "pixel_cross_device_control"
description: "Gates whether to enable LE audio private broadcast sharing via QR code"
bug: "308368124"
description: "Order the saved bluetooth devices by most recently connected."
bug: "306160434"
}
8 changes: 8 additions & 0 deletions aconfig/settings_development_flag_declarations.aconfig
Original file line number Diff line number Diff line change
@@ -1,10 +1,18 @@
package: "com.android.settings.flags"
container: "system"

# NOTE: Keep alphabetized to help limit merge conflicts from multiple simultaneous editors.

# NOTE: All Settings flags share the same Flags class, so prefix our
# flags with 'development' to prevent naming collision.

flag {
name: "development_game_default_frame_rate"
namespace: "game"
description: "This flag guards the new behavior with the addition of Game Default Frame Rate feature."
bug: "286084594"
}

flag {
name: "development_hdr_sdr_ratio"
namespace: "core_graphics"
Expand Down
10 changes: 10 additions & 0 deletions aconfig/settings_display_flag_declarations.aconfig
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
package: "com.android.settings.flags"
container: "system"

flag {
name: "protect_screen_timeout_with_auth"
namespace: "safety_center"
description: "Require an auth challenge for increasing screen timeout."
bug: "315937886"
}

1 change: 1 addition & 0 deletions aconfig/settings_experience_flag_declarations.aconfig
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
package: "com.android.settings.flags"
container: "system"

flag {
name: "new_apn_page_enabled"
Expand Down
8 changes: 8 additions & 0 deletions aconfig/settings_flag_declarations.aconfig
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
package: "com.android.settings.flags"
container: "system"

flag {
name: "show_factory_reset_cancel_button"
Expand All @@ -13,3 +14,10 @@ flag {
description: "Enabling will provide an explicit package name for Intent to update mainline modules"
bug: "278987474"
}

flag {
name: "app_archiving"
namespace: "android_settings"
description: "Feature flag to enable the archiving feature."
bug: "323164382"
}
1 change: 1 addition & 0 deletions aconfig/settings_globalintl_flag_declarations.aconfig
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
package: "com.android.settings.flags"
container: "system"

flag {
name: "terms_of_address_enabled"
Expand Down
1 change: 1 addition & 0 deletions aconfig/settings_notification_flag_declarations.aconfig
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
package: "com.android.settings.flags"
container: "system"

flag {
name: "dedupe_dnd_settings_channels"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
package: "com.android.settings.flags"
container: "system"

flag {
name: "enable_sound_backup"
Expand Down
1 change: 1 addition & 0 deletions aconfig/settings_panel_flag_declarations.aconfig
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
package: "com.android.settings.flags"
container: "system"

flag {
name: "enable_volume_plus_quick_settings"
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
package: "com.android.settings.flags"
container: "system"

flag {
name: "enable_perform_backup_tasks_in_settings"
namespace: "backstage_power"
description: "Enable the Perform Backup Tasks screen in Settings"
bug: "320563660"
}
9 changes: 9 additions & 0 deletions aconfig/settings_security_flag_declarations.aconfig
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
package: "com.android.settings.flags"
container: "system"

flag {
name: "protect_lock_after_timeout_with_auth"
namespace: "safety_center"
description: "Require an auth challenge to open Lock after timeout page"
bug: "315937886"
}
1 change: 1 addition & 0 deletions aconfig/settings_telephony_flag_declarations.aconfig
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
package: "com.android.settings.flags"
container: "system"

flag {
name: "remove_key_hide_enable_2g"
Expand Down
Loading