Commit Graph

82506 Commits

Author SHA1 Message Date
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
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
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
d7a35d95c6 Merge "Apply accent color for password icon" into sc-dev 2021-06-08 08:21:04 +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
4aad4a88a7 Merge "Apply SettingsLib SeekBarPreference to Settings" into sc-dev 2021-06-08 07:23:54 +00:00
SongFerng Wang
509881ddfd 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: Ia540da21f4161684aad090b23018f72ef05a8db7
2021-06-08 06:52:01 +00:00
changbetty
bf54033e24 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: Icb302b22e1e18537c8784dc71d3483d559245f6b
2021-06-08 06:51:56 +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
c2fe36b100 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: Iccd7cd779ee68d6c208f4e1057cd1baec672d179
2021-06-08 03:03:27 +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
c66236d2a1 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: Ie086f81f81476768139b803c42415b0ad16396b9
2021-06-08 02:35:23 +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
d222b1f1c9 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: I12c73db310033fe6459c10b5b742e8a8e875adf6
2021-06-08 02:27:40 +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
8dbb2194e7 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: Iecd033b5d9163d07f3a0251e0fc9429f1c17a1b8
2021-06-08 01:57:23 +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
cdc0de6e4a 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: I0d4b8bf482e46e03ec11f6415d42531854b72251
2021-06-08 00:34:45 +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
d0d70b1bb8 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: If052643135f39a732e798daf510734bee21da70f
2021-06-07 23:12:02 +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
e592a0a56d 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: Ic0e5a1dd74d27c7d8014ad9bdca8c853aac29827
2021-06-07 17:26:52 +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
77d3f2ec14 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: Ib87eda47612717576f48fb96530b3ae627b94f95
2021-06-07 15:09:40 +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
83ab0dea1d Merge "Fix typo in setting description." into sc-dev am: bd1c4e5fa1
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14843842

Change-Id: I939fe3a8d5ba3dfd8a72503315f939b41b0345cb
2021-06-07 14:33:09 +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
8b53f6ba7f Merge "Revert DND toggle back to a button" into sc-dev am: 5484fd3060
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14801370

Change-Id: Idb404c80fe9d7dcaaf488f4ea0c114e79a8b7dd8
2021-06-07 13:57: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
dc1d8749f3 Merge "Update homepage summaries" into sc-dev am: 8b3f0e8d52
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14847059

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

Change-Id: If5533faccc4e1fb26b112434e7cad8caa698071d
2021-06-07 09:03:42 +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
d19ad8e565 Merge "Update the Bubbles page." into sc-dev am: 1d60ddea0c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14809882

Change-Id: I4873e2b15c26b9348c43cfaa383d8e62fb5b35bc
2021-06-07 08:08:00 +00:00
Stanley Wang
1d60ddea0c Merge "Update the Bubbles page." into sc-dev 2021-06-07 08:04:03 +00:00
TreeHugger Robot
b9041286aa 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: I63c367f653a1c85a238cd8d1fd442bb460eb2f7e
2021-06-07 08:01:42 +00:00
Yanting Yang
e7fbe489d1 Log class name to detect page scroll jank
Bug: 187306869
Test: robotests & take the trace and see the cuj section name

Change-Id: Idbaa62e764323f8c35c101caf2961b6c853c440f
2021-06-07 15:53:20 +08: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
e605b8d705 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev 2021-06-07 06:58:25 +00:00
TreeHugger Robot
f127ff7be0 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: ffe95b65ac -s ours am: a9db8202d9 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I0da5b4402095b9b48c648527c5bc44e4b1f19063
2021-06-07 05:27:59 +00:00