PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
83,559 Commits 1 Branch 0 Tags
978559b93e3a33bbb13e233a94b975309bb2d32b
Commit Graph

83559 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
TreeHugger Robot
978559b93e Merge "Fix AppBatteryPreferenceControllerTest test fail" into sc-dev am: 75d3635712 am: 38965b8a66 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14860446

Change-Id: Ib03a514f82a966ee885fcc70322654c610e400d9
 2021-06-09 04:22:26 +00:00
TreeHugger Robot
38965b8a66 Merge "Fix AppBatteryPreferenceControllerTest test fail" into sc-dev am: 75d3635712 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14860446

Change-Id: Ia719b13569cc498ffdbf9472c1adc27a9c47a998
 2021-06-09 04:02:52 +00:00
TreeHugger Robot
75d3635712 Merge "Fix AppBatteryPreferenceControllerTest test fail" into sc-dev 2021-06-09 03:30:10 +00:00
Sarah Chin
7cef9a286c Merge "Add NR SA OVERRIDE_NETWORK_TYPE_NR_ADVANCED for TelephonyDisplayInfo" am: 8222d88548 am: 5a173dad6c am: afd5c21606 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1681974

Change-Id: Iae38a6a6d6c5e55768cdf915413670f159f2f3ec
 2021-06-08 22:31:14 +00:00
Sarah Chin
afd5c21606 Merge "Add NR SA OVERRIDE_NETWORK_TYPE_NR_ADVANCED for TelephonyDisplayInfo" am: 8222d88548 am: 5a173dad6c 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1681974

Change-Id: Ibfd65d9a29f0167035093db1e0fee59a5064a466
 2021-06-08 21:45:35 +00:00
Sarah Chin
5a173dad6c Merge "Add NR SA OVERRIDE_NETWORK_TYPE_NR_ADVANCED for TelephonyDisplayInfo" am: 8222d88548 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1681974

Change-Id: I467a109a5387e4d1bc0da4e83c6e12ceea24d6bf
 2021-06-08 21:10:17 +00:00
Sarah Chin
8222d88548 Merge "Add NR SA OVERRIDE_NETWORK_TYPE_NR_ADVANCED for TelephonyDisplayInfo" 2021-06-08 20:47:10 +00:00
Chen Xu
c327eb2f9f [automerger skipped] Merge "UK emergency alert app rename" into rvc-qpr-dev am: 3bdcdae23f am: 35e1f0d189 am: 665c496449 -s ours 
am skip reason: Merged-In Ic9d4e1138113e3c90abb27ba0a72d2ed07528c1e with SHA-1 3b8c6118c1 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14645166

Change-Id: I82b9bbad4b5fb6b48c07d1117f774bef9ca43abc
 2021-06-08 20:44:57 +00:00
Chen Xu
c516408579 Merge "UK emergency alert app rename" into rvc-qpr-dev am: 3bdcdae23f am: 35e1f0d189 am: 4198a5f6e1 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14645166

Change-Id: Iecdad5f2aca082dc59b75032857b8593f27a9e30
 2021-06-08 20:43:26 +00:00
Chen Xu
4198a5f6e1 Merge "UK emergency alert app rename" into rvc-qpr-dev am: 3bdcdae23f am: 35e1f0d189 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14645166

Change-Id: Iff7a47659fb1c667193d286109e1c01a575e025f
 2021-06-08 20:23:44 +00:00
Chen Xu
665c496449 Merge "UK emergency alert app rename" into rvc-qpr-dev am: 3bdcdae23f am: 35e1f0d189 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14645166

Change-Id: Ia51097c7d0144d8eb7aba9ee31339ecd81ded445
 2021-06-08 20:21:59 +00:00
Chen Xu
35e1f0d189 Merge "UK emergency alert app rename" into rvc-qpr-dev am: 3bdcdae23f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14645166

Change-Id: Ia624be832a8e3f2764db2f8f5529b64a91e5b2a2
 2021-06-08 20:06:21 +00:00
Curtis Belmonte
46d49468c9 Merge "Fix color and asset name for large face enroll icon" into sc-dev am: 99faae35fc am: 0f1d52acb9 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14887393

Change-Id: Idab59c619c6ece1b072e09fb2d571e8cae3c3615
 2021-06-08 19:59:30 +00:00
Matt Casey
67691f371c Merge "Update system settings to honor device defaults for assistant invocation" into sc-dev am: fc10ab9c98 am: 9f962fea7b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14843840

Change-Id: Ic3da2015a2ae4782ad108a631b432159bd2745dc
 2021-06-08 19:59:18 +00:00
Curtis Belmonte
ff0d166c36 Merge "Fix color and asset name for large face enroll icon" into sc-dev am: 99faae35fc am: 539ded515c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14887393

Change-Id: Ibd7744cbecc2c5d780ab358ef196926107e96b11
 2021-06-08 19:53:47 +00:00
Matt Casey
2bea4a428d Merge "Update system settings to honor device defaults for assistant invocation" into sc-dev am: fc10ab9c98 am: ac1a9c59a2 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14843840

Change-Id: I0082769fcbeb8a10f501bf5f43d82fa9c708829a
 2021-06-08 19:52:35 +00:00
Chen Xu
3bdcdae23f Merge "UK emergency alert app rename" into rvc-qpr-dev 2021-06-08 19:50:39 +00:00
Curtis Belmonte
539ded515c Merge "Fix color and asset name for large face enroll icon" into sc-dev am: 99faae35fc 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14887393

Change-Id: I22bb5932933f71c20417b267c1cad3841bed7652
 2021-06-08 19:42:14 +00:00
Curtis Belmonte
0f1d52acb9 Merge "Fix color and asset name for large face enroll icon" into sc-dev am: 99faae35fc 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14887393

Change-Id: Ibae403e665aabe9093ec2ad8fc8665828c310cf4
 2021-06-08 19:36:53 +00:00
Curtis Belmonte
99faae35fc Merge "Fix color and asset name for large face enroll icon" into sc-dev 2021-06-08 19:36:05 +00:00
Matt Casey
9f962fea7b Merge "Update system settings to honor device defaults for assistant invocation" into sc-dev am: fc10ab9c98 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14843840

Change-Id: I7d4e1e0e613c4e5cd449f1401332a3803a27b760
 2021-06-08 19:35:44 +00:00
Matt Casey
ac1a9c59a2 Merge "Update system settings to honor device defaults for assistant invocation" into sc-dev am: fc10ab9c98 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14843840

Change-Id: I73d3ecd7950d90593acf5118baf536a3dc62974a
 2021-06-08 19:29:44 +00:00
Matt Casey
fc10ab9c98 Merge "Update system settings to honor device defaults for assistant invocation" into sc-dev 2021-06-08 19:02:06 +00:00
Chen Xu
3b8c6118c1 UK emergency alert app rename 
Bug: 179052608
Test: Build
Change-Id: Ic9d4e1138113e3c90abb27ba0a72d2ed07528c1e
(cherry picked from commit f7e3d57023)
Merged-in: Ic9d4e1138113e3c90abb27ba0a72d2ed07528c1e
 2021-06-08 18:09:46 +00:00
YUKAI HUNG
dce903863e Merge "Remove BatteryTipPolicyTest first to avoid blocking presubmit" into sc-dev am: f7b90c3a7f am: 2cf56db2a2 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14880237

Change-Id: I0121183c2ea453b3dd8cf538488983d78b617665
 2021-06-08 14:12:14 +00:00
YUKAI HUNG
982a0d906b Merge "Remove BatteryTipPolicyTest first to avoid blocking presubmit" into sc-dev am: f7b90c3a7f am: 6c971a8a99 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14880237

Change-Id: I8ba952a04dc2e327fb2309f9adc0aed24a806a4c
 2021-06-08 14:11:10 +00:00
YUKAI HUNG
6c971a8a99 Merge "Remove BatteryTipPolicyTest first to avoid blocking presubmit" into sc-dev am: f7b90c3a7f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14880237

Change-Id: I13b27a08eaf329121524220071d2cec3e5be8684
 2021-06-08 13:53:10 +00:00
YUKAI HUNG
2cf56db2a2 Merge "Remove BatteryTipPolicyTest first to avoid blocking presubmit" into sc-dev am: f7b90c3a7f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14880237

Change-Id: I60f676042c197acb6744ec547e9629b960e5eddd
 2021-06-08 13:51:43 +00:00
YUKAI HUNG
f7b90c3a7f Merge "Remove BatteryTipPolicyTest first to avoid blocking presubmit" into sc-dev 2021-06-08 13:42:04 +00:00
ykhung
ae1797ec46 Remove BatteryTipPolicyTest first to avoid blocking presubmit 
Bug: 190150515
Test: make SettingsGoogleRoboTests
Change-Id: If97e0853d7904919f54f4c4b970380f6fb40efc6
 2021-06-08 19:04:55 +08:00
Giuliano Procida
0ac18fa8cb Merge "Revert "Apply SettingsLib SeekBarPreference to Settings"" into sc-dev am: ef0e09f7a3 am: 4c611865bf 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14880698

Change-Id: Id8797d6f1a0949c0ca07a26bc39d8550c93d7f30
 2021-06-08 10:10:59 +00:00
Giuliano Procida
70bf492313 Merge "Revert "Apply SettingsLib SeekBarPreference to Settings"" into sc-dev am: ef0e09f7a3 am: 13ba3ea00d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14880698

Change-Id: I2207001939d269a292a6ce1b37cf49aad886b910
 2021-06-08 10:05:12 +00:00
Giuliano Procida
4c611865bf Merge "Revert "Apply SettingsLib SeekBarPreference to Settings"" into sc-dev am: ef0e09f7a3 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14880698

Change-Id: I710ece36912d159c641bbc2e2c72db8830c23563
 2021-06-08 10:04:18 +00:00
Giuliano Procida
13ba3ea00d Merge "Revert "Apply SettingsLib SeekBarPreference to Settings"" into sc-dev am: ef0e09f7a3 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14880698

Change-Id: I528cb33907aab069a37fecf24c39de614b5bc0f2
 2021-06-08 10:02:19 +00:00
Giuliano Procida
ef0e09f7a3 Merge "Revert "Apply SettingsLib SeekBarPreference to Settings"" into sc-dev 2021-06-08 09:55:58 +00:00
Edgar Wang
cdff5c6ceb Revert "Apply SettingsLib SeekBarPreference to Settings" 
Revert submission 13422386-seekbar-sc-dev

Reason for revert: build broken in SettingsGoogle
Reverted Changes:
I0c2d0d5fb:Apply SettingsLib SeekBarPreference to SettingsGoo...
I1844bb3b0:Apply SettingsLib SeekBarPreference to a11y vibrat...
Ia3e4adec8:Apply SettingsLib SeekBarPreference to a11y vibrat...
Iadee57e9d:Apply SettingsLib SeekBarPreference to a11y vibrat...
I219878716:Apply SettingsLib SeekBarPreference to Settings
I959f5672c:Create SettingsLibSeekBarPreference
I92545a69c:Apply SettingsLib SeekBarPreference to a11y vibrat...

Change-Id: Ie6c3b0dc072e044796abdb33fca305f9f9d47c4d
Bug: 176818438
 2021-06-08 09:47:51 +00:00
Zoey Chen
567020518e Merge "[Provider Model] Should not show WiFi call if all sims do not support it." into sc-dev am: bef9945917 am: cdb94b55dc 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14860439

Change-Id: Idc4773aedb1c393bc50976637d8720a73f9fa2d1
 2021-06-08 09:40:49 +00:00
Zoey Chen
7c962586d2 Merge "[Provider Model] Should not show WiFi call if all sims do not support it." into sc-dev am: bef9945917 am: 45e7dcb29d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14860439

Change-Id: Ic88d73bb30dcb1408f06bfc793a3493e90810627
 2021-06-08 09:33:53 +00:00
Zoey Chen
cdb94b55dc Merge "[Provider Model] Should not show WiFi call if all sims do not support it." into sc-dev am: bef9945917 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14860439

Change-Id: I6b63442d4bb9053e0dede0789984596047e4e26c
 2021-06-08 09:18:30 +00:00
Zoey Chen
45e7dcb29d Merge "[Provider Model] Should not show WiFi call if all sims do not support it." into sc-dev am: bef9945917 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14860439

Change-Id: Ifac9eb03629115f8793b162a7601c019db06f7f9
 2021-06-08 09:15:09 +00:00
Zoey Chen
bef9945917 Merge "[Provider Model] Should not show WiFi call if all sims do not support it." into sc-dev 2021-06-08 09:03:42 +00:00
Tsung-Mao Fang
015fd6fa49 Merge "Apply accent color for password icon" into sc-dev am: d7a35d95c6 am: 31c24b9c2f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14880639

Change-Id: I2ecba82af0ba792be987e193bdcab04e145d542e
 2021-06-08 08:49:40 +00:00
Tsung-Mao Fang
61ca999696 Merge "Apply accent color for password icon" into sc-dev am: d7a35d95c6 am: 7ccc9ebd19 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14880639

Change-Id: I4375f36946e29c9aa33e864d32a2342bed8fd2a7
 2021-06-08 08:48:42 +00:00
Tsung-Mao Fang
7ccc9ebd19 Merge "Apply accent color for password icon" into sc-dev am: d7a35d95c6 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14880639

Change-Id: I792bbc0c6fb07f3ff037ae1e8dacdc5a039410b7
 2021-06-08 08:35:40 +00:00
Tsung-Mao Fang
31c24b9c2f Merge "Apply accent color for password icon" into sc-dev am: d7a35d95c6 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14880639

Change-Id: Ie7eb60996f7e2d23dde0031a1afbfc33771b98b7
 2021-06-08 08:33:59 +00:00
Edgar Wang
ab7d2349ce Merge "Apply SettingsLib SeekBarPreference to Settings" into sc-dev am: 4aad4a88a7 am: 8485da91e0 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13422705

Change-Id: I6358f4df0d75e30b266b742d17b4119ee7ec04ac
 2021-06-08 08:22:53 +00:00
Tsung-Mao Fang
d7a35d95c6 Merge "Apply accent color for password icon" into sc-dev 2021-06-08 08:21:04 +00:00
Edgar Wang
a28f5c8541 Merge "Apply SettingsLib SeekBarPreference to Settings" into sc-dev am: 4aad4a88a7 am: 58c5ee8f12 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13422705

Change-Id: Ide019cadc23a6dc70c2e5aa9e49c8fa2ad75692f
 2021-06-08 08:15:28 +00:00
Edgar Wang
8485da91e0 Merge "Apply SettingsLib SeekBarPreference to Settings" into sc-dev am: 4aad4a88a7 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13422705

Change-Id: I3c021c104a67d4be61e8355fe8a577367fff0fa0
 2021-06-08 07:40:12 +00:00
Edgar Wang
58c5ee8f12 Merge "Apply SettingsLib SeekBarPreference to Settings" into sc-dev am: 4aad4a88a7 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13422705

Change-Id: Iae60c211cd69c771e754f729f2bfb0374c15ca61
 2021-06-08 07:36:34 +00:00