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
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
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
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
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
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
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
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
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
Tsung-Mao Fang
d7a35d95c6
Merge "Apply accent color for password icon" into sc-dev
2021-06-08 08:21:04 +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
Edgar Wang
4aad4a88a7
Merge "Apply SettingsLib SeekBarPreference to Settings" into sc-dev
2021-06-08 07:23:54 +00:00
SongFerng Wang
392b17bca2
Merge "data usage are not left align other item at Network & internet page" into sc-dev am: 5fd29ebeab
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14880630
Change-Id: I2e56aeaf55a9e66339fa46b9d82e0cc78cca04f1
2021-06-08 06:50:15 +00:00
changbetty
fdd280489b
Reordering the network provider UI for mobile and wifi network item am: a47c2b94fa
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14831308
Change-Id: Ic01796f61fe416cba828ead543869446039f0ef6
2021-06-08 06:50:06 +00:00
SongFerng Wang
5fd29ebeab
Merge "data usage are not left align other item at Network & internet page" into sc-dev
2021-06-08 06:43:17 +00:00
Zoey Chen
3c4ad08086
[Provider Model] Should not show WiFi call if all sims do not support it.
...
Bug: 186587557
Test: atest -c NetworkProviderWifiCallingForSubTest
Change-Id: I56c580a7576f162aca5050e090c324b1d7fdb982
2021-06-08 14:39:41 +08:00
changbetty
a47c2b94fa
Reordering the network provider UI for mobile and wifi network item
...
- Reordering the UI option
- Move the Mobile data network on the top
- Add the divider back (ag/14716097)
Bug: 189912933
Test: Manaul test
Change-Id: I2ebb6429c3d4b5514e18e24f2953917254aa2048
2021-06-08 11:24:30 +08:00
TreeHugger Robot
a96f90a882
Merge "Update string reference" into sc-dev am: df0a84f08a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14831291
Change-Id: I20a77c12b58c4c91945ca488780bcb8307050070
2021-06-08 02:54:01 +00:00
Tsung-Mao Fang
fb589448ff
Apply accent color for password icon
...
We should apply accent color for password icons so that
it can adopt the adpative color from system level.
Test: See the screen, and make sure icons apply accent color
Fix: 189717028
Change-Id: I756e5afad2f3dab53ad096d8f5b05e5fc3a1a064
2021-06-08 10:51:13 +08:00
TreeHugger Robot
df0a84f08a
Merge "Update string reference" into sc-dev
2021-06-08 02:49:07 +00:00
Betty Chang
bf23b43c87
Merge "Remove extra space under "Wi-Fi hotspot" option" into sc-dev am: e07e36f609
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14841815
Change-Id: I5ddb7cc46b87cc038f7f1d603d7eaf5688a9e701
2021-06-08 02:48:31 +00:00
Betty Chang
e07e36f609
Merge "Remove extra space under "Wi-Fi hotspot" option" into sc-dev
2021-06-08 02:31:52 +00:00
Curtis Belmonte
b90d6efe53
Merge "Set background of all face enroll status/footer bars" into sc-dev am: 58864ddc54
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14886676
Change-Id: Ibde1dd02809623e7927864da440c0ee767777101
2021-06-08 02:23:54 +00:00
Curtis Belmonte
58864ddc54
Merge "Set background of all face enroll status/footer bars" into sc-dev
2021-06-08 02:06:55 +00:00
Yanting Yang
9a58d15db6
Merge "Log class name to detect page scroll jank" into sc-dev am: 20177f9b09
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14860444
Change-Id: I996dcf082e9fa2adeaf0ee0ca5fd8eb19dab5379
2021-06-08 01:57:12 +00:00
Yanting Yang
20177f9b09
Merge "Log class name to detect page scroll jank" into sc-dev
2021-06-08 01:34:45 +00:00
Quang Luong
bd79d37bdf
Merge changes from topic "StaleWifiEntries" into sc-dev am: 08e42fa917
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14882873
Change-Id: I3f1dfc689e63c0401c9ebcc76d3a4e347a9bb2f0
2021-06-08 00:32:37 +00:00
Quang Luong
08e42fa917
Merge changes from topic "StaleWifiEntries" into sc-dev
...
* changes:
Add 6 GHz Wifi band to Wifi Network Details
Do not delay updating WifiEntries for first onWifiEntriesUpdated()
2021-06-08 00:12:05 +00:00
Curtis Belmonte
f70d574278
Fix color and asset name for large face enroll icon
...
Don't use extracted color for the large face enroll icon asset shown
on the education and confirmation screens. Also update the name of this
asset to be more accurate and less confusing.
Test: Manual
Bug: 187845699
Change-Id: I1ac1d523f79757caa8aaac6b04b059c2c40fc0de
2021-06-07 16:31:24 -07:00
Curtis Belmonte
ff3401a161
Merge "Apply SUW theme to add/remove button in face settings" into sc-dev am: 2968c05f31
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14885640
Change-Id: I204dca79c1c1204f9b5f6863d8c440746a19dadc
2021-06-07 23:10:17 +00:00
Curtis Belmonte
f13d5d5344
Set background of all face enroll status/footer bars
...
Moves the logic for setting an explicit background on the status and
footer bars shown during face and fingerprint enrollment from
BiometricEnrollIntroduction to BiometricEnrollBase. This ensures that
the status and footer bars on all biometric enroll screens will have
their backgrounds set, preventing the screen content from showing
through.
Test: Manual
Fixes: 190138494
Change-Id: If5050d07d277f51c784daecf80d5e3cdeae0ba49
2021-06-07 15:54:26 -07:00
Curtis Belmonte
2968c05f31
Merge "Apply SUW theme to add/remove button in face settings" into sc-dev
2021-06-07 22:49:52 +00:00
Curtis Belmonte
7dbe83ef5a
Apply SUW theme to add/remove button in face settings
...
Update the button to "Set up Face Unlock" or "Delete face model" shown
on the Face Unlock Settings screen to match the primary button theme
used in Setup Wizard.
Test: Manual
Fixes: 190422391
Change-Id: Ib864cb53f366eec7d1a69c2808d7effc8a0aa05a
2021-06-07 14:02:58 -07:00
Quang Luong
1c7ba38627
Add 6 GHz Wifi band to Wifi Network Details
...
Display 6 GHz for the frequency pref in Wifi Network Details
when connected to a 6 GHz network.
Bug: 184170532
Test: build
Change-Id: I7d10fe0e4c95e6f0ec66c3a179c3c46828eeb545
2021-06-07 11:30:07 -07:00
Edgar Wang
d6b5bbb5cb
Apply SettingsLib SeekBarPreference to Settings
...
Bug: 176818438
Test: robotest
Change-Id: I219878716457ce4bb7cad251bccf5d50d93030a5
2021-06-07 18:09:19 +00:00
Abel Tesfaye
26c9a050da
Merge "Fix for Smart auto rotate text summary not updating after QS toggle is modified" into sc-dev am: c89b3afef5
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14830095
Change-Id: I3a90e04d82ce0c22677c18d6e5a85620b9b910a9
2021-06-07 17:25:31 +00:00
SongFerngWang
5f00af2911
data usage are not left align other item at Network & internet page
...
Screenshot of fixed version: https://screenshot.googleplex.com/66eAFSYJy2FWniB
Bug: 184218687
Test: build pass and check Ui. (pass)
Change-Id: I851ec60f962c5a249b6272919a09444b83fd7bdc
2021-06-07 17:15:07 +00:00
Abel Tesfaye
c89b3afef5
Merge "Fix for Smart auto rotate text summary not updating after QS toggle is modified" into sc-dev
2021-06-07 17:11:13 +00:00
Julia Reynolds
68b08c590f
Merge changes I31066a6f,I081cea0d into sc-dev am: 6d6280c634
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14822912
Change-Id: Icf9f2f46688689962e93f7063160e5beddbfbdd2
2021-06-07 15:08:17 +00:00