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

Commit Graph

  • 275f38c554 [automerger skipped] [Settings] Move display of VPN version into summary text am: dddd74a491 -s ours am: eefa7371ed -s ours am: fcdc4a4de3 -s ours am: 065876ee1b -s ours Bonian Chen 2022-04-07 00:47:33 +00:00
  • 0382c98491 [automerger skipped] Merge "[Settings] Move display of VPN version into summary text" into rvc-qpr-dev am: 6279d80f93 -s ours am: d15869f014 -s ours am: dad1ee3deb -s ours Bonian Chen 2022-04-07 00:47:18 +00:00
  • 663715de66 [automerger skipped] [Settings] Move display of VPN version into summary text am: 5fc0e6614d -s ours am: 96fe347312 -s ours am: b3be027c39 -s ours Bonian Chen 2022-04-07 00:47:17 +00:00
  • fdc7764eff [automerger skipped] Merge "[Settings] Move display of VPN version into summary text" into sc-dev am: 0f10561082 am: 1893045740 -s ours Bonian Chen 2022-04-07 00:47:10 +00:00
  • 10dcc4bf9c [automerger skipped] Merge "[Settings] Move display of VPN version into summary text" into rvc-dev am: d0d67e68a5 -s ours am: e8097d4464 -s ours am: 35c5b0b0a2 -s ours am: c058392a70 -s ours am: 06b9bf362e -s ours Bonian Chen 2022-04-07 00:46:01 +00:00
  • 0293401f09 [automerger skipped] [Settings] Move display of VPN version into summary text am: dddd74a491 -s ours am: eefa7371ed -s ours am: fcdc4a4de3 -s ours am: b17f587257 -s ours am: f52fc37869 -s ours Bonian Chen 2022-04-07 00:45:59 +00:00
  • da5f4be369 [automerger skipped] Merge "[Settings] Move display of VPN version into summary text" into rvc-qpr-dev am: 6279d80f93 -s ours am: d15869f014 -s ours am: eedfefab4b -s ours am: b82af15ea9 -s ours Bonian Chen 2022-04-07 00:45:50 +00:00
  • 6e2a866bef [automerger skipped] [Settings] Move display of VPN version into summary text am: 5fc0e6614d -s ours am: 96fe347312 -s ours am: 83e4693075 -s ours am: 8f9ade3eaf -s ours Bonian Chen 2022-04-07 00:45:48 +00:00
  • c9f5c30e04 [automerger skipped] Merge "[Settings] Move display of VPN version into summary text" into sc-dev am: 0f10561082 -s ours am: 771b606116 -s ours am: 7c93a31c72 -s ours Bonian Chen 2022-04-07 00:45:40 +00:00
  • 961d4b26b7 [automerger skipped] Merge "[Settings] Move display of VPN version into summary text" into qt-dev am: d0888970a4 am: d35d3e2446 -s ours Bonian Chen 2022-04-07 00:45:39 +00:00
  • c613394e88 [automerger skipped] [Settings] Move display of VPN version into summary text am: 5935cae639 -s ours am: 351e22f8e2 -s ours am: 79238cbd50 -s ours Bonian Chen 2022-04-07 00:45:38 +00:00
  • ee79190be9 [automerger skipped] Merge "[Settings] Move display of VPN version into summary text" into sc-qpr1-dev am: a84027d685 -s ours am: db51e0c04b -s ours Bonian Chen 2022-04-07 00:45:30 +00:00
  • 5305cceda7 [automerger skipped] [Settings] Move display of VPN version into summary text am: 96f581310f -s ours am: 3c651042ba -s ours Bonian Chen 2022-04-07 00:45:28 +00:00
  • 06b9bf362e [automerger skipped] Merge "[Settings] Move display of VPN version into summary text" into rvc-dev am: d0d67e68a5 -s ours am: e8097d4464 -s ours am: 35c5b0b0a2 -s ours am: c058392a70 -s ours Bonian Chen 2022-04-07 00:24:40 +00:00
  • f52fc37869 [automerger skipped] [Settings] Move display of VPN version into summary text am: dddd74a491 -s ours am: eefa7371ed -s ours am: fcdc4a4de3 -s ours am: b17f587257 -s ours Bonian Chen 2022-04-07 00:24:39 +00:00
  • b82af15ea9 [automerger skipped] Merge "[Settings] Move display of VPN version into summary text" into rvc-qpr-dev am: 6279d80f93 -s ours am: d15869f014 -s ours am: eedfefab4b -s ours Bonian Chen 2022-04-07 00:24:31 +00:00
  • 8f9ade3eaf [automerger skipped] [Settings] Move display of VPN version into summary text am: 5fc0e6614d -s ours am: 96fe347312 -s ours am: 83e4693075 -s ours Bonian Chen 2022-04-07 00:24:30 +00:00
  • 7c93a31c72 [automerger skipped] Merge "[Settings] Move display of VPN version into summary text" into sc-dev am: 0f10561082 -s ours am: 771b606116 -s ours Bonian Chen 2022-04-07 00:24:22 +00:00
  • 79238cbd50 [automerger skipped] [Settings] Move display of VPN version into summary text am: 5935cae639 -s ours am: 351e22f8e2 -s ours Bonian Chen 2022-04-07 00:24:21 +00:00
  • db51e0c04b [automerger skipped] Merge "[Settings] Move display of VPN version into summary text" into sc-qpr1-dev am: a84027d685 -s ours Bonian Chen 2022-04-07 00:24:13 +00:00
  • 3c651042ba [automerger skipped] [Settings] Move display of VPN version into summary text am: 96f581310f -s ours Bonian Chen 2022-04-07 00:24:13 +00:00
  • c058392a70 [automerger skipped] Merge "[Settings] Move display of VPN version into summary text" into rvc-dev am: d0d67e68a5 -s ours am: e8097d4464 -s ours am: 35c5b0b0a2 -s ours Bonian Chen 2022-04-07 00:24:12 +00:00
  • b17f587257 [automerger skipped] [Settings] Move display of VPN version into summary text am: dddd74a491 -s ours am: eefa7371ed -s ours am: fcdc4a4de3 -s ours Bonian Chen 2022-04-07 00:24:11 +00:00
  • eedfefab4b [automerger skipped] Merge "[Settings] Move display of VPN version into summary text" into rvc-qpr-dev am: 6279d80f93 -s ours am: d15869f014 -s ours Bonian Chen 2022-04-07 00:24:04 +00:00
  • 83e4693075 [automerger skipped] [Settings] Move display of VPN version into summary text am: 5fc0e6614d -s ours am: 96fe347312 -s ours Bonian Chen 2022-04-07 00:24:03 +00:00
  • 771b606116 [automerger skipped] Merge "[Settings] Move display of VPN version into summary text" into sc-dev am: 0f10561082 -s ours Bonian Chen 2022-04-07 00:23:56 +00:00
  • 351e22f8e2 [automerger skipped] [Settings] Move display of VPN version into summary text am: 5935cae639 -s ours Bonian Chen 2022-04-07 00:23:55 +00:00
  • 2b767881d6 [automerger skipped] Merge "[Settings] Move display of VPN version into summary text" into rvc-dev am: d0d67e68a5 -s ours am: e8097d4464 -s ours am: 35c5b0b0a2 -s ours Bonian Chen 2022-04-07 00:23:43 +00:00
  • 065876ee1b [automerger skipped] [Settings] Move display of VPN version into summary text am: dddd74a491 -s ours am: eefa7371ed -s ours am: fcdc4a4de3 -s ours Bonian Chen 2022-04-07 00:23:41 +00:00
  • dad1ee3deb [automerger skipped] Merge "[Settings] Move display of VPN version into summary text" into rvc-qpr-dev am: 6279d80f93 -s ours am: d15869f014 -s ours Bonian Chen 2022-04-07 00:23:33 +00:00
  • b3be027c39 [automerger skipped] [Settings] Move display of VPN version into summary text am: 5fc0e6614d -s ours am: 96fe347312 -s ours Bonian Chen 2022-04-07 00:23:32 +00:00
  • 1893045740 Merge "[Settings] Move display of VPN version into summary text" into sc-dev am: 0f10561082 Bonian Chen 2022-04-07 00:23:26 +00:00
  • d35d3e2446 Merge "[Settings] Move display of VPN version into summary text" into qt-dev am: d0888970a4 Bonian Chen 2022-04-07 00:23:16 +00:00
  • 35c5b0b0a2 [automerger skipped] Merge "[Settings] Move display of VPN version into summary text" into rvc-dev am: d0d67e68a5 -s ours am: e8097d4464 -s ours Bonian Chen 2022-04-07 00:23:09 +00:00
  • fcdc4a4de3 [automerger skipped] [Settings] Move display of VPN version into summary text am: dddd74a491 -s ours am: eefa7371ed -s ours Bonian Chen 2022-04-07 00:23:07 +00:00
  • d15869f014 [automerger skipped] Merge "[Settings] Move display of VPN version into summary text" into rvc-qpr-dev am: 6279d80f93 -s ours Bonian Chen 2022-04-07 00:22:59 +00:00
  • 96fe347312 [automerger skipped] [Settings] Move display of VPN version into summary text am: 5fc0e6614d -s ours Bonian Chen 2022-04-07 00:22:57 +00:00
  • e8097d4464 [automerger skipped] Merge "[Settings] Move display of VPN version into summary text" into rvc-dev am: d0d67e68a5 -s ours Bonian Chen 2022-04-07 00:22:44 +00:00
  • eefa7371ed [automerger skipped] [Settings] Move display of VPN version into summary text am: dddd74a491 -s ours Bonian Chen 2022-04-07 00:22:43 +00:00
  • 32d0a9eace Import translations. DO NOT MERGE ANYWHERE Bill Yi 2022-04-07 00:21:13 +00:00
  • 682d8df13d Import translations. DO NOT MERGE ANYWHERE Bill Yi 2022-04-07 00:17:09 +00:00
  • 84b7a83f28 Import translations. DO NOT MERGE ANYWHERE Bill Yi 2022-04-07 00:12:57 +00:00
  • a84027d685 Merge "[Settings] Move display of VPN version into summary text" into sc-qpr1-dev Bonian Chen 2022-04-07 00:08:34 +00:00
  • 0f10561082 Merge "[Settings] Move display of VPN version into summary text" into sc-dev Bonian Chen 2022-04-07 00:08:28 +00:00
  • 6279d80f93 Merge "[Settings] Move display of VPN version into summary text" into rvc-qpr-dev Bonian Chen 2022-04-07 00:08:23 +00:00
  • d0d67e68a5 Merge "[Settings] Move display of VPN version into summary text" into rvc-dev Bonian Chen 2022-04-07 00:08:16 +00:00
  • d0888970a4 Merge "[Settings] Move display of VPN version into summary text" into qt-dev Bonian Chen 2022-04-07 00:08:08 +00:00
  • c6218e804c Import translations. DO NOT MERGE ANYWHERE Bill Yi 2022-04-07 00:04:23 +00:00
  • 3190e40a71 [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 2b07fb08f9 Bill Yi 2022-04-07 00:00:51 +00:00
  • 2b07fb08f9 Import translations. DO NOT MERGE ANYWHERE Bill Yi 2022-04-07 00:00:42 +00:00
  • 08321b4e75 Import translations. DO NOT MERGE ANYWHERE Bill Yi 2022-04-06 23:58:59 +00:00
  • c3bc0251d4 Import translations. DO NOT MERGE ANYWHERE Bill Yi 2022-04-06 23:57:22 +00:00
  • f1f4f6cd53 [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 2c5a30e12e 2p: 09443a8d6d Bill Yi 2022-04-06 23:56:05 +00:00
  • 09443a8d6d [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 2c5a30e12e Bill Yi 2022-04-06 23:55:58 +00:00
  • 2c5a30e12e Import translations. DO NOT MERGE ANYWHERE Bill Yi 2022-04-06 23:55:44 +00:00
  • c1331e924b Import translations. DO NOT MERGE ANYWHERE Bill Yi 2022-04-06 23:54:00 +00:00
  • cc1f1b5e6e Import translations. DO NOT MERGE ANYWHERE Bill Yi 2022-04-06 23:45:35 +00:00
  • 642b7a74ba [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 65fd2107ef Bill Yi 2022-04-06 23:42:06 +00:00
  • 65fd2107ef Import translations. DO NOT MERGE ANYWHERE Bill Yi 2022-04-06 23:41:51 +00:00
  • 00134be7d1 [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 47e0304cea 2p: 7f85a55285 Bill Yi 2022-04-06 23:40:45 +00:00
  • 7f85a55285 [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 62dd76e7d4 2p: 47e0304cea Bill Yi 2022-04-06 23:40:38 +00:00
  • 47e0304cea [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 62dd76e7d4 Bill Yi 2022-04-06 23:40:28 +00:00
  • 62dd76e7d4 Import translations. DO NOT MERGE ANYWHERE Bill Yi 2022-04-06 23:40:15 +00:00
  • 67be59e333 Snap for 8414339 from 5cb554d02a to tm-qpr1-release Android Build Coastguard Worker 2022-04-06 20:39:51 +00:00
  • 88fe2e4406 Merge "[Panlingual] Fix settings crash from rotation." into tm-dev am: e0f6939c4c am: cd10b0552e am: 5cb554d02a TreeHugger Robot 2022-04-06 16:18:47 +00:00
  • 52592d050d Merge "Update the function used to log the dream picking events." into tm-dev am: 8708bbd8b3 am: da1f3d6d37 am: 8621b2d7f7 Xiaowen Lei 2022-04-06 16:17:49 +00:00
  • ecebcbde08 Merge "Fixes 'learn more' link in ScreenTimeoutSettings" into tm-dev am: d23aa91e8b am: 3a23af64cd am: 46d9aeee40 TreeHugger Robot 2022-04-06 16:16:54 +00:00
  • 0fed939ff1 Merge "Fix the flow for ZenCustomRuleSettingsBase" into tm-dev am: 9c6249a04f am: 631c56fc20 am: ec331ee2d0 Chaohui Wang 2022-04-06 16:15:10 +00:00
  • 0156b57ab5 Merge "[Panlingual] Fix settings crash from rotation." into tm-dev am: e0f6939c4c am: 0328978e63 TreeHugger Robot 2022-04-06 15:57:09 +00:00
  • 5cb554d02a Merge "[Panlingual] Fix settings crash from rotation." into tm-dev am: e0f6939c4c am: cd10b0552e TreeHugger Robot 2022-04-06 15:56:33 +00:00
  • 8621b2d7f7 Merge "Update the function used to log the dream picking events." into tm-dev am: 8708bbd8b3 am: da1f3d6d37 Xiaowen Lei 2022-04-06 15:56:22 +00:00
  • 3d3daa37b0 Merge changes from topic "presubmit-am-9c41bb9c971547b49c41b3d37ad42e21" into tm-mainline-prod am: 8f16b0cd5b TreeHugger Robot 2022-04-06 15:56:19 +00:00
  • 46d9aeee40 Merge "Fixes 'learn more' link in ScreenTimeoutSettings" into tm-dev am: d23aa91e8b am: 3a23af64cd TreeHugger Robot 2022-04-06 15:56:00 +00:00
  • ec331ee2d0 Merge "Fix the flow for ZenCustomRuleSettingsBase" into tm-dev am: 9c6249a04f am: 631c56fc20 Chaohui Wang 2022-04-06 15:55:31 +00:00
  • cd10b0552e Merge "[Panlingual] Fix settings crash from rotation." into tm-dev am: e0f6939c4c TreeHugger Robot 2022-04-06 15:54:57 +00:00
  • 0328978e63 Merge "[Panlingual] Fix settings crash from rotation." into tm-dev am: e0f6939c4c TreeHugger Robot 2022-04-06 15:53:58 +00:00
  • 0ce8355c63 [automerge] [Panlingual] Fix the back button press 2p: c0214ff9f3 tom hsu 2022-04-06 15:37:24 +00:00
  • c0214ff9f3 [Panlingual] Fix the back button press tom hsu 2022-04-06 23:28:17 +08:00
  • 69204aeff6 Merge changes from topic "presubmit-am-9c41bb9c971547b49c41b3d37ad42e21" TreeHugger Robot 2022-04-06 15:15:37 +00:00
  • e0f6939c4c Merge "[Panlingual] Fix settings crash from rotation." into tm-dev TreeHugger Robot 2022-04-06 15:15:37 +00:00
  • 8f16b0cd5b Merge changes from topic "presubmit-am-9c41bb9c971547b49c41b3d37ad42e21" into tm-mainline-prod TreeHugger Robot 2022-04-06 15:15:37 +00:00
  • da1f3d6d37 Merge "Update the function used to log the dream picking events." into tm-dev am: 8708bbd8b3 Xiaowen Lei 2022-04-06 15:09:04 +00:00
  • 15c0ac2279 Merge "Update the function used to log the dream picking events." into tm-dev am: 8708bbd8b3 am: 16cbd39800 Xiaowen Lei 2022-04-06 15:08:58 +00:00
  • 16d918299c Merge "Fixes 'learn more' link in ScreenTimeoutSettings" into tm-dev am: d23aa91e8b am: 9190579a6d TreeHugger Robot 2022-04-06 15:08:50 +00:00
  • 548760d027 Merge changes from topic "presubmit-am-185f63f128a54648a022e31b749710e8" into tm-mainline-prod am: 59d390cded TreeHugger Robot 2022-04-06 15:08:25 +00:00
  • 16cbd39800 Merge "Update the function used to log the dream picking events." into tm-dev am: 8708bbd8b3 Xiaowen Lei 2022-04-06 15:08:11 +00:00
  • 9190579a6d Merge "Fixes 'learn more' link in ScreenTimeoutSettings" into tm-dev am: d23aa91e8b TreeHugger Robot 2022-04-06 15:07:57 +00:00
  • 8708bbd8b3 Merge "Update the function used to log the dream picking events." into tm-dev Xiaowen Lei 2022-04-06 15:04:57 +00:00
  • 3a23af64cd Merge "Fixes 'learn more' link in ScreenTimeoutSettings" into tm-dev am: d23aa91e8b TreeHugger Robot 2022-04-06 15:00:32 +00:00
  • 631c56fc20 Merge "Fix the flow for ZenCustomRuleSettingsBase" into tm-dev am: 9c6249a04f Chaohui Wang 2022-04-06 15:00:17 +00:00
  • 8554aa1f6c Merge changes from topic "presubmit-am-185f63f128a54648a022e31b749710e8" TreeHugger Robot 2022-04-06 15:00:11 +00:00
  • 59d390cded Merge changes from topic "presubmit-am-185f63f128a54648a022e31b749710e8" into tm-mainline-prod TreeHugger Robot 2022-04-06 15:00:11 +00:00
  • d23aa91e8b Merge "Fixes 'learn more' link in ScreenTimeoutSettings" into tm-dev TreeHugger Robot 2022-04-06 15:00:11 +00:00
  • 498beaab27 Merge "Fix the flow for ZenCustomRuleSettingsBase" into tm-dev am: 9c6249a04f am: cc4a5988f5 Chaohui Wang 2022-04-06 14:59:41 +00:00
  • c92af2b605 Merge changes from topic "presubmit-am-2fdd9a2ee9c448a893b219cbddd5e04a" into tm-mainline-prod am: 2caba70028 Chaohui Wang 2022-04-06 14:59:34 +00:00
  • cc4a5988f5 Merge "Fix the flow for ZenCustomRuleSettingsBase" into tm-dev am: 9c6249a04f Chaohui Wang 2022-04-06 14:59:21 +00:00
  • 2caba70028 Merge changes from topic "presubmit-am-2fdd9a2ee9c448a893b219cbddd5e04a" into tm-mainline-prod Chaohui Wang 2022-04-06 14:35:51 +00:00
  • 9c6249a04f Merge "Fix the flow for ZenCustomRuleSettingsBase" into tm-dev Chaohui Wang 2022-04-06 14:35:51 +00:00
  • 2473634d72 [Pnalingual] Resolve code conflict. am: 6436a5aa6f am: 715ebf4705 am: 8d2c67bd03 tom hsu 2022-04-06 12:22:36 +00:00
  • 8d2c67bd03 [Pnalingual] Resolve code conflict. am: 6436a5aa6f am: 715ebf4705 tom hsu 2022-04-06 12:03:41 +00:00