Android/packages_apps_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Commit Graph

  • 3de1603336 Merge "Save foreground_service and cached consumed power in battery usage slot datebase." into udc-qpr-dev am: 7e92664f52 am: aab57c0179 Treehugger Robot 2023-09-13 05:30:51 +00:00
  • 6750634259 Impl highlight effect on BatteryChartView slots. mxyyiyi 2023-08-22 18:09:42 +08:00
  • 9feaa3d883 Merge "Refactor battery usage page contollers interaction logic" into udc-qpr-dev am: 9a293a7101 YK Hung 2023-09-13 04:45:21 +00:00
  • 8596b78a00 Merge "Refactor flags of Power Anomaly Tips in Settings Intelligence.(1/2)" into udc-qpr-dev am: 02b5491447 YK Hung 2023-09-13 04:43:40 +00:00
  • 348b3b91d8 Merge "Recheck the scedule job when the device is full charged and add more logs" into udc-qpr-dev am: 378ad24aac YK Hung 2023-09-13 04:39:58 +00:00
  • aab57c0179 Merge "Save foreground_service and cached consumed power in battery usage slot datebase." into udc-qpr-dev am: 7e92664f52 Treehugger Robot 2023-09-13 04:39:21 +00:00
  • 9a293a7101 Merge "Refactor battery usage page contollers interaction logic" into udc-qpr-dev YK Hung 2023-09-13 04:35:26 +00:00
  • 02b5491447 Merge "Refactor flags of Power Anomaly Tips in Settings Intelligence.(1/2)" into udc-qpr-dev YK Hung 2023-09-13 04:35:16 +00:00
  • 378ad24aac Merge "Recheck the scedule job when the device is full charged and add more logs" into udc-qpr-dev YK Hung 2023-09-13 04:24:04 +00:00
  • 7e92664f52 Merge "Save foreground_service and cached consumed power in battery usage slot datebase." into udc-qpr-dev Treehugger Robot 2023-09-13 04:11:20 +00:00
  • ea0f5b3d45 Refactor battery usage page contollers interaction logic Zaiyue Xue 2023-08-28 16:30:21 +08:00
  • ccf67c4481 Snap for 10797983 from 951bbde355 to udc-qpr1-release Android Build Coastguard Worker 2023-09-12 23:19:42 +00:00
  • 0978271198 Remove FingerprintStateViewModel. Hao Dong 2023-08-31 01:30:40 +00:00
  • 4fda9e8e42 [automerger skipped] Merge "Fix kotlin nullable errors in Settings" into aosp-main-future am: f87c5f2cfc -s ours am: 7076317476 -s ours am: b66a576c96 -s ours am: aa33b6586f -s ours Colin Cross 2023-09-12 22:55:42 +00:00
  • 19214157d3 [automerger skipped] Fix kotlin nullable errors in Settings am: ee87a406cd -s ours am: b50a062c94 -s ours am: 3f8c8ba9d8 -s ours am: f181b570f4 -s ours Colin Cross 2023-09-12 22:55:27 +00:00
  • f75d044a90 Merge "Add dependency on BiometricsSharedLib." into main Hao Dong 2023-09-12 21:32:02 +00:00
  • aa33b6586f [automerger skipped] Merge "Fix kotlin nullable errors in Settings" into aosp-main-future am: f87c5f2cfc -s ours am: 7076317476 -s ours am: b66a576c96 -s ours Colin Cross 2023-09-12 21:05:49 +00:00
  • f181b570f4 [automerger skipped] Fix kotlin nullable errors in Settings am: ee87a406cd -s ours am: b50a062c94 -s ours am: 3f8c8ba9d8 -s ours Colin Cross 2023-09-12 21:05:36 +00:00
  • b66a576c96 [automerger skipped] Merge "Fix kotlin nullable errors in Settings" into aosp-main-future am: f87c5f2cfc -s ours am: 7076317476 -s ours Colin Cross 2023-09-12 20:27:08 +00:00
  • 3f8c8ba9d8 [automerger skipped] Fix kotlin nullable errors in Settings am: ee87a406cd -s ours am: b50a062c94 -s ours Colin Cross 2023-09-12 20:26:53 +00:00
  • dc5e10e3cc Add a couple of guards to make sure crash doesn't happen Becca Hughes 2023-09-08 14:08:04 -07:00
  • 7076317476 [automerger skipped] Merge "Fix kotlin nullable errors in Settings" into aosp-main-future am: f87c5f2cfc -s ours Colin Cross 2023-09-12 19:41:29 +00:00
  • b50a062c94 [automerger skipped] Fix kotlin nullable errors in Settings am: ee87a406cd -s ours Colin Cross 2023-09-12 19:41:14 +00:00
  • 369b3f3ef9 Merge "Update owner list for packages/apps/Settings/src/com/android/settings/bluetooth/OWNERS and packages/apps/Settings/src/com/android/settings/connecteddevice/OWNERS" into main am: 9ace1904c3 am: 81343f23fc am: 945b20c70d am: 22a947a156 am: ea691aca93 Yuanru Qian 2023-09-12 18:43:09 +00:00
  • f87c5f2cfc Merge "Fix kotlin nullable errors in Settings" into aosp-main-future Colin Cross 2023-09-12 18:36:47 +00:00
  • 756d23cad1 [CDM] Add Permissions Sync toggle Guojing Yuan 2023-09-08 19:42:02 +00:00
  • ea691aca93 Merge "Update owner list for packages/apps/Settings/src/com/android/settings/bluetooth/OWNERS and packages/apps/Settings/src/com/android/settings/connecteddevice/OWNERS" into main am: 9ace1904c3 am: 81343f23fc am: 945b20c70d am: 22a947a156 Yuanru Qian 2023-09-12 17:43:15 +00:00
  • 22a947a156 Merge "Update owner list for packages/apps/Settings/src/com/android/settings/bluetooth/OWNERS and packages/apps/Settings/src/com/android/settings/connecteddevice/OWNERS" into main am: 9ace1904c3 am: 81343f23fc am: 945b20c70d Yuanru Qian 2023-09-12 17:04:28 +00:00
  • c37c8b8789 Change aspect ratio summary and footer text Graciela Wissen Putri 2023-09-07 11:53:59 +00:00
  • 945b20c70d Merge "Update owner list for packages/apps/Settings/src/com/android/settings/bluetooth/OWNERS and packages/apps/Settings/src/com/android/settings/connecteddevice/OWNERS" into main am: 9ace1904c3 am: 81343f23fc Yuanru Qian 2023-09-12 16:14:39 +00:00
  • 5d8fea06b1 Remove ExperimentalLifecycleComposeApi Chaohui Wang 2023-04-12 08:55:55 +08:00
  • 81343f23fc Merge "Update owner list for packages/apps/Settings/src/com/android/settings/bluetooth/OWNERS and packages/apps/Settings/src/com/android/settings/connecteddevice/OWNERS" into main am: 9ace1904c3 Yuanru Qian 2023-09-12 15:21:52 +00:00
  • 9ace1904c3 Merge "Update owner list for packages/apps/Settings/src/com/android/settings/bluetooth/OWNERS and packages/apps/Settings/src/com/android/settings/connecteddevice/OWNERS" into main Yuanru Qian 2023-09-12 14:37:23 +00:00
  • e3c53f39a3 Merge "Changed app string changes in user aspect ratio settings" into udc-qpr-dev am: 951bbde355 am: 7d297719d7 Massimo Carli 2023-09-12 12:11:47 +00:00
  • 19046965da Refactor flags of Power Anomaly Tips in Settings Intelligence.(1/2) mxyyiyi 2023-09-05 18:25:04 +08:00
  • 7d297719d7 Merge "Changed app string changes in user aspect ratio settings" into udc-qpr-dev am: 951bbde355 Massimo Carli 2023-09-12 11:16:24 +00:00
  • 951bbde355 Merge "Changed app string changes in user aspect ratio settings" into udc-qpr-dev Massimo Carli 2023-09-12 10:09:19 +00:00
  • 8ffc3c728d Update owner list for packages/apps/Settings/src/com/android/settings/bluetooth/OWNERS and packages/apps/Settings/src/com/android/settings/connecteddevice/OWNERS Yuanru Qian 2023-09-12 07:39:34 +00:00
  • 24aa9c8f15 Changed app string changes in user aspect ratio settings Massimo Carli 2023-09-11 17:08:50 +00:00
  • f5a01823b1 Merge "Centralise time to full in SettingsLib" into main YK Hung 2023-09-12 06:15:04 +00:00
  • d84c60f2ac Merge "Fix test failure of AvailableMediaDeviceGroupControllerTest" into main Angela Wang 2023-09-12 06:06:08 +00:00
  • 13695adf07 Recheck the scedule job when the device is full charged and add more logs Zaiyue Xue 2023-09-06 12:24:33 +08:00
  • 5bf2981d08 Fix SettingsUITests flakiness Chaohui Wang 2023-09-12 11:39:40 +08:00
  • ee87a406cd Fix kotlin nullable errors in Settings Colin Cross 2023-08-14 12:29:02 -07:00
  • aeb3bd3df5 update navigation mode settings string randypfohl 2023-09-11 12:24:33 -07:00
  • 6b58dad5b5 Add dependency on BiometricsSharedLib. Hao Dong 2023-08-31 22:18:49 +00:00
  • 860fce72ec Merge "Revert "Test Fix SettingRobolectricTest Fail"" into main Eric Rahm 2023-09-11 17:56:16 +00:00
  • 72dc40e42e Only update settings UI if data changes Becca Hughes 2023-09-06 14:12:20 -07:00
  • 802b922593 Revert "Test Fix SettingRobolectricTest Fail" Eric Rahm 2023-07-13 12:05:20 +00:00
  • 7cd9300c1d Merge "Add Private Space settings page" into main Manish Singh 2023-09-11 12:52:05 +00:00
  • bb21c0e1b7 Centralise time to full in SettingsLib Trina 2023-09-11 11:16:58 +00:00
  • e2e0af282a Add DevelopmentSettingsTest Chaohui Wang 2023-09-11 15:57:25 +08:00
  • 89111644f2 Snap for 10786608 from f2735decd6 to udc-qpr1-release Android Build Coastguard Worker 2023-09-09 22:58:52 +00:00
  • a35c6bc139 Fix more SettingsUITests Chaohui Wang 2023-09-08 21:26:59 +08:00
  • d68d98d77a Snap for 10783763 from 8dea913ea0 to udc-qpr1-release Android Build Coastguard Worker 2023-09-09 01:19:25 +00:00
  • f1a1439d2b [automerger skipped] Merge "Remove version text in user aspect ratio settings page" into udc-qpr-dev am: f2735decd6 am: de41256dd2 -s ours Massimo Carli 2023-09-09 00:42:19 +00:00
  • 2beeece303 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 9d8a174cfb -s ours am: 0e9f6de1c9 -s ours am: aff2aa2b9b -s ours am: ae0e9ab922 -s ours Bill Yi 2023-09-09 00:13:25 +00:00
  • 1052a92e5a [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 218dd7dcbd -s ours am: cd4f7108da -s ours am: 12772adb2f -s ours am: 2d3e44aebb -s ours Bill Yi 2023-09-09 00:13:12 +00:00
  • 4e3b574833 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: bea9c6fffa -s ours am: 3d3c8da953 -s ours am: d0bbda68e2 -s ours am: d635532a11 -s ours Bill Yi 2023-09-09 00:12:55 +00:00
  • d527d09c89 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 9d8a174cfb -s ours am: 74efc70012 -s ours am: 7ef30234c5 -s ours am: 47feed84d6 -s ours Bill Yi 2023-09-09 00:06:03 +00:00
  • 845ed89c27 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 218dd7dcbd -s ours am: 26761dda7f -s ours am: 4a3e643a4e -s ours am: 2e6e7c1c25 -s ours Bill Yi 2023-09-09 00:05:50 +00:00
  • ee1cb9f40f [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: bea9c6fffa -s ours am: a60c6f5165 -s ours am: d7897a49f4 -s ours am: d7d9e247d3 -s ours Bill Yi 2023-09-09 00:05:38 +00:00
  • 35561d6d73 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: fc870f9cfd -s ours am: 70a9891a63 -s ours am: 38efaf3bc4 -s ours Bill Yi 2023-09-09 00:00:16 +00:00
  • ac90d2dccc [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 1246d3046b -s ours am: 3144cb8a81 -s ours am: c697cc02ad -s ours Bill Yi 2023-09-09 00:00:02 +00:00
  • b8413ad963 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 3152898c4a -s ours am: a00e73b28f -s ours am: a96743f2f8 -s ours Bill Yi 2023-09-08 23:59:43 +00:00
  • 4d31705228 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 9d8a174cfb -s ours am: 74efc70012 -s ours am: 8dea913ea0 -s ours am: 4155a4facc -s ours Bill Yi 2023-09-08 23:55:05 +00:00
  • 20ab371d2a [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 218dd7dcbd -s ours am: 26761dda7f -s ours am: 511dfc1d41 -s ours am: 6515020dcc -s ours Bill Yi 2023-09-08 23:54:50 +00:00
  • 0166cb98fa [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: bea9c6fffa -s ours am: a60c6f5165 -s ours am: 832c2d522a -s ours am: b917484bfe -s ours Bill Yi 2023-09-08 23:54:34 +00:00
  • 8970ec9b53 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: fc870f9cfd -s ours am: c111649efb -s ours am: 7405405f9c -s ours Bill Yi 2023-09-08 23:50:20 +00:00
  • 8fde1c2394 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 1246d3046b -s ours am: 0f2887884e -s ours am: 0941557bc2 -s ours Bill Yi 2023-09-08 23:50:06 +00:00
  • 5fb1cef1d9 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 3152898c4a -s ours am: 6f0a9296a6 -s ours am: ef5b0e316a -s ours Bill Yi 2023-09-08 23:49:50 +00:00
  • 3915464217 Merge "Add missing divider to credman settings" into main Becca Hughes 2023-09-08 23:36:07 +00:00
  • 608b9a6b94 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-qpr-dev am: 2527e8855f -s ours am: cbcfd27eec -s ours Bill Yi 2023-09-08 23:30:07 +00:00
  • 756145b19c [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 35b82f2c87 -s ours am: c73ea3e3a6 -s ours Bill Yi 2023-09-08 23:30:04 +00:00
  • b3d685f851 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-qpr-dev am: 95ff1dbb5e -s ours am: 05d03ffa6a -s ours Bill Yi 2023-09-08 23:29:58 +00:00
  • caa56327a2 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 4023686444 -s ours am: ecee93546a -s ours Bill Yi 2023-09-08 23:29:54 +00:00
  • 2ecb751e5d [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-qpr-dev am: bc882dc6a6 -s ours am: 61d9f6cff0 -s ours Bill Yi 2023-09-08 23:29:44 +00:00
  • 1307175f80 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 2c4039be6d -s ours am: a8854cdaaf -s ours Bill Yi 2023-09-08 23:29:30 +00:00
  • b04e2d5bd8 Merge "Change feature flag to device config flag." into udc-qpr-dev am: 54f96175a2 am: 04960fa7c3 Holly Jiuyu Sun 2023-09-08 23:21:05 +00:00
  • 711a0ee76a Merge "Fix the style of Choose screen lock wasn’t consistent in initial setup and deferred setup" into udc-qpr-dev am: f6fdfb0ddc am: 99882cb3bb Jason Chang 2023-09-08 23:05:39 +00:00
  • 512daee3f8 [automerger skipped] Merge "Merge "Refine fold setting" into udc-qpr-dev am: 26e14e09bf" into udc-qpr-dev-plus-aosp am: c06568346c -s ours Shivangi Dubey 2023-09-08 23:04:25 +00:00
  • d91eb9eae6 [automerger skipped] Merge "Refine fold setting" into udc-qpr-dev am: 26e14e09bf am: 00a78fca41 -s ours Shivangi Dubey 2023-09-08 23:04:15 +00:00
  • de41256dd2 Merge "Remove version text in user aspect ratio settings page" into udc-qpr-dev am: f2735decd6 Massimo Carli 2023-09-08 22:53:54 +00:00
  • f2735decd6 Merge "Remove version text in user aspect ratio settings page" into udc-qpr-dev Massimo Carli 2023-09-08 21:52:03 +00:00
  • ae0e9ab922 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 9d8a174cfb -s ours am: 0e9f6de1c9 -s ours am: aff2aa2b9b -s ours Bill Yi 2023-09-08 19:35:32 +00:00
  • 2d3e44aebb [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 218dd7dcbd -s ours am: cd4f7108da -s ours am: 12772adb2f -s ours Bill Yi 2023-09-08 19:35:19 +00:00
  • d635532a11 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: bea9c6fffa -s ours am: 3d3c8da953 -s ours am: d0bbda68e2 -s ours Bill Yi 2023-09-08 19:35:00 +00:00
  • aff2aa2b9b [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 9d8a174cfb -s ours am: 0e9f6de1c9 -s ours Bill Yi 2023-09-08 19:03:03 +00:00
  • 12772adb2f [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 218dd7dcbd -s ours am: cd4f7108da -s ours Bill Yi 2023-09-08 19:02:47 +00:00
  • d0bbda68e2 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: bea9c6fffa -s ours am: 3d3c8da953 -s ours Bill Yi 2023-09-08 19:02:31 +00:00
  • 3f2ed1ac74 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 9d8a174cfb -s ours am: a28643fc5c -s ours Bill Yi 2023-09-08 19:02:10 +00:00
  • 9c7e8c019b [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 218dd7dcbd -s ours am: f61bb92a78 -s ours Bill Yi 2023-09-08 19:01:56 +00:00
  • a01eba9b69 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: bea9c6fffa -s ours am: 9eeb5da4c7 -s ours Bill Yi 2023-09-08 19:01:41 +00:00
  • 47feed84d6 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 9d8a174cfb -s ours am: 74efc70012 -s ours am: 7ef30234c5 -s ours Bill Yi 2023-09-08 18:55:54 +00:00
  • 2e6e7c1c25 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 218dd7dcbd -s ours am: 26761dda7f -s ours am: 4a3e643a4e -s ours Bill Yi 2023-09-08 18:55:41 +00:00
  • d7d9e247d3 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: bea9c6fffa -s ours am: a60c6f5165 -s ours am: d7897a49f4 -s ours Bill Yi 2023-09-08 18:55:27 +00:00
  • 38efaf3bc4 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: fc870f9cfd -s ours am: 70a9891a63 -s ours Bill Yi 2023-09-08 18:48:58 +00:00
  • c697cc02ad [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 1246d3046b -s ours am: 3144cb8a81 -s ours Bill Yi 2023-09-08 18:48:42 +00:00
  • a96743f2f8 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 3152898c4a -s ours am: a00e73b28f -s ours Bill Yi 2023-09-08 18:48:24 +00:00
  • a28643fc5c [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 9d8a174cfb -s ours Bill Yi 2023-09-08 18:30:29 +00:00