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

Commit Graph

  • 715ebf4705 [Pnalingual] Resolve code conflict. am: 6436a5aa6f tom hsu 2022-04-06 11:48:43 +00:00
  • 072510b144 [automerge] [Panlingual] Fix settings crash from rotation. 2p: 19bd21d96c 2p: d36ff21fb1 tom hsu 2022-04-06 11:34:07 +00:00
  • d36ff21fb1 [automerge] [Panlingual] Fix settings crash from rotation. 2p: 19bd21d96c tom hsu 2022-04-06 11:33:59 +00:00
  • 19bd21d96c [Panlingual] Fix settings crash from rotation. tom hsu 2022-04-06 15:59:43 +08:00
  • 58bd2faec6 [automerge] [Pnalingual] Resolve code conflict. 2p: 6436a5aa6f 2p: 9d162016b9 Presubmit Automerger Backend 2022-04-06 11:08:01 +00:00
  • 9d162016b9 [automerge] [Pnalingual] Resolve code conflict. 2p: 6436a5aa6f Presubmit Automerger Backend 2022-04-06 11:07:55 +00:00
  • 6436a5aa6f [Pnalingual] Resolve code conflict. tom hsu 2022-04-06 18:28:13 +08:00
  • ea1878eed1 Merge "Update framework strings for the security page." into tm-dev am: a926f6ddbc am: 0a6067a69e am: 8180a6e3f8 Jan Tomljanovic 2022-04-06 10:43:38 +00:00
  • 444c4868ee Merge "[Pnalingual] Resolve code conflict." Tom Hsu 2022-04-06 10:38:08 +00:00
  • aac21a59aa [Pnalingual] Resolve code conflict. tom hsu 2022-04-06 18:28:13 +08:00
  • 8180a6e3f8 Merge "Update framework strings for the security page." into tm-dev am: a926f6ddbc am: 0a6067a69e Jan Tomljanovic 2022-04-06 10:21:58 +00:00
  • 4a12af2cf8 Merge "Update framework strings for the security page." into tm-dev am: a926f6ddbc am: ba369cbb31 Jan Tomljanovic 2022-04-06 10:21:10 +00:00
  • f6c5c083ee Merge "Properly apply the SUW dynamic color theme" into tm-dev am: 8b6bbda28a am: e4724e5aa9 am: 936007f4db Cn Chen 2022-04-06 10:06:33 +00:00
  • 6622811a75 [automerge] Fix LaunchAnyWhere in AppRestrictionsFragment 2p: 90e095dbe3 Edgar Wang 2022-04-06 10:02:31 +00:00
  • 0a6067a69e Merge "Update framework strings for the security page." into tm-dev am: a926f6ddbc Jan Tomljanovic 2022-04-06 10:00:17 +00:00
  • ba369cbb31 Merge "Update framework strings for the security page." into tm-dev am: a926f6ddbc Jan Tomljanovic 2022-04-06 09:59:17 +00:00
  • 90e095dbe3 Fix LaunchAnyWhere in AppRestrictionsFragment Edgar Wang 2022-04-06 17:30:27 +08:00
  • 936007f4db Merge "Properly apply the SUW dynamic color theme" into tm-dev am: 8b6bbda28a am: e4724e5aa9 Cn Chen 2022-04-06 09:45:48 +00:00
  • 55aef08432 Merge "Properly apply the SUW dynamic color theme" into tm-dev am: 8b6bbda28a am: 87b8c8d107 Cn Chen 2022-04-06 09:45:20 +00:00
  • a926f6ddbc Merge "Update framework strings for the security page." into tm-dev Jan Tomljanovic 2022-04-06 09:25:15 +00:00
  • 2646ea3180 [automerge] Fix the flow for ZenCustomRuleSettingsBase 2p: 3b3e66c780 Chaohui Wang 2022-04-06 09:22:39 +00:00
  • 3b3e66c780 Fix the flow for ZenCustomRuleSettingsBase Chaohui Wang 2022-04-06 17:22:12 +08:00
  • e4724e5aa9 Merge "Properly apply the SUW dynamic color theme" into tm-dev am: 8b6bbda28a Cn Chen 2022-04-06 09:18:23 +00:00
  • 5884943ea0 Merge "Add work profile badge for icon of free up space" into tm-dev am: 6d0b9c7bd4 am: acdd95c572 am: c260b55ad2 TreeHugger Robot 2022-04-06 09:17:45 +00:00
  • 87b8c8d107 Merge "Properly apply the SUW dynamic color theme" into tm-dev am: 8b6bbda28a Cn Chen 2022-04-06 09:17:28 +00:00
  • c260b55ad2 Merge "Add work profile badge for icon of free up space" into tm-dev am: 6d0b9c7bd4 am: acdd95c572 TreeHugger Robot 2022-04-06 08:57:35 +00:00
  • 8b6bbda28a Merge "Properly apply the SUW dynamic color theme" into tm-dev Cn Chen 2022-04-06 08:55:48 +00:00
  • 7e3ac66bc6 Merge "Add work profile badge for icon of free up space" into tm-dev am: 6d0b9c7bd4 am: 1f75850e11 TreeHugger Robot 2022-04-06 08:50:26 +00:00
  • acdd95c572 Merge "Add work profile badge for icon of free up space" into tm-dev am: 6d0b9c7bd4 TreeHugger Robot 2022-04-06 08:35:45 +00:00
  • 1f75850e11 Merge "Add work profile badge for icon of free up space" into tm-dev am: 6d0b9c7bd4 TreeHugger Robot 2022-04-06 08:34:49 +00:00
  • 6d0b9c7bd4 Merge "Add work profile badge for icon of free up space" into tm-dev TreeHugger Robot 2022-04-06 08:05:10 +00:00
  • 4652097173 [automerge] Fixes 'learn more' link in ScreenTimeoutSettings 2p: 284cb1c2b2 2p: e6f28fbd49 Yi Jiang 2022-04-06 06:49:40 +00:00
  • e6f28fbd49 [automerge] Fixes 'learn more' link in ScreenTimeoutSettings 2p: 284cb1c2b2 Yi Jiang 2022-04-06 06:49:32 +00:00
  • 284cb1c2b2 Fixes 'learn more' link in ScreenTimeoutSettings Yi Jiang 2022-04-04 18:48:19 -07:00
  • 5d0057615a Fix title clipped for "Custom settings for schedule" Chaohui Wang 2022-04-06 12:06:08 +08:00
  • 1149c12949 Merge "Guest mode UX flow updates to user settings" Kedar Chitnis 2022-04-06 04:18:05 +00:00
  • ac4bee6103 Snap for 8409961 from c193606f26 to udc-release Android Build Coastguard Worker 2022-04-06 03:09:11 +00:00
  • 4eedbed2f4 Merge "Added test for FP Enroll vibration" into tm-d1-dev am: f733c0d7c9 am: b9128f28f6 TreeHugger Robot 2022-04-06 01:51:53 +00:00
  • b9128f28f6 Merge "Added test for FP Enroll vibration" into tm-d1-dev am: f733c0d7c9 TreeHugger Robot 2022-04-06 01:20:52 +00:00
  • abacb95b6d Snap for 8408164 from ab8467e872 to tm-release Android Build Coastguard Worker 2022-04-06 01:09:31 +00:00
  • f733c0d7c9 Merge "Added test for FP Enroll vibration" into tm-d1-dev TreeHugger Robot 2022-04-06 01:04:47 +00:00
  • 2a05de0df1 Added test for FP Enroll vibration Joshua McCloskey 2022-04-05 23:22:50 +00:00
  • c858e7e18e [automerge] Remove GameSettings and ExtraAppInfo. 2p: e14c23fcf9 2p: f621f13d83 Peiyong Lin 2022-04-05 21:52:06 +00:00
  • f621f13d83 [automerge] Remove GameSettings and ExtraAppInfo. 2p: e14c23fcf9 Peiyong Lin 2022-04-05 21:51:57 +00:00
  • e14c23fcf9 Remove GameSettings and ExtraAppInfo. Peiyong Lin 2022-04-05 21:45:05 +00:00
  • c193606f26 Merge "Fix bug where not all views are getting disabled alpha applied." into tm-dev am: ab8467e872 am: 674bca5b78 am: 252607e648 Lucas Silva 2022-04-05 15:55:21 +00:00
  • 252607e648 Merge "Fix bug where not all views are getting disabled alpha applied." into tm-dev am: ab8467e872 am: 674bca5b78 Lucas Silva 2022-04-05 15:33:47 +00:00
  • 44a4e905e7 Merge "Fix bug where not all views are getting disabled alpha applied." into tm-dev am: ab8467e872 am: 2ec4bc0b5d Lucas Silva 2022-04-05 15:33:20 +00:00
  • 674bca5b78 Merge "Fix bug where not all views are getting disabled alpha applied." into tm-dev am: ab8467e872 Lucas Silva 2022-04-05 15:13:31 +00:00
  • 2ec4bc0b5d Merge "Fix bug where not all views are getting disabled alpha applied." into tm-dev am: ab8467e872 Lucas Silva 2022-04-05 15:13:02 +00:00
  • e7fd120d8e Capitalize TZ display name strings Neil Fuller 2022-04-05 15:31:10 +01:00
  • ab8467e872 Merge "Fix bug where not all views are getting disabled alpha applied." into tm-dev Lucas Silva 2022-04-05 14:42:41 +00:00
  • b8187256eb Update framework strings for the security page. Jan Tomljanovic 2022-04-04 13:52:26 +01:00
  • ea23179bc9 Merge "Fix cannot add language" into tm-dev am: 65c610c2ab am: d5d380f9c0 am: edf16b89a8 Chaohui Wang 2022-04-05 12:13:24 +00:00
  • edf16b89a8 Merge "Fix cannot add language" into tm-dev am: 65c610c2ab am: d5d380f9c0 Chaohui Wang 2022-04-05 11:51:32 +00:00
  • 4786d1f869 Merge "Fix cannot add language" into tm-dev am: 65c610c2ab am: 20032a4b13 Chaohui Wang 2022-04-05 11:51:09 +00:00
  • d5d380f9c0 Merge "Fix cannot add language" into tm-dev am: 65c610c2ab Chaohui Wang 2022-04-05 11:30:32 +00:00
  • 20032a4b13 Merge "Fix cannot add language" into tm-dev am: 65c610c2ab Chaohui Wang 2022-04-05 11:29:19 +00:00
  • 65c610c2ab Merge "Fix cannot add language" into tm-dev Chaohui Wang 2022-04-05 11:04:10 +00:00
  • 8a44aafeb1 Fix Flicker for ZenCustomRuleSettingsBase am: bab799899d am: 1b78e1b36c am: 71e6b6f628 Chaohui Wang 2022-04-05 10:06:15 +00:00
  • 63ddb79c0d Fix Flicker for ZenCustomRuleSettingsBase am: bab799899d am: 9734698f71 Chaohui Wang 2022-04-05 08:51:10 +00:00
  • 71e6b6f628 Fix Flicker for ZenCustomRuleSettingsBase am: bab799899d am: 1b78e1b36c Chaohui Wang 2022-04-05 08:50:55 +00:00
  • 1b78e1b36c Fix Flicker for ZenCustomRuleSettingsBase am: bab799899d Chaohui Wang 2022-04-05 08:37:54 +00:00
  • 9734698f71 Fix Flicker for ZenCustomRuleSettingsBase am: bab799899d Chaohui Wang 2022-04-05 08:36:58 +00:00
  • 07d1fe9301 Snap for 8404564 from d1b7ba7c3e to udc-release Android Build Coastguard Worker 2022-04-05 03:09:09 +00:00
  • 67cd2947d9 Snap for 8404621 from d191a16c54 to tm-release Android Build Coastguard Worker 2022-04-05 01:09:32 +00:00
  • f7a95e4b5d Fix bug where not all views are getting disabled alpha applied. Lucas Silva 2022-04-04 16:20:53 -04:00
  • 7afcf4efdb Use more unique ids for safety sources Giulio Fiscella 2022-04-02 13:21:18 +00:00
  • 1a37275553 Use more unique ids for safety sources Giulio Fiscella 2022-04-02 13:21:18 +00:00
  • bab799899d Fix Flicker for ZenCustomRuleSettingsBase Chaohui Wang 2022-03-24 16:53:25 +08:00
  • d1b7ba7c3e Merge "Set up correct ComponentName for test mode of Parental Controls" into tm-dev am: d191a16c54 am: 8ef0f87dcc am: 42689d0381 Yuri Ufimtsev 2022-04-04 11:57:37 +00:00
  • 42689d0381 Merge "Set up correct ComponentName for test mode of Parental Controls" into tm-dev am: d191a16c54 am: 8ef0f87dcc Yuri Ufimtsev 2022-04-04 11:15:59 +00:00
  • 109d101511 Merge "Set up correct ComponentName for test mode of Parental Controls" into tm-dev am: d191a16c54 am: e2dd5d9fdd Yuri Ufimtsev 2022-04-04 11:15:46 +00:00
  • 8ef0f87dcc Merge "Set up correct ComponentName for test mode of Parental Controls" into tm-dev am: d191a16c54 Yuri Ufimtsev 2022-04-04 10:53:52 +00:00
  • e2dd5d9fdd Merge "Set up correct ComponentName for test mode of Parental Controls" into tm-dev am: d191a16c54 Yuri Ufimtsev 2022-04-04 10:52:48 +00:00
  • d191a16c54 Merge "Set up correct ComponentName for test mode of Parental Controls" into tm-dev Yuri Ufimtsev 2022-04-04 10:33:09 +00:00
  • fa49a4f111 Guest mode UX flow updates to user settings Kedar Chitnis 2022-03-25 05:16:33 +00:00
  • f03f79b145 Fix cannot add language Chaohui Wang 2022-04-04 11:26:55 +08:00
  • 8e55a49903 Snap for 8401170 from 6a43641f59 to udc-release Android Build Coastguard Worker 2022-04-04 01:08:42 +00:00
  • f4e1b5f2fb Snap for 8401211 from 444e9d38f6 to tm-release Android Build Coastguard Worker 2022-04-03 23:09:09 +00:00
  • 6a43641f59 [automerger skipped] Merge Android 12 QPR3 ab/8391262 am: e75d9ee3e9 -s ours am: 35cf5330a9 -s ours am: 444e9d38f6 -s ours am: 524cba9409 -s ours am: 18bb0d8a59 -s ours Xin Li 2022-04-03 09:38:51 +00:00
  • 18bb0d8a59 [automerger skipped] Merge Android 12 QPR3 ab/8391262 am: e75d9ee3e9 -s ours am: 35cf5330a9 -s ours am: 444e9d38f6 -s ours am: 524cba9409 -s ours Xin Li 2022-04-03 09:08:42 +00:00
  • 033da0ca50 [automerger skipped] Merge Android 12 QPR3 ab/8391262 am: e75d9ee3e9 -s ours am: 35cf5330a9 -s ours am: 444e9d38f6 -s ours am: 7f998a1b5b -s ours Xin Li 2022-04-03 09:00:28 +00:00
  • 524cba9409 [automerger skipped] Merge Android 12 QPR3 ab/8391262 am: e75d9ee3e9 -s ours am: 35cf5330a9 -s ours am: 444e9d38f6 -s ours Xin Li 2022-04-03 08:30:48 +00:00
  • 7f998a1b5b [automerger skipped] Merge Android 12 QPR3 ab/8391262 am: e75d9ee3e9 -s ours am: 35cf5330a9 -s ours am: 444e9d38f6 -s ours Xin Li 2022-04-03 08:29:33 +00:00
  • 444e9d38f6 [automerger skipped] Merge Android 12 QPR3 ab/8391262 am: e75d9ee3e9 -s ours am: 35cf5330a9 -s ours Xin Li 2022-04-03 07:43:39 +00:00
  • 35cf5330a9 [automerger skipped] Merge Android 12 QPR3 ab/8391262 am: e75d9ee3e9 -s ours Xin Li 2022-04-03 07:11:38 +00:00
  • 376c9ccc1f Snap for 8399617 from 6d9631779d to sc-qpr3-release Android Build Coastguard Worker 2022-04-02 21:08:18 +00:00
  • 8779260fd8 Update Spinner style of Print Settings to apply MN style Edgar Wang 2022-04-03 02:37:59 +08:00
  • 6c9da58f4b Clean up unused Sliceable.copy() Chaohui Wang 2022-04-01 19:03:49 +08:00
  • 0977f01850 Snap for 8398296 from dfb59f8d71 to udc-release Android Build Coastguard Worker 2022-04-02 05:16:06 +00:00
  • d672ba1dbb Snap for 8397960 from cf96e65a6f to tm-release Android Build Coastguard Worker 2022-04-02 03:10:17 +00:00
  • d16c12b9ac Set up correct ComponentName for test mode of Parental Controls Yuri Ufimtsev 2022-03-30 18:55:01 +00:00
  • e75d9ee3e9 Merge Android 12 QPR3 ab/8391262 Xin Li 2022-04-01 20:32:46 +00:00
  • dfb59f8d71 [automerger skipped] [conflict] Merge "Prevent exfiltration of system files via user image settings." into qt-dev am: 74ff164972 am: e6e739d8b0 am: ed29b05dcd am: 0b507f0203 -s ours am: 7bd23716c3 -s ours am: 8eacc8a8dc -s ours am: 6d9631779d -s ours am: b3e3a33a3e -s ours am: cf96e65a6f -s ours am: 9f87ce1cbd -s ours am: a0ee5881ee -s ours TreeHugger Robot 2022-04-01 20:22:18 +00:00
  • a0ee5881ee [automerger skipped] [conflict] Merge "Prevent exfiltration of system files via user image settings." into qt-dev am: 74ff164972 am: e6e739d8b0 am: ed29b05dcd am: 0b507f0203 -s ours am: 7bd23716c3 -s ours am: 8eacc8a8dc -s ours am: 6d9631779d -s ours am: b3e3a33a3e -s ours am: cf96e65a6f -s ours am: 9f87ce1cbd -s ours TreeHugger Robot 2022-04-01 19:56:00 +00:00
  • 73ee5341f3 [automerger skipped] [conflict] Merge "Prevent exfiltration of system files via user image settings." into qt-dev am: 74ff164972 am: e6e739d8b0 am: ed29b05dcd am: 0b507f0203 -s ours am: 7bd23716c3 -s ours am: 8eacc8a8dc -s ours am: 6d9631779d -s ours am: b3e3a33a3e -s ours am: cf96e65a6f -s ours am: 63acc6e862 -s ours TreeHugger Robot 2022-04-01 19:55:29 +00:00
  • 969ee22d41 [automerger skipped] [conflict] Merge "Prevent exfiltration of system files via user image settings." into qt-dev am: 74ff164972 am: e6e739d8b0 am: ed29b05dcd am: 0b507f0203 -s ours am: 7bd23716c3 -s ours am: b41a74c1a9 -s ours am: d3fdbf5def -s ours am: 99fed064c3 -s ours am: bd52c5eba8 -s ours TreeHugger Robot 2022-04-01 19:48:43 +00:00
  • 9f87ce1cbd [automerger skipped] [conflict] Merge "Prevent exfiltration of system files via user image settings." into qt-dev am: 74ff164972 am: e6e739d8b0 am: ed29b05dcd am: 0b507f0203 -s ours am: 7bd23716c3 -s ours am: 8eacc8a8dc -s ours am: 6d9631779d -s ours am: b3e3a33a3e -s ours am: cf96e65a6f -s ours TreeHugger Robot 2022-04-01 19:33:54 +00:00
  • 63acc6e862 [automerger skipped] [conflict] Merge "Prevent exfiltration of system files via user image settings." into qt-dev am: 74ff164972 am: e6e739d8b0 am: ed29b05dcd am: 0b507f0203 -s ours am: 7bd23716c3 -s ours am: 8eacc8a8dc -s ours am: 6d9631779d -s ours am: b3e3a33a3e -s ours am: cf96e65a6f -s ours TreeHugger Robot 2022-04-01 19:33:02 +00:00