Commit Graph

36890 Commits

Author SHA1 Message Date
Jakub Pawlowski
54e74cae5f Fix app name label spoofing
Fix idea was copied from
frameworks/base/core/java/android/accounts/ChooseAccountActivity.java

Bug: 183710549
Test: verified with POC app from bug that the fix is working
Change-Id: I40131965ed0d1e11cdf4b56daef39a95b80fdd7d
2021-04-27 17:06:59 +00:00
ykhung
10000eb254 Draw timestamp information into BatteryChartView manually (2/2)
screenshot: https://screenshot.googleplex.com/8zJcMJeMDovfhdD

Bug: 183921876
Test: make SettingsRoboTests
Change-Id: I276f70c3cf8ebd2316f987ace0d6537ed2cf8a45
2021-04-27 16:55:13 +00:00
Adam Bookatz
4b47ce7659 Merge "UserDetailsSettings uses Guest string, not Guest name" into sc-dev am: e035a81ddc
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14282598

Change-Id: I18737caa0626ad2eac6fd93e6c6d564020066724
2021-04-27 16:46:22 +00:00
Adam Bookatz
e035a81ddc Merge "UserDetailsSettings uses Guest string, not Guest name" into sc-dev 2021-04-27 16:35:37 +00:00
Alex Johnston
a942f3fdd1 Correct string ConfirmDeviceCredentialActivity
* If there is a managed profile but a separate
  profile challenge is not enabled, use the device
  title and subtitle in ConfirmDeviceCredentialActivity.

Manual testing
* Set device PIN
* Create a work profile using TestDPC
* adb shell am start --user 10 -a android.app.action.CONFIRM_DEVICE_CREDENTIAL
* Verify title says 'Enter your device...'
* Add a work profile PIN
* adb shell am start --user 10 -a android.app.action.CONFIRM_DEVICE_CREDENTIAL
* Verify title says 'Enter your work...'
* Do the same for pattern and password

Bug: 163108636
Test: manual testing
Change-Id: I8b61e7d2df5792cbdb2e12b19e5a5582ea2290b7
2021-04-27 16:35:42 +01:00
YUKAI HUNG
f81503e7bc Merge "Draw timestamp information into BatteryChartView manually (1/2)" into sc-dev am: 95b5d0393d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14319865

Change-Id: I894265d5ef62befca05fbff6b9f51754288f2fa0
2021-04-27 09:43:19 +00:00
Jeremy Goldman
a9b19776f8 Merge "Combine 5G and recommended strings" into sc-dev am: f1ee6987e6
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14233637

Change-Id: I979e3a78742eeca8405e4cb5be1bc7f0fe8cad3c
2021-04-27 09:43:09 +00:00
YUKAI HUNG
95b5d0393d Merge "Draw timestamp information into BatteryChartView manually (1/2)" into sc-dev 2021-04-27 09:19:17 +00:00
Peter_Liang
50efd602b9 Update the BC style for the vision settings in SuW.
Bug: 179234608
Test: manual test
Change-Id: I152eaab8ad77c7a1fccbc82d7ed8cef406fc1821
2021-04-27 16:29:56 +08:00
Jeremy Goldman
f1ee6987e6 Merge "Combine 5G and recommended strings" into sc-dev 2021-04-27 07:41:45 +00:00
ykhung
2f441d2a3e Draw timestamp information into BatteryChartView manually (1/2)
screenshot: https://screenshot.googleplex.com/8zJcMJeMDovfhdD

Bug: 183921876
Test: make SettingsRoboTests
Change-Id: Ib4ac21ba2d12a6cb65b46ba3f1023fe9f14c539b
2021-04-27 07:25:53 +00:00
Lucas Lin
00eb4bbf58 Merge "Use [set|get]PrivateDnsMode directly" into sc-dev am: 614f653aeb
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14230401

Change-Id: Ib5143bd894b26b93681f5330bbe681dbc903c492
2021-04-27 06:15:06 +00:00
Lucas Lin
614f653aeb Merge "Use [set|get]PrivateDnsMode directly" into sc-dev 2021-04-27 06:03:14 +00:00
Joy Babafemi
8dce1c8da7 Merge "Update UWB toggle state with a getter API" into sc-dev am: 4b19eae08b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14283946

Change-Id: I34f3cbe25b051f269f1e4359662919b97fc911d0
2021-04-27 05:26:53 +00:00
Joy Babafemi
4b19eae08b Merge "Update UWB toggle state with a getter API" into sc-dev 2021-04-27 05:10:52 +00:00
Joy Babafemi
7cf391dddd Update UWB toggle state with a getter API
Also updates capitalization for strings

Test: Manual on Raven & Robotest
Bug: 183254940
Change-Id: I9d3a4694746b44e80c60a9097abd0cbb647c1348
2021-04-27 03:46:39 +00:00
Dmitri Plotnikov
9fac937e35 Merge "Replace TIME_COMPONENT_... constants with POWER_COMPONENT_ constants" into sc-dev am: dd9c9a8c17
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14298485

Change-Id: I94de1fe24348462df7a73317ec6fd0f5dcb84fa6
2021-04-26 22:47:40 +00:00
Dmitri Plotnikov
dd9c9a8c17 Merge "Replace TIME_COMPONENT_... constants with POWER_COMPONENT_ constants" into sc-dev 2021-04-26 22:44:26 +00:00
Evan Chen
404dbe7c55 Merge "Companion Device App showing in Settings" into sc-dev am: e14cc634dc
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14148351

Change-Id: I272037634069cb76cea518abafbb09b62f7127a9
2021-04-26 18:59:25 +00:00
Evan Chen
e14cc634dc Merge "Companion Device App showing in Settings" into sc-dev 2021-04-26 18:22:02 +00:00
YUKAI HUNG
a88dcb1a8e Merge "Draw percentage information into BatteryChartView manually" into sc-dev am: f634831de7
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14297854

Change-Id: I9afea9281b763fba993d7f4ce2d708a6ae75289a
2021-04-26 12:08:40 +00:00
ykhung
1001614b14 Draw percentage information into BatteryChartView manually
screen: https://screenshot.googleplex.com/Bw4Whpzff5pCT5J

Bug: 183921876
Test: make SettingsRoboTests
Test: make SettingsGoogleRoboTests
Change-Id: I61c0f73e27dc2980d0812e00c2fdfda9a628b696
2021-04-26 07:53:49 +00:00
TreeHugger Robot
e68a91fdc0 Merge "Show security screen for ACTION_PROCESS_WIFI_EASY_CONNECT_URI intent" into sc-dev am: 5f876de174
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14292670

Change-Id: Ie1d96e81e00c4c9f4538163dadc023e73284ed34
2021-04-26 07:35:04 +00:00
TreeHugger Robot
5f876de174 Merge "Show security screen for ACTION_PROCESS_WIFI_EASY_CONNECT_URI intent" into sc-dev 2021-04-26 07:16:02 +00:00
TreeHugger Robot
4a1d52b1d6 Merge "Make app usage page support legacy version" into sc-dev am: e39066c388
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14271580

Change-Id: I344c03d0ba485cc6295cb5bc835fb77e352b05bb
2021-04-26 06:39:58 +00:00
Betty Chang
ecb3845e5c Merge "Add TextWatcher for the ip config field" into sc-dev am: 75d6293a50
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14299194

Change-Id: Id751806a7e6da912e837a1fb8b08805594726a3e
2021-04-26 06:39:44 +00:00
TreeHugger Robot
e39066c388 Merge "Make app usage page support legacy version" into sc-dev 2021-04-26 06:34:28 +00:00
Betty Chang
75d6293a50 Merge "Add TextWatcher for the ip config field" into sc-dev 2021-04-26 06:17:56 +00:00
Wesley.CW Wang
d67f878c67 Make app usage page support legacy version
- Add a flag to divide legacy and new design
 - Add new layout for tristate design

Bug: 178197718
Test: make SettingsRoboTests
Change-Id: I61f694cad8ac9cea8195191feacbe80bac2df62e
2021-04-26 13:18:33 +08:00
jasonwshsu
2b25e11bf6 Wrap a white adaptive background if it is not an AdaptiveIcon am: 9b284a9af1
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14233640

Change-Id: I7793936888172a994195a11837acfd85cd435a9d
2021-04-26 05:18:14 +00:00
jasonwshsu
9b284a9af1 Wrap a white adaptive background if it is not an AdaptiveIcon
Bug: 183501919
Test: manual test
Change-Id: I6a899aa0fcb724d5318274190f359080fc2d0615
2021-04-26 05:01:00 +00:00
changbetty
244268b98d Add TextWatcher for the ip config field
[Root Cause]
We always check the valid for the ip config field. If the text is empty
we will set the default for user even if user deleted the values.

[Solution]
Add TextWatcher for the ip config field (include gateway/network prefix
length/dns1). If the text change and the text is empty, we will set the
hint for user, not the default.

Bug: 179331339
Test: manual test
       make RunSettingsRoboTests ROBOTEST_FILTER=WifiConfigController2
Change-Id: I1976200c70ae768285a44aff5df54ced00a78171
2021-04-26 12:53:08 +08:00
YUKAI HUNG
fd927adec3 Merge "Wrap and carry clicked slot information data for restriction page" into sc-dev am: 8ec6502699
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14299196

Change-Id: I40aeb90b7b175e0e6bba671931b63b5b28234b29
2021-04-26 04:04:38 +00:00
YUKAI HUNG
8ec6502699 Merge "Wrap and carry clicked slot information data for restriction page" into sc-dev 2021-04-26 03:43:50 +00:00
TreeHugger Robot
81850c1a7a Merge "Fix unable to change language" into sc-dev am: 4cc4b47adf
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14292671

Change-Id: I2abb035fc3b86649772562072487d996e9cb09e0
2021-04-26 03:27:04 +00:00
TreeHugger Robot
4cc4b47adf Merge "Fix unable to change language" into sc-dev 2021-04-26 03:11:34 +00:00
Joshua Mccloskey
ecdce82c6f Merge "Updated settings for new get/set feature change" into sc-dev am: 5487f2fa6c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14202131

Change-Id: Ia1eb05aabe80e2617c6854a18852423ee3ecfaf2
2021-04-25 23:29:19 +00:00
Joshua Mccloskey
5487f2fa6c Merge "Updated settings for new get/set feature change" into sc-dev 2021-04-25 23:20:35 +00:00
ykhung
f64775502a Fix incorrect battery history merging logic to cause data losing am: 5e578ddd13
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14299195

Change-Id: I746e0ef1f7330d78f001c1b1ce92beac5464597b
2021-04-25 11:23:33 +00:00
ykhung
1d54252b9f Refresh category title by different time slot condition am: 41fd8a7494
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14299187

Change-Id: I394b045149277fff4bf4712849ef300a50c99b7d
2021-04-25 11:23:31 +00:00
ykhung
75c5fc5906 Wrap and carry clicked slot information data for restriction page
Refresh category title by different time slot condition

Bug: 177406865
Test: make SettingsRoboTests
Test: make SettingsGoogleRoboTests
Change-Id: I006f6825fdb471f863c0355c65bfc4ca9d980191
2021-04-25 11:05:03 +00:00
ykhung
5e578ddd13 Fix incorrect battery history merging logic to cause data losing
Bug: 184807417
Test: make SettingsRoboTests
Test: make SettingsGoogleRoboTests
Change-Id: Ic26799f4d95b9f990e873ee26a42d6cc0c404659
2021-04-25 08:35:55 +00:00
ykhung
41fd8a7494 Refresh category title by different time slot condition
Bug: 177406865
Bug: 185187729
Test: make SettingsRoboTests
Test: make SettingsGoogleRoboTests
Change-Id: Ib124e1cfb9549f838540ff547bc616049f65180d
2021-04-25 07:47:31 +00:00
Eugene Susla
7dc2624b51 Companion Device App showing in Settings
Added a feature that users are able to see/remove the apps' associations
in Settings/Connected devices.
It will display the icon of the associations app, app's name and a button
that users are able to remove the associations. Also it will pop up a
dialog alerting user before remove the associations.

Screenshot:
https://screenshot.googleplex.com/APSRhW2retYmAAK

Bug: 165951651
Test: Manually Test

Change-Id: Iccaeaf516e8a78d4ef33415c1c2d7379139ec88c
2021-04-24 21:31:25 +00:00
Santos Cordon
b7d64ed7e7 Merge "Use new getBrighntessInfo() API for brightness" into sc-dev am: 219dabcabf
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14076526

Change-Id: I0541a077707c635124bd89211f154234cad81c84
2021-04-24 15:59:26 +00:00
Santos Cordon
219dabcabf Merge "Use new getBrighntessInfo() API for brightness" into sc-dev 2021-04-24 15:38:20 +00:00
YUKAI HUNG
ab4e189c58 Merge "Add test cases for utcToLocalTime in the ConvertUtils" into sc-dev am: 230c3f2de0
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14296275

Change-Id: Ice2a60064723c72f6203a9fb06edc0fcd58192e2
2021-04-24 13:15:33 +00:00
YUKAI HUNG
230c3f2de0 Merge "Add test cases for utcToLocalTime in the ConvertUtils" into sc-dev 2021-04-24 13:03:08 +00:00
ykhung
ef6cea8c84 Add test cases for utcToLocalTime in the ConvertUtils
Bug: 177406865
Bug: 185187729
Test: make SettingsRoboTests
Test: make SettingsGoogleRoboTests
Change-Id: I22bda2db821e69c40202db692ada52e96af25e16
2021-04-24 13:41:45 +08:00
Julia Reynolds
6847795ce6 Merge "Move preference loading to a background thread" into sc-dev am: 9d77efb7e7
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14297890

Change-Id: I95ff44498dd066c991dad2e152a5a764b5f3ef50
2021-04-24 00:53:28 +00:00