PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
81,274 Commits 1 Branch 0 Tags
9891597029f57959defb5a0ecc500395d804e46b
Commit Graph

81274 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
TreeHugger Robot
9891597029 Merge "Fix several challenge paths" into sc-dev am: fcb325c562 am: 1533fd1e11 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14342148

Change-Id: Iabc503b1abd3b3db6ab51747877552378f2cdaf1
 2021-04-29 03:41:36 +00:00
TreeHugger Robot
7063ea4ef1 Merge "Remove icons of Location Services and App location permissions" into sc-dev am: 3eb980d41b am: 3006e0473b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14341501

Change-Id: Icda24f75b8f45bf6aa1bd38633c07208fae98cb1
 2021-04-29 03:37:51 +00:00
TreeHugger Robot
1533fd1e11 Merge "Fix several challenge paths" into sc-dev am: fcb325c562 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14342148

Change-Id: I0c64891c95e3ad09dd8afb431a943a6d12dd6839
 2021-04-29 02:47:12 +00:00
TreeHugger Robot
3006e0473b Merge "Remove icons of Location Services and App location permissions" into sc-dev am: 3eb980d41b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14341501

Change-Id: Ic61d297a31265d0e36c2959eff512ffe326a7254
 2021-04-29 02:46:24 +00:00
TreeHugger Robot
fcb325c562 Merge "Fix several challenge paths" into sc-dev 2021-04-28 23:48:32 +00:00
TreeHugger Robot
3eb980d41b Merge "Remove icons of Location Services and App location permissions" into sc-dev 2021-04-28 23:46:54 +00:00
Kevin Chyn
1f0cd17e3e Fix several challenge paths 
1) Combined settings page should finish() when losing foreground
   (but not if fingerprint or face settings are launched from it)
2) Challenge should be generated when entering FaceSettings or
   FingerprintSettings each time. This allows us to leave the existing
   revokeChallenge paths in FaceSettings and FingerprintSettings.

Fixes: 186257202
Test: Manual

Change-Id: I1b6452f787279001a71628f220c01fcb86b88f3d
 2021-04-28 13:01:28 -07:00
TreeHugger Robot
cfc3968b4e Merge "Apply settings page transition" into sc-dev am: d3de9a1352 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14292669

Change-Id: I07dd19e42f3b1956ae401ac2cd99d4f8c5db57c4
 2021-04-28 14:01:19 +00:00
TreeHugger Robot
d3de9a1352 Merge "Apply settings page transition" into sc-dev 2021-04-28 13:41:04 +00:00
TreeHugger Robot
dd31e73878 Merge "Tweak spacing for private DNS mode dialog" into sc-dev am: b07079dab8 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14319873

Change-Id: I6163e9dc52fe9634da1b6ab4b8477e3e8d7e1893
 2021-04-28 12:20:26 +00:00
TreeHugger Robot
b07079dab8 Merge "Tweak spacing for private DNS mode dialog" into sc-dev 2021-04-28 12:01:57 +00:00
TreeHugger Robot
77f7afac7a Merge "Make collapsing toolbar load font synchronously" into sc-dev am: 9d3442bd47 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14327008

Change-Id: If105c32959e2b7f4641581c1b99b30a859abfab4
 2021-04-28 09:35:08 +00:00
Hugh Chen
433dbcc6f7 Fix usb tethering switch back to none after off/on the screen am: ddafb202bd 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14297855

Change-Id: I023176a52a05b7aa0c9d45357f198c8363250286
 2021-04-28 09:34:59 +00:00
Yi-Ling Chuang
58813f7b6c Apply settings page transition 
This change applies Shared X-Axis transition across settings pages. For
injected settings, the injected apps have to also apply the same
transition to take effect.

Fixes: 177479937
Test: robotests and navigate through settings pages
Change-Id: I6241860766f5969428faf9a5b3730a7614fdcd92
 2021-04-28 17:29:49 +08:00
TreeHugger Robot
9d3442bd47 Merge "Make collapsing toolbar load font synchronously" into sc-dev 2021-04-28 09:29:24 +00:00
Hugh Chen
ddafb202bd Fix usb tethering switch back to none after off/on the screen 
This CL adds conditions to check whether usb is connected or not.
If usb is not connected or tethering is not started don't update the
state.

Bug: 157709648
Test: make RunSettingsRoboTests -j56
Change-Id: Ifbf5900923419d6abf35834b196aab12601076e4
 2021-04-28 09:12:15 +00:00
TreeHugger Robot
b17996e9bb Merge "Bring the search icon back in developer page" into sc-dev am: e06f5a93b1 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14293744

Change-Id: Ie6b306402257a21a4d9e6d89103d914e4cd4fd9e
 2021-04-28 08:55:40 +00:00
TreeHugger Robot
e06f5a93b1 Merge "Bring the search icon back in developer page" into sc-dev 2021-04-28 08:36:58 +00:00
SongFerng Wang
3333935a67 Merge "Ui show "No connection" when WiFi is turned on and no available network" into sc-dev am: 03fbae7fc5 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14281929

Change-Id: I626b44973e66e9d2a261c654b92df17a84c48080
 2021-04-28 07:34:42 +00:00
SongFerng Wang
03fbae7fc5 Merge "Ui show "No connection" when WiFi is turned on and no available network" into sc-dev 2021-04-28 07:18:01 +00:00
Tom Hsu
563198613f Merge "[Provider model] Show no connection during out of service." into sc-dev am: 463805b142 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14187782

Change-Id: I9a2ed61da03616f09a85c6e46804eca8736a5023
 2021-04-28 06:58:19 +00:00
Tom Hsu
463805b142 Merge "[Provider model] Show no connection during out of service." into sc-dev 2021-04-28 06:32:33 +00:00
YUKAI HUNG
8b589f1a82 Merge "Update string for battery usage footer to include charging info" into sc-dev am: 40114d8cf1 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14327007

Change-Id: If0b6c47a35489f5850a723999d7d32ce71b563a7
 2021-04-28 06:14:06 +00:00
YUKAI HUNG
40114d8cf1 Merge "Update string for battery usage footer to include charging info" into sc-dev 2021-04-28 06:00:04 +00:00
SongFerngWang
8e0349a67b Ui show "No connection" when WiFi is turned on and no available network 
Follow this table to display the UI.
https://docs.google.com/spreadsheets/d/1w7R7Q3EXkep7iO4VcgioNp00DWas3Xve5i1rWexAkz8/edit#gid=954295315
Bug: 183593681
Test: atest ProviderModelSliceTest
atest ProviderModelSliceHelperTest
atest InternetConnectivityPanelTest
make RunSettingsRoboTests -j

Change-Id: I103f9b2fafe4fc543452a74b7ee7b2e537f879b5
 2021-04-28 12:35:37 +08:00
YUKAI HUNG
5f84a08a50 Merge "Draw timestamp information into BatteryChartView manually (2/2)" into sc-dev am: 70c872c160 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14319868

Change-Id: Ib29387457cba307584e21835b5cd194e760ea8a6
 2021-04-28 04:28:54 +00:00
YUKAI HUNG
70c872c160 Merge "Draw timestamp information into BatteryChartView manually (2/2)" into sc-dev 2021-04-28 04:08:55 +00:00
Kevin Chyn
28f4ca0eb6 Merge changes from topic "new-fp-strings" into sc-dev am: 77ddf11ae6 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14330069

Change-Id: I8718f5008e0e2b32435f16bf65c62e6796533032
 2021-04-28 03:58:23 +00:00
Kevin Chyn
e7772a480e Update FingerprintEnrollIntro text and icons am: 28d635d9aa 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14330066

Change-Id: I132f7017ce11320ebe57b31af9f50450ee883538
 2021-04-28 03:58:22 +00:00
Mill Chen
4d6bbc8af9 Make collapsing toolbar load font synchronously 
Since collapsing toolbar might load the font asynchronously, it caused
that some settings pages are seeing a flicker on its title. This change
is using TextAppearanceConfig.setShouldLoadFontSynchronously(true)
method to have title font load synchronously, which would remove the
flicker problem.

Fixes: 182232144
Test: visual verified
1) Enable developer options
2) Settings > System > Developer options
3) See if there's a flicker on title

Change-Id: I4e1db1a0fae9f69c7ff5baca7ada49c08f1bcbea
 2021-04-28 11:45:52 +08:00
Kevin Chyn
77ddf11ae6 Merge changes from topic "new-fp-strings" into sc-dev 
* changes:
  Update fingerprint strings
  Update FingerprintEnrollIntro text and icons
 2021-04-28 03:31:31 +00:00
ykhung
a39dce70fc Update string for battery usage footer to include charging info 
https://docs.google.com/presentation/d/1IDmMZILzXFJb-IOt9zZc0m5g2fCamd9gBoacUsWhibg/edit?ts=6087fc2e&resourcekey=0-UhJZmzej-0opeJHr6yVKWQ#slide=id.gc788e97ad4_0_178

Bug: 177406865
Test: make SettingsRoboTests
Change-Id: I6abba8a2c22be57a1afb2e6fae3d2e222dbb3f96
 2021-04-28 03:08:16 +00:00
TreeHugger Robot
b9b4fc5d12 Merge "Revert "Remove "See all" button"" into sc-dev am: e37695c89d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14324027

Change-Id: I31eff31e6cdb8ab8aebbdf96f7946ec7f4e8a094
 2021-04-27 21:41:04 +00:00
Kevin Chyn
290298d58d Update fingerprint strings 
Bug: 185804815
Test: manual
Change-Id: I5d1431646cd320e0f72e3c5f9f22cc2c9c2d0ef6
 2021-04-27 14:37:34 -07:00
Kevin Chyn
28d635d9aa Update FingerprintEnrollIntro text and icons 
This change uses strings that have already been merged. Anything
requiring string changes will be in a follow-up CL

Bug: 185804815
Test: on-device
Change-Id: I4e3d3631bbb9f976badf9d4a1582456b3cb7fae7
 2021-04-27 14:26:22 -07:00
TreeHugger Robot
e37695c89d Merge "Revert "Remove "See all" button"" into sc-dev 2021-04-27 21:00:30 +00:00
Yu-Han Yang
4775b90eff Remove icons of Location Services and App location permissions 
Bug: 180533061
Test: on device
Change-Id: I85b88823f730494836677caa489b1e249913e5f4
 2021-04-27 13:47:57 -07:00
Alex Johnston
26790a85ac Merge "Correct string ConfirmDeviceCredentialActivity" into sc-dev am: f3be8a6cc8 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14296227

Change-Id: Id82481f7711459b99afa3a9673474662c294e4e7
 2021-04-27 20:37:00 +00:00
Alex Johnston
f3be8a6cc8 Merge "Correct string ConfirmDeviceCredentialActivity" into sc-dev 2021-04-27 20:16:00 +00:00
Yu-Han Yang
cf41f951ff Revert "Remove "See all" button" 
This reverts commit 1170a08d43.

Reason for revert: design decision changed.

Change-Id: I954f8899f33a4c0e8945744e9bfcdbb48d9d705b
 2021-04-27 18:36:18 +00:00
Jakub Pawlowski
3aad6a6fc1 Fix app name label spoofing am: 54e74cae5f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14076525

Change-Id: I84c828a693edb168b6564a99bcc608665be15a4f
 2021-04-27 17:34:33 +00:00
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
Adam Bookatz
d231fdcaa0 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: I484d911dbf5177f608dc28c0d223d53a2335a296
 2021-04-27 16:57:21 +00:00
Automerger Merge Worker
65644f1ad6 Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 697411518c -s ours am: 81aaadca0e -s ours" into sc-dev am: 7fe923eec3 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ib4b54d9a258e28e9e3146f574dcbc8e4deab7028
 2021-04-27 16:55:20 +00:00
TreeHugger Robot
a869b41995 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: e8413529ce -s ours am: 0509118fc5 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I63dd8df0115befbde3e4ea4b6d73eb3ad9386885
 2021-04-27 16:55:16 +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
Automerger Merge Worker
b6dc76e6dd Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: c430db5ca3 -s ours" into sc-dev am: 8b3e1ed7ac -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Id1aca76748365d105dd1691ea508a3f0d5ab4883
 2021-04-27 16:54:56 +00:00
TreeHugger Robot
2f4509dfb9 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 4fd6557446 -s ours am: 8d58c02b06 -s ours am: 9761ce3e93 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ib9c71fdc0a3958868672130d393effa0a20edaa3
 2021-04-27 16:47:02 +00:00
Adam Bookatz
e035a81ddc Merge "UserDetailsSettings uses Guest string, not Guest name" into sc-dev 2021-04-27 16:35:37 +00:00
Automerger Merge Worker
7fe923eec3 Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 697411518c -s ours am: 81aaadca0e -s ours" into sc-dev 2021-04-27 16:21:56 +00:00