PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
90,564 Commits 1 Branch 0 Tags
f61b03a2012aa7579103d8d1749abeddb51197c4
Commit Graph

90564 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
TreeHugger Robot
3d8edf8e43 Merge "Fix the background color of CollapsingToolbarLayout" into sc-v2-dev am: d355d7f123 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16284152

Change-Id: I2203f0844c527bf1ac7934b1d711117397ed120c
 2021-12-02 07:54:01 +00:00
TreeHugger Robot
d355d7f123 Merge "Fix the background color of CollapsingToolbarLayout" into sc-v2-dev 2021-12-02 07:19:45 +00:00
Mill Chen
3825bff021 Fix the background color of CollapsingToolbarLayout 
The wrong background color of CollapsingToolbarLayout appears in some
pages like "All apps" page or "Password and accounts" page. This symptom
can be observed in these pages when the work profile is enabled and the
line count of title is 1.

This issue is caused by updating the title of the page many times. In
these pages that have the tab view, the structure of the page differs
from a general setting page. The title of the page is coming from
BaseActivity, ProfileSelectFragment, PersonalFragment and WorkFragment,
in which the page that has the issue has an empty string from
ProfileSelectFragment. That is causing the CollapsingTollbarLayout has
the different line count during the process of setting the title.

Since the pages that have the tab view are different from the general
pages in Settings, the title should be set separately for those pages.
Adding a method to get the title resource ID so the page extending from
ProfileSelectFragment can set its title.

Bug: 192914660
Test: visual test and manual test
1) Enable work profile
2) Navigate to All apps page
3) The page should have the correct background color in the
CollapsingToolbarLayout

Change-Id: I52ef9729f3cad56161ea3d87ba25429dfcdb26ef
Merged-In: I52ef9729f3cad56161ea3d87ba25429dfcdb26ef
 2021-12-02 13:40:45 +08:00
Joshua Mccloskey
78ab60db84 Merge "Fixed face enroll intro button issue" into sc-v2-dev am: 506c6b804f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16365598

Change-Id: I2236768c62d8a8b48a4b4348b5e02bb7beb3c31f
 2021-12-01 23:25:22 +00:00
Joshua Mccloskey
506c6b804f Merge "Fixed face enroll intro button issue" into sc-v2-dev 2021-12-01 23:08:49 +00:00
TreeHugger Robot
1e8e39d34e Merge "Updated udfps strings" into sc-v2-dev am: d51b41d4ec 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16301855

Change-Id: Ifb3782076b5f3227cdfb98ba495c41ab71835e51
 2021-12-01 20:42:40 +00:00
TreeHugger Robot
d51b41d4ec Merge "Updated udfps strings" into sc-v2-dev 2021-12-01 19:58:50 +00:00
Bill Yi
fabbcac444 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 8e754d6891 -s ours am: 7946a90b42 -s ours am: 10d16d80c7 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I634adacba1a60a1e2a0030dcba965b009f1f1e33
 2021-12-01 18:09:21 +00:00
Bill Yi
8b7ed642d6 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 1b3c701077 -s ours am: ae32f7324b -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I6fe074fb6d2ecf6abe738dee96588d5684bfcd6e
 2021-12-01 18:07:49 +00:00
Bill Yi
0845cbd1b5 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 8e754d6891 -s ours am: 7946a90b42 -s ours am: 4844909fbe -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I75518960030ce5b91a026b0b7adc08f1ca375a82
 2021-12-01 17:22:30 +00:00
Bill Yi
7b332c2f5b [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 1b3c701077 -s ours am: 887f2b7e02 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I285f04d126e007e4f17045d0a16092c022ffdc9b
 2021-12-01 17:21:17 +00:00
Bill Yi
10d16d80c7 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 8e754d6891 -s ours am: 7946a90b42 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Iea8f622284dc73d2d089d57bc285445c1cbaa2cd
 2021-12-01 17:20:34 +00:00
Bill Yi
ae32f7324b [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 1b3c701077 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ie62fe7a31ad3a11650aa423c0f1b3a6abbe7e23b
 2021-12-01 17:19:22 +00:00
Bill Yi
4844909fbe [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 8e754d6891 -s ours am: 7946a90b42 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I31222683be6f79243f3ba10c325192ad7528d21d
 2021-12-01 17:19:19 +00:00
Joshua Mccloskey
e372b2a22b Merge "Disable setting if sensor is convenience." into sc-v2-dev am: 1ca42ffc79 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16233490

Change-Id: I9a4e565b311d7a65091aca5294879366b9399265
 2021-12-01 17:19:04 +00:00
Bill Yi
887f2b7e02 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 1b3c701077 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I176834d8b4dd5c41bb9514a5d998699d202652a3
 2021-12-01 17:18:27 +00:00
Bill Yi
7946a90b42 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 8e754d6891 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I6bda0cb874bb45735cda3852876ace5d8eef1635
 2021-12-01 17:18:20 +00:00
TreeHugger Robot
3042f4621d [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 83fede5908 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I777b93480c0cde0d38aaf9e9d17a4c0992a702dd
 2021-12-01 17:17:48 +00:00
Joshua Mccloskey
1ca42ffc79 Merge "Disable setting if sensor is convenience." into sc-v2-dev 2021-12-01 17:09:50 +00:00
TreeHugger Robot
83fede5908 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev 2021-12-01 16:59:42 +00:00
Tsung-Mao Fang
e6a79f0670 Update background color for two-pane mode am: 395ea90b83 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16282524

Change-Id: I2b4fffda97aaec53945c4de4cf6248fb81163e64
 2021-12-01 10:22:01 +00:00
Tsung-Mao Fang
395ea90b83 Update background color for two-pane mode 
Update background color for status bar and
homepage background programically.
Also, we update the backgroud color for highlight items.

Test: Rebuilt apk and see the screen.
Bug: 195293058
Change-Id: Id100f8c9c7fc02c43420afcca07a703a14ec2312
 2021-12-01 16:39:09 +08:00
Joe Bolinger
dde461dc4e Remove portrait flag from handoff activity. 
Fix: 206904426
Test: manual (adb root && adb shell am start -n com.android.settings/.biometrics.BiometricHandoffActivity and rotate device)
Change-Id: Ibe61484d88824418f395247e492aba7b9d3c912a
 2021-12-01 00:59:57 +00:00
Joshua Mccloskey
756fa20e1c Fixed face enroll intro button issue 
Fixed an issue where sometimes after completing face authentication the
more & agree buttons would display instead of the done button.

1. Enter SUW
2. Complete face authentication flow
3. Go to next step (finishing the Biometric flow)
4. Press the back button
5. Observe that the text now says "Done"

Fixes: 205203673
Test: Verified button text is changed as expected during SUW.
Change-Id: I5cfad265f9b27669dcad64e5872750695b1b5bdc
 2021-11-30 09:29:13 -08:00
Alex Johnston
2f193c8157 Add non system overlay flag to InstallCaCertificateWarning 
Bug: 196969991
Test: Manual testing with Settings
Change-Id: Ia9dc251c853526b2ce66c9f8ff595d496b7f1bc4
 2021-11-30 16:28:31 +00:00
Bonian Chen
010306644b [Settings] Refactor Wifi Calling description text 
Refactor the display of description text when no wifi calling options available.
Enhancement:
1. These text need to align the style with the summary part of the wifi
calling options.
2. These text need to be scrollable in order to see full description.
3. The link within text need to be clickable.

Bug: 204844012
Test: local
Change-Id: Ie89a5b65e75cdd61fab68c6e1bf7c40bfcc68b6b
 2021-11-30 13:57:56 +00:00
Zoey Chen
4aef8765dc Merge "[Settings] Should show carrier network if airplane mode is on" into sc-v2-dev am: 1df187a439 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16332786

Change-Id: I1a63b9d82fd530af87c2c70ab21e24e599a967e2
 2021-11-30 08:46:59 +00:00
Zoey Chen
1df187a439 Merge "[Settings] Should show carrier network if airplane mode is on" into sc-v2-dev 2021-11-30 08:33:50 +00:00
Joshua Mccloskey
b73201c6be Added sensorPrivacyDialog to face settings 
Test: Verify flow presents dialog if the privacy setting is enabled.
Bug: 201045056
Change-Id: I96f14db457311d13f07c770ff0993581576c5dba
 2021-11-29 23:09:16 -08:00
Zoey Chen
8b1ecea060 [Settings] Should show carrier network if airplane mode is on 
https://hsv.googleplex.com/6007361661566976

Test: atest SubscriptionsPreferenceControllerTest
Bug: 206990845
Change-Id: Id39b662f33b201a8e4ce53c34c3007eca9a40edf
 2021-11-30 12:10:28 +08:00
Joe Bolinger
77556bcc51 Merge "Remove face auth from setup wizard when configured as a convenience." into sc-v2-dev am: 076dc5ee1b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16325466

Change-Id: I08041af311deb454a3f05b9328955b6489a8f35a
 2021-11-29 23:26:27 +00:00
Joe Bolinger
076dc5ee1b Merge "Remove face auth from setup wizard when configured as a convenience." into sc-v2-dev 2021-11-29 23:15:15 +00:00
Bill Yi
12a5d03d9f Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Ic0a4b094fdd4f7898eb3726ba17b23a3563acb2a
 2021-11-29 08:56:17 +00:00
Bill Yi
1b3c701077 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Ic270445cc1d57212de38787fab18a2d7ce937cca
 2021-11-29 08:52:04 +00:00
Bill Yi
8e754d6891 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: If3e347bcbdb1bda52690caa9ead4a9c913c8e990
 2021-11-29 08:48:23 +00:00
Bonian Chen
12287b2c67 Merge "[Settings] Move display of VPN version into summary text" into sc-v2-dev am: 1026e410f4 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16341970

Change-Id: I37fd544ef7452a3286dd393d68407d626d9ab590
 2021-11-29 06:23:02 +00:00
Bonian Chen
1026e410f4 Merge "[Settings] Move display of VPN version into summary text" into sc-v2-dev 2021-11-29 06:05:40 +00:00
TreeHugger Robot
c6bc7a7c4b Merge "Fix overlapped problem in SuW two panes mode" into sc-v2-dev am: cd8a01d2fd 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16332784

Change-Id: Ib37dab22b51da7ec97990230a17b7fe698abee60
 2021-11-29 05:59:08 +00:00
TreeHugger Robot
cd8a01d2fd Merge "Fix overlapped problem in SuW two panes mode" into sc-v2-dev 2021-11-29 05:37:34 +00:00
Charles Chen
181853efb0 Fix different behaviors of deeplink in one/two pane am: a8c97980a6 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16339785

Change-Id: Ie2833c5b9b4f0f05a97432198a949050d3fb3e84
 2021-11-29 05:02:31 +00:00
Treehugger Robot
96d33dbdbe Merge "Minor clean-up for LE audio setting" am: e41d1b9761 am: ad041d78ee am: 7e7b1f720e 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1904790

Change-Id: I61f187c004e20dc3865764269051b33a09af3ac2
 2021-11-29 04:44:02 +00:00
Treehugger Robot
7e7b1f720e Merge "Minor clean-up for LE audio setting" am: e41d1b9761 am: ad041d78ee 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1904790

Change-Id: I45b1aa93de3633b6fe2ec8b0605fbeac5a4f3d37
 2021-11-29 04:27:25 +00:00
Treehugger Robot
ad041d78ee Merge "Minor clean-up for LE audio setting" am: e41d1b9761 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1904790

Change-Id: Icc8ed52e3eeaa0aefe4ccc0e65440e58cb0faedd
 2021-11-29 03:58:28 +00:00
Treehugger Robot
e41d1b9761 Merge "Minor clean-up for LE audio setting" 2021-11-29 03:41:49 +00:00
Treehugger Robot
afa860da18 Merge changes I094ba6be,Idbdd21a1,I03dfdc25,I40afabb0,I01e0ec91, ... am: 8f91ac3e83 am: 0a69b346c8 am: ff1ebb31d4 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1903835

Change-Id: I8273612ded6c7f489baec255a8872e5ebb301741
 2021-11-29 03:04:16 +00:00
Alice Kuo
2d0025761b Handle csip set member automatic pair in Setting am: 629611a43e am: eb412a0614 am: 6097f9b830 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1903834

Change-Id: Icace2cf11100209eaa945971704b3319e9628e75
 2021-11-29 03:04:15 +00:00
Alice Kuo
3d17582b0b Do not update the previously connected devices for the sub device am: c78fb83aee am: f6f0126b8e am: 1da3264140 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1903833

Change-Id: I4e83de75cd61c7f3fcf418bfdefc79d655c063f9
 2021-11-29 03:04:13 +00:00
Alice Kuo
31e82a325c Accept the pairing request automatically for the set member pairing am: 61460a1ab1 am: 6aa53808f3 am: c932678888 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1903832

Change-Id: I205a7824d84a42128be5be2e77974689510d190a
 2021-11-29 03:04:12 +00:00
Alice Kuo
2240418de8 Show the multiple Mac address for the coordinated set am: 9f11a4cddf am: f0b73dade7 am: e3680e211a 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1903831

Change-Id: I126e164160dae141978a59b02cea9f0091b7265f
 2021-11-29 03:04:10 +00:00
Alice Kuo
6943c0356c Add the pairing string for CSIP supported device am: f57f720c38 am: 5d1aee76c2 am: 2135db2eac 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1903830

Change-Id: I000242e2e51627507bb49e7f6f51d8a5602de493
 2021-11-29 03:04:07 +00:00