Android/packages_apps_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
88,254 Commits 1 Branch 0 Tags
f1b7cf56e409383f6cd8a84ff98268564bc40a6c
Commit Graph

24056 Commits

Author SHA1 Message Date
Curtis Belmonte
aa8db47c7b Merge "Fix color and asset name for large face enroll icon" into sc-dev am: 99faae35fc am: 873b52cb69 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14887393

Change-Id: I03d0513a44f054af5d2a49fbdd405cfbc227c3c3
 2021-06-08 19:59:05 +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
Giuliano Procida
7362a2b843 Merge "Revert "Apply SettingsLib SeekBarPreference to Settings"" into sc-dev am: ef0e09f7a3 am: d26cb5c9a9 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14880698

Change-Id: Id629bec6759ee8611f842d7ee7c840fe077a298e
 2021-06-08 10:04:28 +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
1c6f83544a Merge "[Provider Model] Should not show WiFi call if all sims do not support it." into sc-dev am: bef9945917 am: c5d3d68289 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14860439

Change-Id: Ic5035c9739d096dd7026f5e76783b1d07db3d7fb
 2021-06-08 09:32:33 +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
aab150e789 Merge "Apply accent color for password icon" into sc-dev am: d7a35d95c6 am: d0f6bef80b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14880639

Change-Id: I7ca705a73b417b00897419544119739a0f7a85d2
 2021-06-08 08:48:13 +00:00
Edgar Wang
79f237ef42 Merge "Apply SettingsLib SeekBarPreference to Settings" into sc-dev am: 4aad4a88a7 am: 5863ab2406 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13422705

Change-Id: I1326a91377255abf12cc4a40e2268c8609ca7c90
 2021-06-08 08:22:13 +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
4aad4a88a7 Merge "Apply SettingsLib SeekBarPreference to Settings" into sc-dev 2021-06-08 07:23:54 +00:00
SongFerng Wang
600adf1644 Merge "data usage are not left align other item at Network & internet page" into sc-dev am: 5fd29ebeab am: 94a69b2762 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14880630

Change-Id: I73e1a105e3fd6802a52e48cd060c04a03970ec54
 2021-06-08 07:07:51 +00:00
changbetty
f41e514880 Reordering the network provider UI for mobile and wifi network item am: a47c2b94fa am: a776f406eb 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14831308

Change-Id: Idfd8843ec733a3891587ce0d751a9f2dde7ded37
 2021-06-08 07:06:11 +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
53adf04f1f Merge "Update string reference" into sc-dev am: df0a84f08a am: 3121b421fb 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14831291

Change-Id: I694a4ffcca4d47ec26dc0c18edfda17d3bb9f901
 2021-06-08 03:02: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
63b71c4484 Merge "Remove extra space under "Wi-Fi hotspot" option" into sc-dev am: e07e36f609 am: a17725dabc 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14841815

Change-Id: I60d8fc582669d36f48a533f2674d1451b587bbab
 2021-06-08 02:49:04 +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
Quang Luong
b03c9a2c99 Merge changes from topic "StaleWifiEntries" into sc-dev am: 08e42fa917 am: 09e721831b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14882873

Change-Id: I7bb5d9cfd26e3b3b317224e1e6a675206f7073a6
 2021-06-08 00:48:00 +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
6a8fc5ebc0 Merge "Apply SUW theme to add/remove button in face settings" into sc-dev am: 2968c05f31 am: 15b30be39e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14885640

Change-Id: I5b005e27de8fd6ab28475c6b81bc62ab19e9a093
 2021-06-07 23:33:04 +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
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
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
Julia Reynolds
fd8aa833cf Merge changes I31066a6f,I081cea0d into sc-dev am: 6d6280c634 am: b03f1946c1 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14822912

Change-Id: Ieaec6e4e30244a9ab4611b8c738d502d2218bca4
 2021-06-07 15:22:15 +00:00
Julia Reynolds
6d6280c634 Merge changes I31066a6f,I081cea0d into sc-dev 
* changes:
  Fix broken test
  Updates to conversation page
 2021-06-07 14:50:00 +00:00
Matt Casey
d476ffd3de Merge "Fix typo in setting description." into sc-dev am: bd1c4e5fa1 am: 5e6d42bf1e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14843842

Change-Id: Iddad11b138f58708d1b3927feb1c6c3b9a67558a
 2021-06-07 14:47:15 +00:00
Matt Casey
bd1c4e5fa1 Merge "Fix typo in setting description." into sc-dev 2021-06-07 14:17:15 +00:00
Matt Casey
7364e42f74 Fix typo in setting description. 
Repeated word

Test: None
Bug: 179673792
Change-Id: Iee75c37fce90e1c05f651d741374029c213fa0f0
 2021-06-07 14:17:03 +00:00
TreeHugger Robot
4d45474cc9 Merge "Revert DND toggle back to a button" into sc-dev am: 5484fd3060 am: 326d9d2129 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14801370

Change-Id: Idc82b6b47ee782dd5462198edc3a04861f0fa9a0
 2021-06-07 14:16:34 +00:00
TreeHugger Robot
5484fd3060 Merge "Revert DND toggle back to a button" into sc-dev 2021-06-07 13:40:54 +00:00
Yanting Yang
154e9a0b31 Merge "Update homepage summaries" into sc-dev am: 8b3f0e8d52 am: 8cb77c6609 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14847059

Change-Id: I513c48904601cb376de0ee50277a21a0c452821b
 2021-06-07 11:21:28 +00:00
Yanting Yang
8b3f0e8d52 Merge "Update homepage summaries" into sc-dev 2021-06-07 10:55:08 +00:00
TreeHugger Robot
ef6e2fa01a Merge "Rename Wi-Fi switch controller's key" into sc-dev am: d29e28ed5b am: aba2346cb3 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14878870

Change-Id: I6fca72be41d2c2e0f5528fbf2a7e47660e92ffbf
 2021-06-07 09:16:37 +00:00
TreeHugger Robot
d29e28ed5b Merge "Rename Wi-Fi switch controller's key" into sc-dev 2021-06-07 08:48:37 +00:00
Stanley Wang
1318447470 Merge "Update the Bubbles page." into sc-dev am: 1d60ddea0c am: d19ad8e565 am: ab629099ed 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14809882

Change-Id: I3f7d05cdfa0aa36552482cb10d48d9398b022874
 2021-06-07 08:34:00 +00:00
Stanley Wang
ab629099ed Merge "Update the Bubbles page." into sc-dev am: 1d60ddea0c am: d19ad8e565 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14809882

Change-Id: I5b99eced55bc34b20fbe32d8bec158ea7e44a8bf
 2021-06-07 08:19:46 +00:00
TreeHugger Robot
e4748374d0 Merge "Increase the maximum height of panel fragment" into sc-dev am: 8fdc0b9d32 am: b4968ee8b5 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14841827

Change-Id: Ia0dd78b43874cc24ac92402e96baa712967f434c
 2021-06-07 08:12:57 +00:00
Stanley Wang
1d60ddea0c Merge "Update the Bubbles page." into sc-dev 2021-06-07 08:04:03 +00:00
TreeHugger Robot
8c3f175a04 Merge "Increase the maximum height of panel fragment" into sc-dev am: 8fdc0b9d32 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14841827

Change-Id: I29ee837a1674349c1db05f254808879572d84521
 2021-06-07 07:57:52 +00:00
TreeHugger Robot
8fdc0b9d32 Merge "Increase the maximum height of panel fragment" into sc-dev 2021-06-07 07:38:45 +00:00
Jason Chiu
fe01ecc052 Rename Wi-Fi switch controller's key 
Leverage the key of WifiPrimarySwitchPreferenceController for Settings
Search mapping it to the slice

Bug: 186181785
Test: manual, robotest
Change-Id: I1372afff93f01505c377e94b648e6f8dcbbafe54
 2021-06-07 15:08:59 +08:00
TreeHugger Robot
64d8b0e787 Merge "Import translations. DO NOT MERGE ANYWHERE" 2021-06-07 05:06:47 +00:00
TreeHugger Robot
0bf071e6c0 Merge "Import translations. DO NOT MERGE ANYWHERE" 2021-06-07 04:49:27 +00:00