Commit Graph

  • ca3a45ebd3 Merge "Fix that symbol at top left corner mismatch with remaining options in vision settings." into tm-dev PETER LIANG 2022-03-04 01:21:58 +00:00
  • 27ad4dcf23 Merge "Add ScreenResolutionController to Settings app" into tm-dev Amy Hsu 2022-03-04 01:08:00 +00:00
  • 5ccb07df85 Merge "[SafetyCenter] Update Settings to align with renamed SafetyCenterManager APIs" into tm-dev TreeHugger Robot 2022-03-04 00:57:08 +00:00
  • 413157cfe5 [automerger skipped] Merge "Fix Guest string was not translated in UMS.userWithName()" into tm-dev am: 9f54f436d1 am: caf7556e20 -s ours Yasin Kilicdere 2022-03-04 00:50:13 +00:00
  • caf7556e20 Merge "Fix Guest string was not translated in UMS.userWithName()" into tm-dev am: 9f54f436d1 Yasin Kilicdere 2022-03-04 00:29:07 +00:00
  • d2eee96914 [automerger skipped] Merge "Fix Guest string was not translated in UMS.userWithName()" into tm-dev am: 9f54f436d1 -s ours Yasin Kilicdere 2022-03-04 00:27:33 +00:00
  • f2f8e9add1 [automerger skipped] Fix Guest string was not translated in UMS.userWithName() am: 3fc4642ab4 -s ours Yasin Kilicdere 2022-03-04 00:27:26 +00:00
  • 700feb9f29 Snap for 8249440 from 8f3d7d5a77 to sc-qpr3-release Android Build Coastguard Worker 2022-03-04 00:08:51 +00:00
  • 9f54f436d1 Merge "Fix Guest string was not translated in UMS.userWithName()" into tm-dev Yasin Kilicdere 2022-03-04 00:03:00 +00:00
  • e39120e45c [automerge] Use android.app.AlertDialog in SetupChooseLockGeneric 2p: cd517a654a Presubmit Automerger Backend 2022-03-03 23:37:07 +00:00
  • cd517a654a Use android.app.AlertDialog in SetupChooseLockGeneric Edgar Wang 2022-03-02 12:55:34 +00:00
  • e68f06db33 Merge "Home Controls: Update subtitle for setting." into tm-dev am: b5fe96719c am: b4f80d69f3 Aaron Liu 2022-03-03 22:38:49 +00:00
  • 1e21260f5f Merge "Polish humanize strings for one-handed mode page" into tm-dev am: c5e6cfdc17 am: 3ac2e14863 Menghan Li 2022-03-03 22:37:01 +00:00
  • b4f80d69f3 Merge "Home Controls: Update subtitle for setting." into tm-dev am: b5fe96719c Aaron Liu 2022-03-03 22:25:51 +00:00
  • fa02a9c117 Merge "Home Controls: Update subtitle for setting." into tm-dev am: b5fe96719c Aaron Liu 2022-03-03 22:25:48 +00:00
  • b5fe96719c Merge "Home Controls: Update subtitle for setting." into tm-dev Aaron Liu 2022-03-03 22:20:54 +00:00
  • bdacad3a52 Merge "Polish humanize strings for one-handed mode page" into tm-dev am: c5e6cfdc17 Menghan Li 2022-03-03 22:16:41 +00:00
  • 3ac2e14863 Merge "Polish humanize strings for one-handed mode page" into tm-dev am: c5e6cfdc17 Menghan Li 2022-03-03 22:14:52 +00:00
  • c5e6cfdc17 Merge "Polish humanize strings for one-handed mode page" into tm-dev Menghan Li 2022-03-03 21:25:02 +00:00
  • 78cedba480 Merge "[SafetyCenter] Update Settings to align with renamed SafetyCenterManager APIs" into tm-mainline-prod am: bc84aad406 Karishma Vakil 2022-03-03 20:31:00 +00:00
  • bc84aad406 Merge "[SafetyCenter] Update Settings to align with renamed SafetyCenterManager APIs" into tm-mainline-prod Karishma Vakil 2022-03-03 20:09:15 +00:00
  • ea34e9ab42 Home Controls: Update subtitle for setting. Aaron Liu 2022-02-23 19:05:53 +00:00
  • 01d93a9b19 Merge "Home Controls: Update subtitle for setting." Aaron Liu 2022-03-03 19:56:41 +00:00
  • 3fc4642ab4 Fix Guest string was not translated in UMS.userWithName() Yasin Kilicdere 2022-02-10 23:11:31 +00:00
  • 2c01ba574b Merge "Apply restricted settings to notification access." Ricky Wai 2022-03-03 17:47:02 +00:00
  • d0b77425a3 Home Controls: Update subtitle for setting. Aaron Liu 2022-02-23 19:05:53 +00:00
  • 0b948c827b [MEP] psim's logical slot index is 0 SongFerngWang 2022-03-03 14:00:12 +08:00
  • da07d7fce4 Merge "[MEP] psim's logical slot index is 0" SongFerng Wang 2022-03-03 17:13:34 +00:00
  • 8ff5207e55 Merge "Ignore test case of SetupSkipDialogTest" into tm-dev am: 02589e8b66 am: 3dc1a0a3b7 TreeHugger Robot 2022-03-03 17:01:26 +00:00
  • a59b484e77 Merge "Ignore test case of SetupSkipDialogTest" into tm-dev am: 02589e8b66 TreeHugger Robot 2022-03-03 16:41:19 +00:00
  • 3dc1a0a3b7 Merge "Ignore test case of SetupSkipDialogTest" into tm-dev am: 02589e8b66 TreeHugger Robot 2022-03-03 16:40:03 +00:00
  • a65aba376c Merge "Polish and humanize the summaries for "Remove animations" and "Large mouse pointer"." into tm-dev am: eb0a69cfcc am: 5f0fe18050 PETER LIANG 2022-03-03 16:20:56 +00:00
  • 02589e8b66 Merge "Ignore test case of SetupSkipDialogTest" into tm-dev TreeHugger Robot 2022-03-03 16:17:25 +00:00
  • 5d210e13b6 Merge "Polish and humanize the summaries for "Remove animations" and "Large mouse pointer"." into tm-dev am: eb0a69cfcc PETER LIANG 2022-03-03 15:47:50 +00:00
  • 5f0fe18050 Merge "Polish and humanize the summaries for "Remove animations" and "Large mouse pointer"." into tm-dev am: eb0a69cfcc PETER LIANG 2022-03-03 15:46:35 +00:00
  • cd2b14d0b1 Merge "Remove font size & screen size setup flow instance" into tm-dev am: d3ec64104d am: 357a64ddb2 Menghan Li 2022-03-03 15:36:42 +00:00
  • 2123cf1491 Merge "Show different tooltips for QS features auto-added and non-auto-added" into tm-dev am: 4c167c01c7 am: 5da531f442 Menghan Li 2022-03-03 15:36:34 +00:00
  • b67deb7391 Merge "Apply Glif theme before using dynamic color." into tm-dev am: 57ced74d51 am: 2519cdea5c Menghan Li 2022-03-03 15:36:25 +00:00
  • eb0a69cfcc Merge "Polish and humanize the summaries for "Remove animations" and "Large mouse pointer"." into tm-dev PETER LIANG 2022-03-03 15:25:44 +00:00
  • 357a64ddb2 Merge "Remove font size & screen size setup flow instance" into tm-dev am: d3ec64104d Menghan Li 2022-03-03 15:12:16 +00:00
  • 5658c482a2 Merge "Remove font size & screen size setup flow instance" into tm-dev am: d3ec64104d Menghan Li 2022-03-03 15:12:06 +00:00
  • 5da531f442 Merge "Show different tooltips for QS features auto-added and non-auto-added" into tm-dev am: 4c167c01c7 Menghan Li 2022-03-03 15:11:53 +00:00
  • 2519cdea5c Merge "Apply Glif theme before using dynamic color." into tm-dev am: 57ced74d51 Menghan Li 2022-03-03 15:11:45 +00:00
  • d2287c0bfe Merge "Show different tooltips for QS features auto-added and non-auto-added" into tm-dev am: 4c167c01c7 Menghan Li 2022-03-03 15:11:41 +00:00
  • 57a77e263f Merge "Apply Glif theme before using dynamic color." into tm-dev am: 57ced74d51 Menghan Li 2022-03-03 15:11:32 +00:00
  • 4a75dc192c Change default USB configuration to a RestrictedPreference Alex Johnston 2022-03-03 14:30:44 +00:00
  • d3ec64104d Merge "Remove font size & screen size setup flow instance" into tm-dev Menghan Li 2022-03-03 14:40:17 +00:00
  • 4c167c01c7 Merge "Show different tooltips for QS features auto-added and non-auto-added" into tm-dev Menghan Li 2022-03-03 14:39:55 +00:00
  • 57ced74d51 Merge "Apply Glif theme before using dynamic color." into tm-dev Menghan Li 2022-03-03 14:39:34 +00:00
  • 0dba77bc2f Ignore test case of SetupSkipDialogTest Edgar Wang 2022-03-03 21:53:02 +08:00
  • 08ad4181c8 Merge "[MEP] The condition of "null point check" is wrong" into tm-dev am: cdb08ee92a am: aecc64d135 SongFerng Wang 2022-03-03 13:18:27 +00:00
  • d418c26d33 Merge "Fix the settings crash when SimDialogActivity is null" into tm-dev am: 9ca62b2290 am: 13ed847fb4 SongFerng Wang 2022-03-03 13:18:21 +00:00
  • 8950a90024 Prevent exfiltration of system files via user image settings. Oli Lan 2022-02-25 15:22:27 +00:00
  • 86b9411c40 Merge "[MEP] The subscriptionInfo's getSimSlotIndex is logical slotId" into tm-dev am: 822d099412 am: 110236db44 SongFerng Wang 2022-03-03 13:16:58 +00:00
  • b162438b5d [MEP] psim's logical slot index is 0 SongFerngWang 2022-03-03 14:00:12 +08:00
  • aecc64d135 Merge "[MEP] The condition of "null point check" is wrong" into tm-dev am: cdb08ee92a SongFerng Wang 2022-03-03 12:54:47 +00:00
  • 2ea4a2ced2 Merge "[MEP] The condition of "null point check" is wrong" into tm-dev am: cdb08ee92a SongFerng Wang 2022-03-03 12:54:40 +00:00
  • 13ed847fb4 Merge "Fix the settings crash when SimDialogActivity is null" into tm-dev am: 9ca62b2290 SongFerng Wang 2022-03-03 12:54:40 +00:00
  • c4d72fbb00 Merge "Fix the settings crash when SimDialogActivity is null" into tm-dev am: 9ca62b2290 SongFerng Wang 2022-03-03 12:54:32 +00:00
  • 110236db44 Merge "[MEP] The subscriptionInfo's getSimSlotIndex is logical slotId" into tm-dev am: 822d099412 SongFerng Wang 2022-03-03 12:54:27 +00:00
  • 41838c76ec Merge "[MEP] The subscriptionInfo's getSimSlotIndex is logical slotId" into tm-dev am: 822d099412 SongFerng Wang 2022-03-03 12:54:22 +00:00
  • 95c0e790ef Merge "Use android.app.AlertDialog in SetupChooseLockGeneric" into tm-dev am: f0a675f07d am: 3dc5c139cc Edgar Wang 2022-03-03 12:43:56 +00:00
  • cdb08ee92a Merge "[MEP] The condition of "null point check" is wrong" into tm-dev SongFerng Wang 2022-03-03 12:36:59 +00:00
  • 9ca62b2290 Merge "Fix the settings crash when SimDialogActivity is null" into tm-dev SongFerng Wang 2022-03-03 12:36:43 +00:00
  • 822d099412 Merge "[MEP] The subscriptionInfo's getSimSlotIndex is logical slotId" into tm-dev SongFerng Wang 2022-03-03 12:36:20 +00:00
  • b8c9fa79dd Merge "Use android.app.AlertDialog in SetupChooseLockGeneric" into tm-dev am: f0a675f07d Edgar Wang 2022-03-03 12:20:55 +00:00
  • 3dc5c139cc Merge "Use android.app.AlertDialog in SetupChooseLockGeneric" into tm-dev am: f0a675f07d Edgar Wang 2022-03-03 12:19:41 +00:00
  • 2abc341ea9 [automerger skipped] Merge "[Panlingual] Improve UI can not show on at first." into tm-dev am: f966c34a41 am: 0249c0aff4 -s ours Tom Hsu 2022-03-03 12:11:15 +00:00
  • 827d66d74c [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 2ba7f57217 -s ours am: 40e23845e3 -s ours am: 8f3d7d5a77 -s ours am: 702e26be61 -s ours am: 18a9ad3101 -s ours am: 44b4adcb04 -s ours Bill Yi 2022-03-03 12:09:40 +00:00
  • f0a675f07d Merge "Use android.app.AlertDialog in SetupChooseLockGeneric" into tm-dev Edgar Wang 2022-03-03 11:56:54 +00:00
  • 532ddbe4e1 [automerger skipped] Merge "[Panlingual] Improve UI can not show on at first." into tm-dev am: f966c34a41 -s ours Tom Hsu 2022-03-03 11:49:20 +00:00
  • 3bae17e403 [automerger skipped] [Panlingual] Improve UI can not show on at first. am: ea9e627c1c -s ours tom hsu 2022-03-03 11:49:19 +00:00
  • 6bc8179be4 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 2ba7f57217 -s ours am: 40e23845e3 -s ours am: 8f3d7d5a77 -s ours am: 702e26be61 -s ours am: 18a9ad3101 -s ours Bill Yi 2022-03-03 11:48:05 +00:00
  • 0249c0aff4 Merge "[Panlingual] Improve UI can not show on at first." into tm-dev am: f966c34a41 Tom Hsu 2022-03-03 11:47:24 +00:00
  • 44b4adcb04 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 2ba7f57217 -s ours am: 40e23845e3 -s ours am: 8f3d7d5a77 -s ours am: 702e26be61 -s ours am: 18a9ad3101 -s ours Bill Yi 2022-03-03 11:46:43 +00:00
  • f966c34a41 Merge "[Panlingual] Improve UI can not show on at first." into tm-dev Tom Hsu 2022-03-03 11:36:08 +00:00
  • 18a9ad3101 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 2ba7f57217 -s ours am: 40e23845e3 -s ours am: 8f3d7d5a77 -s ours am: 702e26be61 -s ours Bill Yi 2022-03-03 11:27:15 +00:00
  • a137158f2c Apply restricted settings to notification access. Ricky Wai 2022-02-09 15:32:57 +00:00
  • 702e26be61 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 2ba7f57217 -s ours am: 40e23845e3 -s ours am: 8f3d7d5a77 -s ours Bill Yi 2022-03-03 10:51:36 +00:00
  • 8f3d7d5a77 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 2ba7f57217 -s ours am: 40e23845e3 -s ours Bill Yi 2022-03-03 10:31:28 +00:00
  • 613a20b60b Merge changes from topic "presubmit-am-1f038a1ece89425e91664d179fc43556" into sc-mainline-prod am: 57ff9d215e am: 5a5bfcf48d am: 2ac592070e TreeHugger Robot 2022-03-03 10:21:55 +00:00
  • 4737c96916 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: a9e8ee6e40 -s ours am: d6e99b7741 -s ours am: a6545359b1 -s ours am: baecf5a51e -s ours am: 73f7e22809 -s ours Bill Yi 2022-03-03 10:21:49 +00:00
  • 8c84908a44 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ad345144ed -s ours am: a93e2d89ec -s ours am: 01f5ecdb4d -s ours am: d529bb6864 -s ours Bill Yi 2022-03-03 10:21:39 +00:00
  • 10960dc3ff Merge changes from topic "presubmit-am-1f038a1ece89425e91664d179fc43556" into tm-dev am: 8f84e7a9e7 am: aa7bb23dd7 TreeHugger Robot 2022-03-03 10:21:32 +00:00
  • 294fc6d0be [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 2ba7f57217 2p: 651ff7ece6 am: 0bfea8be54 -s ours am: 7e5988a9b3 -s ours Bill Yi 2022-03-03 10:21:31 +00:00
  • 7497fe7e00 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 76d6cbc7b0 -s ours am: 1cda28b22c -s ours TreeHugger Robot 2022-03-03 10:21:10 +00:00
  • 2946142cdf [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 48fce57d2c -s ours am: 71ea2a5db3 -s ours Bill Yi 2022-03-03 10:21:09 +00:00
  • 61f9634f6b [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 088bb2a3bc -s ours am: 7202ce3d9e -s ours TreeHugger Robot 2022-03-03 10:20:10 +00:00
  • 2f1613b0f9 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 0a5c4fc117 -s ours am: 722677a2c7 -s ours Bill Yi 2022-03-03 10:19:53 +00:00
  • 2ac592070e Merge changes from topic "presubmit-am-1f038a1ece89425e91664d179fc43556" into sc-mainline-prod am: 57ff9d215e am: 5a5bfcf48d TreeHugger Robot 2022-03-03 10:18:56 +00:00
  • 77a42482c0 Merge changes from topic "presubmit-am-1f038a1ece89425e91664d179fc43556" into sc-mainline-prod am: 57ff9d215e am: 5a5bfcf48d TreeHugger Robot 2022-03-03 10:18:37 +00:00
  • 5a5bfcf48d Merge changes from topic "presubmit-am-1f038a1ece89425e91664d179fc43556" into sc-mainline-prod am: 57ff9d215e TreeHugger Robot 2022-03-03 10:08:36 +00:00
  • 40e23845e3 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 2ba7f57217 -s ours Bill Yi 2022-03-03 10:08:18 +00:00
  • 2c86c667ec [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: a9e8ee6e40 -s ours am: d6e99b7741 -s ours am: a6545359b1 -s ours am: baecf5a51e -s ours Bill Yi 2022-03-03 10:00:06 +00:00
  • 4be4b68367 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ad345144ed -s ours am: a93e2d89ec -s ours am: 01f5ecdb4d -s ours Bill Yi 2022-03-03 09:59:39 +00:00
  • 73f7e22809 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: a9e8ee6e40 -s ours am: d6e99b7741 -s ours am: a6545359b1 -s ours am: baecf5a51e -s ours Bill Yi 2022-03-03 09:59:36 +00:00
  • 99ff1245f4 Merge changes from topic "presubmit-am-1f038a1ece89425e91664d179fc43556" into tm-dev am: 8f84e7a9e7 TreeHugger Robot 2022-03-03 09:59:03 +00:00
  • a0fe77c01f [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 2ba7f57217 2p: 651ff7ece6 am: 0bfea8be54 -s ours Bill Yi 2022-03-03 09:59:02 +00:00
  • d529bb6864 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ad345144ed -s ours am: a93e2d89ec -s ours am: 01f5ecdb4d -s ours Bill Yi 2022-03-03 09:58:57 +00:00
  • aa7bb23dd7 Merge changes from topic "presubmit-am-1f038a1ece89425e91664d179fc43556" into tm-dev am: 8f84e7a9e7 TreeHugger Robot 2022-03-03 09:58:19 +00:00