Android/packages_apps_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
93,594 Commits 1 Branch 0 Tags
b4034002b48020c0c9f87d03fe904f2a49895e73
Commit Graph

39198 Commits

Author SHA1 Message Date
Curtis Belmonte
a0847b6130 Merge changes from topic "presubmit-am-50cf8052ea594bbfb9d45e820e7b72cd" into sc-mainline-prod am: 562d29d081 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15585467

Change-Id: Ia95f2c062c6dcdbd40ed5f51bcb7c4fa96dc3f88
 2021-08-17 01:01:21 +00:00
Curtis Belmonte
5cf728d2fc [automerge] Remove/replace old fingerprint icon in SUW/Settings 2p: dc9b53c446 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15585467

Change-Id: Ib847b70e4bc427d4f3c3b78f67a68b63b71d74c8
 2021-08-16 21:44:39 +00:00
Curtis Belmonte
dc9b53c446 Remove/replace old fingerprint icon in SUW/Settings 
Replaces instances of the old fingerprint icon shown during Setup Wizard
or in Settings with either an updated version or an entirely different
icon.

Test: Manual

Fixes: 196600265
Change-Id: If78e8f0dbdb033f557614a019d4c9dde4493b6c6
 2021-08-16 14:44:15 -07:00
TreeHugger Robot
80544241db Merge "Prototyping : Demo Image on color setting" into sc-qpr1-dev am: 7efaff8d0f am: f680c9b0b5 am: 85e6aba27f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15531055

Change-Id: I8e6d18b8be6960be4e1557a07405d65412205b70
 2021-08-14 07:49:54 +00:00
TreeHugger Robot
85e6aba27f Merge "Prototyping : Demo Image on color setting" into sc-qpr1-dev am: 7efaff8d0f am: f680c9b0b5 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15531055

Change-Id: I22f3bf1a65273f70a59cb59018bc9f44d04552b2
 2021-08-14 07:37:41 +00:00
TreeHugger Robot
f680c9b0b5 Merge "Prototyping : Demo Image on color setting" into sc-qpr1-dev am: 7efaff8d0f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15531055

Change-Id: If4c7ffd19e06965e34f5185e63b22d58d3ca08d8
 2021-08-14 07:26:53 +00:00
Adam Bookatz
dc8a5ad008 Merge "Easy app-installing for Guest users" 2021-08-14 01:37:43 +00:00
Joshua Lewis
d16c016142 Merge "Add JobScheduler support in factor controller" 2021-08-14 01:04:34 +00:00
Joshua
76ca8923ab Add JobScheduler support in factor controller 
Initializes the JobScheduler constants string in Global Settings and
takes it through the parsing of creating a map with the key:value pairs
linked to the JobScheduler policy. Also changes the way the getter
methods work to take a factor policy so we can know what policy to
change.

Bug: 195056296
Bug: 195056102
Bug: 195055895

Test: Manual
Change-Id: Id82101b2a045dd14bb8eacfbe51c363b4bafb1ce
 2021-08-13 23:44:59 +00:00
Alex Salo
ec94cff0f6 Merge "Add toggle switch for auto rotate preference in display settings." 2021-08-13 23:24:18 +00:00
Joshua Lewis
a162022d31 Merge "Update AlarmManager Global Settings String" 2021-08-13 22:00:30 +00:00
Joshua
347f58ad6e Update AlarmManager Global Settings String 
Implements methods that update the AlarmManager Global Settings String
when the user confirms a value in the Dialog. updateAlarmManagerValue
takes the key of the factor being edited and the edited value enterd by
the user in the dialog assigning it as the current value of the key.
This a new string is then rebuilt with the updated values and assigned
to be the new Settings Global String.

Bug: 195056102
Bug: 195055895

Test: Manual
Change-Id: I5776822c665bdfa052f23099d367ba8cf29743df
 2021-08-13 19:16:20 +00:00
Joshua Lewis
385d36ac2d Merge "Parse AM Constants to get keys:value for Dialog" 2021-08-13 16:46:31 +00:00
Ayush Sharma
8851afb8ff Merge "Remove refs of isSeparateProfileChallengeAllowed" 2021-08-13 15:49:11 +00:00
Alfred Lin
7f8e775754 Prototyping : Demo Image on color setting 
Implement prototyping of demo image on color setting

Bug: 182797883
Test: adb shell am instrument -w -e class com.android.settings.display.ColorModePreferenceFragmentTest com.android.settings.tests.unit/androidx.test.runner.AndroidJUnitRunner test pass
Change-Id: Iebaaa6867f2039a25a5e1fd280a89b5bc9297e6b
 2021-08-13 15:08:58 +00:00
TreeHugger Robot
03a9dfe57f Merge "Handle spanned conversation labels" into sc-qpr1-dev am: 1741d5d12c am: 597ca951a9 am: fb60c7664f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15546623

Change-Id: If8185fd1c7cfca44264e3339b87b3cae3fd574e1
 2021-08-13 05:53:35 +00:00
TreeHugger Robot
fb60c7664f Merge "Handle spanned conversation labels" into sc-qpr1-dev am: 1741d5d12c am: 597ca951a9 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15546623

Change-Id: I5c096d2b447c8012dc7b7cd27598585651123e60
 2021-08-13 05:38:45 +00:00
TreeHugger Robot
597ca951a9 Merge "Handle spanned conversation labels" into sc-qpr1-dev am: 1741d5d12c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15546623

Change-Id: I31d94c633afda15f05d660e6854c2b6c552a6d7a
 2021-08-13 04:27:14 +00:00
TreeHugger Robot
1741d5d12c Merge "Handle spanned conversation labels" into sc-qpr1-dev 2021-08-13 04:11:04 +00:00
TreeHugger Robot
82e113be62 Merge "Don't show Wi-Fi icon if the level is -1" 2021-08-13 03:35:58 +00:00
Joe Bolinger
6512f20958 Merge "Refresh biometric preference controllers on lifecycle events." into sc-dev am: c78af9a272 am: 36f4314136 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15520813

Change-Id: I5e761d2822d9787ad8d26fd41bc5daf1bad1754e
 2021-08-13 02:58:21 +00:00
Joe Bolinger
ba21ddcc35 Merge "Refresh biometric preference controllers on lifecycle events." into sc-dev am: c78af9a272 am: 74efeebf5c am: 0c8e25d2f6 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15520813

Change-Id: I2628d6122ec21c0ce65b22d6e880adde90dd0dfa
 2021-08-13 02:56:11 +00:00
Kevin Chyn
d9123f2bc9 Do not show work profile strings for parent-managed enrollment am: 570540b15c am: 61c508e0a8 am: 65f7fbcd8f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15546128

Change-Id: I888bc6147611ce740472046327efe1b1a2b9c777
 2021-08-13 01:26:53 +00:00
Kevin Chyn
e6661b94f8 Do not show work profile strings for parent-managed enrollment am: 570540b15c am: e36aa5bc78 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15546128

Change-Id: Ice3ec41dd188c2797bf3516de9ee1b02b98997b4
 2021-08-13 01:19:34 +00:00
Joe Bolinger
2c0b7fdb90 Merge "Refresh biometric preference controllers on lifecycle events." into sc-dev am: c78af9a272 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15520813

Change-Id: Ia879a9fc3d00f2a04062d58df740fcb0c7281c93
 2021-08-13 01:16:37 +00:00
Kevin Chyn
65f7fbcd8f Do not show work profile strings for parent-managed enrollment am: 570540b15c am: 61c508e0a8 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15546128

Change-Id: I6ad451623bc795613b8e2ed4a77c81715969100f
 2021-08-13 01:16:36 +00:00
Joe Bolinger
0c8e25d2f6 Merge "Refresh biometric preference controllers on lifecycle events." into sc-dev am: c78af9a272 am: 74efeebf5c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15520813

Change-Id: Ibc1f8a07a645d6b7749c0af4a4b47a7c8e33a6de
 2021-08-13 01:16:00 +00:00
Kevin Chyn
9e7a7cc40e Do not show work profile strings for parent-managed enrollment am: 570540b15c am: a92e3d9a03 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15546128

Change-Id: I6c26b77b1539be5ef128250f3bb82d731434ac3a
 2021-08-13 01:15:52 +00:00
Joe Bolinger
74efeebf5c Merge "Refresh biometric preference controllers on lifecycle events." into sc-dev am: c78af9a272 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15520813

Change-Id: I28682e9fbbbb6c83b08ef45f10fd923d156c7742
 2021-08-13 01:14:44 +00:00
Joe Bolinger
c78af9a272 Merge "Refresh biometric preference controllers on lifecycle events." into sc-dev 2021-08-13 01:08:16 +00:00
Kevin Chyn
61c508e0a8 Do not show work profile strings for parent-managed enrollment am: 570540b15c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15546128

Change-Id: Icf7a5685809ee27143391ea9215de680b3b33094
 2021-08-13 01:01:35 +00:00
Kevin Chyn
a92e3d9a03 Do not show work profile strings for parent-managed enrollment am: 570540b15c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15546128

Change-Id: I626b65d8db83f232ca4d173697dfb5d62e60d39d
 2021-08-13 00:59:39 +00:00
Joshua
7b2293ef9a Parse AM Constants to get keys:value for Dialog 
Takes the AlarmManager csv string and parsees it for key:value
pairs. These key value pairs are then used to fill in information that
the DialogFragment class needs to display information. An ArrayMap is
used to initialize and store a key and the values associated with it
through a data object class. This data can be retrived in updated by
providing only a key.

Bug: 195056296
Bug: 195056102
Bug: 195055428

Test: Manual
Change-Id: Ia11f41bdd1790f7f3483d33148c251c58243e890
 2021-08-13 00:12:24 +00:00
Kevin Chyn
570540b15c Do not show work profile strings for parent-managed enrollment 
Work profiles and parental management both utilize the
DevicePolicyManager KEYGUARD_DISABLE_* flags. This CL ensures that
work profile strings are only shown for work profiles, and not
parent-managed devices.

Bug: 196060286
Bug: 196443744
Test: Set up child account, then enroll from Settings > Security
Change-Id: Ib5ed1d63dd5d58ac64caf30010e340ac7784c38f
 2021-08-12 15:56:38 -07:00
TreeHugger Robot
1d441b72c5 Merge "Update UI when TARE settings revert to default" 2021-08-12 22:52:55 +00:00
Julia Reynolds
2ffbb747d4 Handle spanned conversation labels 
Test: Robotests
Fixes: 194446117
Change-Id: If21f727e00b181f0da127b09e5a1c46ec3257836
 2021-08-12 20:11:00 +00:00
Weng Su
7e14668094 Don't show Wi-Fi icon if the level is -1 
Bug: 195893448
Test: manual test
make RunSettingsRoboTests
ROBOTEST_FILTER=NetworkRequestDialogFragmentTest

Change-Id: Ifddc9aace42d1f024b7c861b1207f651061d790b
 2021-08-12 23:04:31 +08:00
TreeHugger Robot
0bf6164584 Merge "[Settings] WFC preference will be grey out after disconnecting the call" 2021-08-12 10:52:24 +00:00
YUKAI HUNG
25a6752ac7 Merge "Add time unit into battery usage chart and refine some UI" into sc-v2-dev am: cb2ec5399c am: cdc43dfc73 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15530296

Change-Id: I6c7be98e5752bcdfffb00b94333ed052ac2f9f9e
 2021-08-12 07:31:13 +00:00
YUKAI HUNG
cdc43dfc73 Merge "Add time unit into battery usage chart and refine some UI" into sc-v2-dev am: cb2ec5399c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15530296

Change-Id: I9551360d2c78279677efa94ae6cda28e98e04196
 2021-08-12 07:17:48 +00:00
YUKAI HUNG
707b73ea36 Merge "[Robustness] protect get battery stats from DeadSystemException" into sc-v2-dev am: 3eddc31560 am: 78be413280 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15527095

Change-Id: I98038e83cbb7c96157265e1edcfd2c7705f4c931
 2021-08-12 07:08:00 +00:00
YUKAI HUNG
78be413280 Merge "[Robustness] protect get battery stats from DeadSystemException" into sc-v2-dev am: 3eddc31560 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15527095

Change-Id: I84d4c47386543e3f1d88663e1f3dfeca0668b317
 2021-08-12 06:59:36 +00:00
YUKAI HUNG
cb2ec5399c Merge "Add time unit into battery usage chart and refine some UI" into sc-v2-dev 2021-08-12 06:46:26 +00:00
Treehugger Robot
c156dd95fb Merge "Add owner to the connected device folder" am: 6cbb4dfbe1 am: 004f5168d4 am: f5ddc8ffaa am: 79978071e2 am: b41e35a304 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1793371

Change-Id: Ic8f5ee6abc79ea05d1b8b822ff652c466c8a9135
 2021-08-12 05:45:45 +00:00
Treehugger Robot
b41e35a304 Merge "Add owner to the connected device folder" am: 6cbb4dfbe1 am: 004f5168d4 am: f5ddc8ffaa am: 79978071e2 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1793371

Change-Id: I6815488dcd2599c423d7f197fc93983ae5184793
 2021-08-12 05:35:45 +00:00
Treehugger Robot
79978071e2 Merge "Add owner to the connected device folder" am: 6cbb4dfbe1 am: 004f5168d4 am: f5ddc8ffaa 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1793371

Change-Id: I1d0d6dd5c519aa6931771135dbc13c51c82ce8c0
 2021-08-12 05:07:07 +00:00
Treehugger Robot
f5ddc8ffaa Merge "Add owner to the connected device folder" am: 6cbb4dfbe1 am: 004f5168d4 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1793371

Change-Id: Ic41c5d666d0740dc8a6f4bdbb9e644ad981adee1
 2021-08-12 04:54:18 +00:00
Treehugger Robot
6cbb4dfbe1 Merge "Add owner to the connected device folder" 2021-08-12 04:23:29 +00:00
ykhung
fbbcc55fc0 Add time unit into battery usage chart and refine some UI 
- add time unit into battery chart for 12/24 hours
- refine the radius size for chart bar
- use fixed font size for timestamp and percentage

screenshots:
24-hour format: https://screenshot.googleplex.com/3VNedE2nAx6LrXu
12-hour format: https://screenshot.googleplex.com/3tpTXjYfrasrenW
fixed-size: https://screenshot.googleplex.com/nPRKm7XCkmFzW6K

Bug: 194836607
Test: make SettingsRoboTests
Change-Id: I5b35b0fa808eb8a5f607962ee973c2896529b078
 2021-08-12 03:59:39 +00:00
ykhung
ad346e12d5 [Robustness] protect get battery stats from DeadSystemException 
In some corner cases, we will receive the DeadSystemException from
BatteryStatService when invoking getBatteryUsageStats() method. Before
this issue is resolved by BatteryStatService team, we will add some
protections to avoid Settings app is crashed.

Bug: 195306545
Bug: 195467687
Test: make SettingsRoboTests
Change-Id: I75fcf63f4f69d86d6dce0e12bd4d738b1219ae47
 2021-08-12 03:53:14 +00:00