Commit Graph

  • f61bb92a78 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 218dd7dcbd -s ours Bill Yi 2023-09-08 18:30:16 +00:00
  • 9eeb5da4c7 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: bea9c6fffa -s ours Bill Yi 2023-09-08 18:29:59 +00:00
  • 4155a4facc [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 9d8a174cfb -s ours am: 74efc70012 -s ours am: 8dea913ea0 -s ours Bill Yi 2023-09-08 18:15:36 +00:00
  • 6515020dcc [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 218dd7dcbd -s ours am: 26761dda7f -s ours am: 511dfc1d41 -s ours Bill Yi 2023-09-08 18:15:21 +00:00
  • b917484bfe [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: bea9c6fffa -s ours am: a60c6f5165 -s ours am: 832c2d522a -s ours Bill Yi 2023-09-08 18:15:05 +00:00
  • 0e9f6de1c9 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 9d8a174cfb -s ours Bill Yi 2023-09-08 18:08:15 +00:00
  • cd4f7108da [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 218dd7dcbd -s ours Bill Yi 2023-09-08 18:07:59 +00:00
  • 3d3c8da953 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: bea9c6fffa -s ours Bill Yi 2023-09-08 18:07:45 +00:00
  • 7405405f9c [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: fc870f9cfd -s ours am: c111649efb -s ours Bill Yi 2023-09-08 18:07:34 +00:00
  • 0941557bc2 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 1246d3046b -s ours am: 0f2887884e -s ours Bill Yi 2023-09-08 18:07:19 +00:00
  • ef5b0e316a [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 3152898c4a -s ours am: 6f0a9296a6 -s ours Bill Yi 2023-09-08 18:07:02 +00:00
  • 8dea913ea0 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 9d8a174cfb -s ours am: 74efc70012 -s ours Bill Yi 2023-09-08 17:44:46 +00:00
  • 7ef30234c5 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 9d8a174cfb -s ours am: 74efc70012 -s ours Bill Yi 2023-09-08 17:44:37 +00:00
  • 511dfc1d41 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 218dd7dcbd -s ours am: 26761dda7f -s ours Bill Yi 2023-09-08 17:44:29 +00:00
  • 4a3e643a4e [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 218dd7dcbd -s ours am: 26761dda7f -s ours Bill Yi 2023-09-08 17:44:24 +00:00
  • 832c2d522a [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: bea9c6fffa -s ours am: a60c6f5165 -s ours Bill Yi 2023-09-08 17:44:24 +00:00
  • d7897a49f4 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: bea9c6fffa -s ours am: a60c6f5165 -s ours Bill Yi 2023-09-08 17:44:09 +00:00
  • c111649efb [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: fc870f9cfd -s ours Bill Yi 2023-09-08 17:38:11 +00:00
  • 70a9891a63 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: fc870f9cfd -s ours Bill Yi 2023-09-08 17:37:54 +00:00
  • 0f2887884e [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 1246d3046b -s ours Bill Yi 2023-09-08 17:37:54 +00:00
  • 6f0a9296a6 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 3152898c4a -s ours Bill Yi 2023-09-08 17:37:39 +00:00
  • 3144cb8a81 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 1246d3046b -s ours Bill Yi 2023-09-08 17:37:37 +00:00
  • a00e73b28f [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 3152898c4a -s ours Bill Yi 2023-09-08 17:37:20 +00:00
  • 74efc70012 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 9d8a174cfb -s ours Bill Yi 2023-09-08 17:24:53 +00:00
  • 26761dda7f [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 218dd7dcbd -s ours Bill Yi 2023-09-08 17:24:35 +00:00
  • a60c6f5165 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: bea9c6fffa -s ours Bill Yi 2023-09-08 17:24:19 +00:00
  • 4b993f5fb4 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 256fc161e2 -s ours Bill Yi 2023-09-08 17:23:07 +00:00
  • 9d8a174cfb Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev Bill Yi 2023-09-08 16:49:29 +00:00
  • fc870f9cfd Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev Bill Yi 2023-09-08 16:41:46 +00:00
  • cbcfd27eec [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-qpr-dev am: 2527e8855f -s ours Bill Yi 2023-09-08 16:34:49 +00:00
  • c73ea3e3a6 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 35b82f2c87 -s ours Bill Yi 2023-09-08 16:34:45 +00:00
  • 05d03ffa6a [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-qpr-dev am: 95ff1dbb5e -s ours Bill Yi 2023-09-08 16:34:42 +00:00
  • ecee93546a [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 4023686444 -s ours Bill Yi 2023-09-08 16:34:38 +00:00
  • 61d9f6cff0 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-qpr-dev am: bc882dc6a6 -s ours Bill Yi 2023-09-08 16:34:29 +00:00
  • a8854cdaaf [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 2c4039be6d -s ours Bill Yi 2023-09-08 16:34:07 +00:00
  • 04960fa7c3 Merge "Change feature flag to device config flag." into udc-qpr-dev am: 54f96175a2 Holly Jiuyu Sun 2023-09-08 16:22:18 +00:00
  • 99882cb3bb Merge "Fix the style of Choose screen lock wasn’t consistent in initial setup and deferred setup" into udc-qpr-dev am: f6fdfb0ddc Jason Chang 2023-09-08 15:43:18 +00:00
  • c06568346c Merge "Merge "Refine fold setting" into udc-qpr-dev am: 26e14e09bf" into udc-qpr-dev-plus-aosp Shivangi Dubey 2023-09-08 15:13:50 +00:00
  • a93fd54d09 Save foreground_service and cached consumed power in battery usage slot datebase. Zaiyue Xue 2023-09-08 20:02:37 +08:00
  • bb1fe04afb Fix test failure of AvailableMediaDeviceGroupControllerTest Angela Wang 2023-09-08 11:35:03 +00:00
  • ce24ad65fe Merge "Fix some SettingsUITests" into main Chaohui Wang 2023-09-08 11:46:23 +00:00
  • 94b6aa45f7 Merge "Revert "Disable multiuser toggle when more than 1 user is created"" into main Tetiana Meronyk 2023-09-08 11:35:30 +00:00
  • e5ef38be3f Merge "Remove version text in user aspect ratio settings page" into main Massimo Carli 2023-09-08 08:43:14 +00:00
  • 98ade3ae18 Merge "Clean up WifiDataUsageSummaryPreferenceController" into main Chaohui Wang 2023-09-08 08:03:18 +00:00
  • 1caab182a7 Fix some SettingsUITests Chaohui Wang 2023-09-08 15:20:44 +08:00
  • 81d99646e9 Set use_resource_processor for Settings tests Chaohui Wang 2023-09-08 12:13:35 +08:00
  • fde9937b04 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into aosp-main-future am: 458e8cc311 -s ours am: 269d31645e -s ours am: 120f89d40f -s ours am: e5042752a5 -s ours Bill Yi 2023-09-08 01:28:29 +00:00
  • 6ecf38f8c9 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 0071351cfc -s ours am: ebfc5128ae -s ours am: c0e12c874e -s ours am: 98239c5485 -s ours Bill Yi 2023-09-08 01:28:22 +00:00
  • dc2ace80f8 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into aosp-main-future am: 3d0a8354b3 -s ours am: a4a56a7fb3 -s ours am: 610c2167bc -s ours am: a4b436ae78 -s ours Bill Yi 2023-09-08 01:28:13 +00:00
  • c936f4afd8 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 219f3c68fa -s ours am: c751e145d2 -s ours am: 18f139a3b8 -s ours am: 570569b43a -s ours Bill Yi 2023-09-08 01:28:03 +00:00
  • 1979b4ea1c [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 0aee5a3e64 -s ours am: 8128682775 -s ours am: 97f0fa1142 -s ours am: 14d89bfce8 -s ours Bill Yi 2023-09-08 01:27:53 +00:00
  • 9bd10befc9 [automerger skipped] Fix kotlin nullable errors in Settings am: 8f7a1e6f53 -s ours am: c2c4d0855b -s ours Colin Cross 2023-09-08 01:26:10 +00:00
  • e5042752a5 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into aosp-main-future am: 458e8cc311 -s ours am: 269d31645e -s ours am: 120f89d40f -s ours Bill Yi 2023-09-08 01:13:48 +00:00
  • 98239c5485 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 0071351cfc -s ours am: ebfc5128ae -s ours am: c0e12c874e -s ours Bill Yi 2023-09-08 01:13:40 +00:00
  • a4b436ae78 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into aosp-main-future am: 3d0a8354b3 -s ours am: a4a56a7fb3 -s ours am: 610c2167bc -s ours Bill Yi 2023-09-08 01:13:28 +00:00
  • 570569b43a [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 219f3c68fa -s ours am: c751e145d2 -s ours am: 18f139a3b8 -s ours Bill Yi 2023-09-08 01:13:15 +00:00
  • 14d89bfce8 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 0aee5a3e64 -s ours am: 8128682775 -s ours am: 97f0fa1142 -s ours Bill Yi 2023-09-08 01:13:12 +00:00
  • c2c4d0855b [automerger skipped] Fix kotlin nullable errors in Settings am: 8f7a1e6f53 -s ours Colin Cross 2023-09-08 01:11:39 +00:00
  • f9607c2b43 Merge "The new About > Account behavior" into main Treehugger Robot 2023-09-08 00:42:33 +00:00
  • 120f89d40f [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into aosp-main-future am: 458e8cc311 -s ours am: 269d31645e -s ours Bill Yi 2023-09-08 00:36:35 +00:00
  • c0e12c874e [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 0071351cfc -s ours am: ebfc5128ae -s ours Bill Yi 2023-09-08 00:36:27 +00:00
  • 610c2167bc [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into aosp-main-future am: 3d0a8354b3 -s ours am: a4a56a7fb3 -s ours Bill Yi 2023-09-08 00:36:15 +00:00
  • 18f139a3b8 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 219f3c68fa -s ours am: c751e145d2 -s ours Bill Yi 2023-09-08 00:36:02 +00:00
  • 97f0fa1142 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 0aee5a3e64 -s ours am: 8128682775 -s ours Bill Yi 2023-09-08 00:35:59 +00:00
  • 269d31645e [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into aosp-main-future am: 458e8cc311 -s ours Bill Yi 2023-09-07 23:52:52 +00:00
  • ebfc5128ae [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 0071351cfc -s ours Bill Yi 2023-09-07 23:52:39 +00:00
  • a4a56a7fb3 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into aosp-main-future am: 3d0a8354b3 -s ours Bill Yi 2023-09-07 23:52:32 +00:00
  • c751e145d2 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 219f3c68fa -s ours Bill Yi 2023-09-07 23:52:21 +00:00
  • 8128682775 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 0aee5a3e64 -s ours Bill Yi 2023-09-07 23:52:07 +00:00
  • 458e8cc311 Merge "Import translations. DO NOT MERGE ANYWHERE" into aosp-main-future Bill Yi 2023-09-07 23:43:06 +00:00
  • 3d0a8354b3 Merge "Import translations. DO NOT MERGE ANYWHERE" into aosp-main-future Bill Yi 2023-09-07 23:43:06 +00:00
  • a0c04b3198 Snap for 10776546 from 54f96175a2 to udc-qpr1-release Android Build Coastguard Worker 2023-09-07 23:20:21 +00:00
  • 2527e8855f Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-qpr-dev Bill Yi 2023-09-07 22:56:10 +00:00
  • 95ff1dbb5e Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-qpr-dev Bill Yi 2023-09-07 22:56:10 +00:00
  • bc882dc6a6 Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-qpr-dev Bill Yi 2023-09-07 22:56:10 +00:00
  • 54f96175a2 Merge "Change feature flag to device config flag." into udc-qpr-dev Holly Jiuyu Sun 2023-09-07 18:47:54 +00:00
  • 27c3987860 Add Private Space settings page Manish Singh 2023-07-31 14:41:00 +01:00
  • 8f7a1e6f53 Fix kotlin nullable errors in Settings Colin Cross 2023-08-14 12:29:02 -07:00
  • 8489ae99dc Revert "Disable multiuser toggle when more than 1 user is created" Tetiana Meronyk 2023-09-07 15:50:09 +00:00
  • 0aee5a3e64 Import translations. DO NOT MERGE ANYWHERE Bill Yi 2023-09-07 04:18:01 -07:00
  • 0071351cfc Import translations. DO NOT MERGE ANYWHERE Bill Yi 2023-09-07 04:15:45 -07:00
  • 219f3c68fa Import translations. DO NOT MERGE ANYWHERE Bill Yi 2023-09-07 04:13:48 -07:00
  • f6fdfb0ddc Merge "Fix the style of Choose screen lock wasn’t consistent in initial setup and deferred setup" into udc-qpr-dev Jason Chang 2023-09-07 06:20:21 +00:00
  • 4023686444 Import translations. DO NOT MERGE ANYWHERE Bill Yi 2023-09-06 20:58:06 -07:00
  • 3152898c4a Import translations. DO NOT MERGE ANYWHERE Bill Yi 2023-09-06 20:57:19 -07:00
  • bea9c6fffa Import translations. DO NOT MERGE ANYWHERE Bill Yi 2023-09-06 20:56:31 -07:00
  • 2c4039be6d Import translations. DO NOT MERGE ANYWHERE Bill Yi 2023-09-06 20:53:50 -07:00
  • 1246d3046b Import translations. DO NOT MERGE ANYWHERE Bill Yi 2023-09-06 20:52:13 -07:00
  • 218dd7dcbd Import translations. DO NOT MERGE ANYWHERE Bill Yi 2023-09-06 20:50:39 -07:00
  • 35b82f2c87 Import translations. DO NOT MERGE ANYWHERE Bill Yi 2023-09-06 20:49:17 -07:00
  • 256fc161e2 Import translations. DO NOT MERGE ANYWHERE Bill Yi 2023-09-06 20:46:31 -07:00
  • b44fb93aa8 The new About > Account behavior Sunny Shao 2023-09-05 10:10:09 +08:00
  • 69107bc4dd Snap for 10770143 from 26e14e09bf to udc-qpr1-release Android Build Coastguard Worker 2023-09-06 23:20:10 +00:00
  • d7c780aac7 Add missing divider to credman settings Becca Hughes 2023-09-01 07:47:03 -07:00
  • 00a78fca41 Merge "Refine fold setting" into udc-qpr-dev am: 26e14e09bf Shivangi Dubey 2023-09-06 15:06:39 +00:00
  • 26e14e09bf Merge "Refine fold setting" into udc-qpr-dev Shivangi Dubey 2023-09-06 14:28:54 +00:00
  • c192039fe5 Merge "Refactor battery usage page contollers interaction logic" into main Zaiyue Xue 2023-09-06 11:46:09 +00:00
  • 7435bbc70a Refine fold setting dshivangi 2023-08-03 19:49:54 +00:00
  • 25825c8329 Merge "Refine fold setting" into main Shivangi Dubey 2023-09-06 10:47:31 +00:00
  • f5ea50e20e Refactor battery usage page contollers interaction logic Zaiyue Xue 2023-08-28 16:30:21 +08:00