Wesley Wang
2d30eaa3bd
Merge "Clean up useless defender dialog code" into tm-qpr-dev
2022-11-30 11:57:01 +00:00
Wesley Wang
f218f350c4
Merge "Add dock defender battery tips" into tm-qpr-dev
2022-11-30 11:57:01 +00:00
Arc Wang
9a21435d4e
[automerger skipped] Settings 2-pane deep link vulnerabilities am: fef9b97498 -s ours am: 7c1b458844 -s ours am: b7b0658ebd -s ours
...
am skip reason: skipped by user arcwang
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20533028
Change-Id: I99994909674e5ac279c3b59508b74c99aac07d4c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-11-30 09:57:46 +00:00
Arc Wang
b7b0658ebd
[automerger skipped] Settings 2-pane deep link vulnerabilities am: fef9b97498 -s ours am: 7c1b458844 -s ours
...
am skip reason: skipped by user arcwang
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20533028
Change-Id: I3aac14cfd7983d08532721f61a339cc91fb249fb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-11-30 09:30:44 +00:00
Arc Wang
7c1b458844
[automerger skipped] Settings 2-pane deep link vulnerabilities am: fef9b97498 -s ours
...
am skip reason: skipped by user arcwang
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20533028
Change-Id: I30fbaf04797eb75d3d544870af8613436ea85726
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-11-30 08:48:47 +00:00
Zhenwei Chen
07d208dfb1
Clean up useless defender dialog code
...
Test: Unit test passed
Bug: 260687359
Merged-In: If3cbe4072c891f1af6b5aa4fb624e4e486c78ad6
Change-Id: If3cbe4072c891f1af6b5aa4fb624e4e486c78ad6
Signed-off-by: Zhenwei Chen <zhenwec@google.com >
(cherry picked from commit a725bac68c )
2022-11-29 10:31:45 +00:00
Zhenwei Chen
1d72ff642c
Add dock defender battery tips
...
1. Remove the dock defender v1 code
2. Add dock defender battery tips and update
corresponding list item string
Bug: 260687359
Test: Unit test passed and manual test on device
Merged-In: Ib6c09df056744142f42f5e2a13252b58e54c7534
Change-Id: Ib6c09df056744142f42f5e2a13252b58e54c7534
Signed-off-by: Zhenwei Chen <zhenwec@google.com >
(cherry picked from commit 8d11d9ceea )
2022-11-29 10:31:37 +00:00
Arc Wang
fef9b97498
Settings 2-pane deep link vulnerabilities
...
Settings app must not start an deep link Activity if
1. The deep link Activity is not exported.
or
2. Calling package does not have the permission to
start the deep link Activity.
Bug: 250589026
Test: make RunSettingsRoboTests ROBOTEST_FILTER=SettingsHomepageActivityTest
Change-Id: I9a3bddfa5d9d1d2e924dd6f3e5e07dca6c11664f
Merged-In: I9a3bddfa5d9d1d2e924dd6f3e5e07dca6c11664f
2022-11-29 05:58:43 +00:00
András Kurucz
80095fa001
Merge "Allow to block/unblock Conversation Notifications from Settings" into tm-qpr-dev
2022-11-28 16:32:00 +00:00
Pasty Chang
3bde8a502e
Merge "Migrate ambiguous getId method into getLink" into tm-qpr-dev
2022-11-25 02:15:17 +00:00
TreeHugger Robot
dc4b54c168
Merge "Keep "Resetting your internet" when screen rotates" into tm-qpr-dev
2022-11-24 00:01:22 +00:00
TreeHugger Robot
691196e900
Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev
2022-11-23 19:38:40 +00:00
TreeHugger Robot
43e8a4480b
Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev
2022-11-23 19:38:40 +00:00
András Kurucz
0fa99226e1
Allow to block/unblock Conversation Notifications from Settings
...
The user can end up in a state where the Channel of a Conversation is
blocked (has an importance of 0).
Currently there was no way to unblock it, because we didn't allow it from
the Settings. Therefore now the option to block/unblock is added to the
Conversation Settings page.
Fixes: 255062535
Test: Block/Unblock a Conversation from Settings
Test: Mark a notification blocked and conversation by clicking the “Show
notifications” toggle and the “This is a conversation” button at once.
Now unblock it from the Settings.
Change-Id: I06778d259155d87d6af4bdb7013cd3b6c9a2e5ee
2022-11-23 13:24:36 +00:00
TreeHugger Robot
fa6f92aa74
Merge "Remove isSticky true for SplitPlaceholderRule" into tm-qpr-dev
2022-11-23 09:19:27 +00:00
Arc Wang
f6d712c7b7
Remove isSticky true for SplitPlaceholderRule
...
SplitPlaceholderRule#isSticky determines whether the placeholder
will show on top in a smaller window size after it first appeared
in a split with sufficient minimum width.
This change will show Settings homepage while users rotate
device to portrait mode and show Settings 1-pane UI.
Bug: 256115335
Test: manual visual
1. Set font size and display size to large.
2. Launch Setting app in landscape and rotate to portrait.
Change-Id: Ie955f8b8db3bbe42dba6300608774582ef150590
2022-11-23 14:44:53 +08:00
Bill Yi
c9a4f35a74
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I9d5dceeb79a553eace466c50494f0e670bcbf28a
2022-11-22 15:59:54 -08:00
Bill Yi
ebc354ab68
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Ib53e903156f20220886651eca3ee1b7958cce2cc
2022-11-22 15:53:52 -08:00
Steve Elliott
fece948623
Merge "Revert^2 "Add configuration for defaulting notification behavior"" into tm-qpr-dev
2022-11-22 22:50:10 +00:00
Hao Dong
a01a1857ec
Merge "Use the internal max faces number to check enrolled." into tm-qpr-dev
2022-11-22 17:10:49 +00:00
TreeHugger Robot
6f908bae6f
Merge "Adds settings item for quick affordances." into tm-qpr-dev
2022-11-22 02:59:15 +00:00
Alejandro Nijamkin
01df2b4ee2
Adds settings item for quick affordances.
...
This is in Display > Lock screen. It reads "Buttons" and the summary
text below it is a comma delimited list of the names of the
currently-selected quick affordances.
Fix: 256662519
Test: Manual verification that the lock screen and wallet
items are gone and the new item is visible and clicking it opens the
Wallpaper & style settings screen
Change-Id: If3746b5d0eb8c61edb9378cdb217ca248b999944
2022-11-21 16:42:45 -08:00
Steve Elliott
30ccc43ae1
Revert^2 "Add configuration for defaulting notification behavior"
...
Test: go through SUW on affected device, view notification screen
Bug: 240472040
Change-Id: I34dbe28226d830bc5ba633e72cd529d97021de85
2022-11-21 15:16:40 +00:00
Weng Su
d46c3848a9
Keep "Resetting your internet" when screen rotates
...
- The fragment of Internet Settings will be destroyed and recreated when screen rotates
- Move connectivity recovery class into singleton class to avoid service being killed when fragment context is destroyed
- Check if connectivity is recovering when fragment is recreated and show resettings message if necessary
Bug: 202802736
Test: manual test
atest -c InternetResetHelperTest
make RunSettingsRoboTests ROBOTEST_FILTER=NetworkProviderSettingsTest
Merged-In: Iae9585ff8366b8b71b4c39dc0ec7e87a0320fa5a
Change-Id: Iae9585ff8366b8b71b4c39dc0ec7e87a0320fa5a
2022-11-21 07:55:22 +00:00
Yanting Yang
06125115a0
Merge "Invoke close() method for BatteryUsageStats to close cursor window" into tm-qpr-dev
2022-11-19 18:33:05 +00:00
Hao Dong
8c5d8e694a
Use the internal max faces number to check enrolled.
...
Test: manually tested on device
Test: robotest for FaceEnrollIntroductionTest
Bug: 243759589
Change-Id: I193c7b7c49f884541bd5d8282d15bf69e46f3392
Merged-In: I193c7b7c49f884541bd5d8282d15bf69e46f3392
(cherry picked from commit b4000fb226 )
2022-11-18 20:43:38 +00:00
Yi-Ling Chuang
2f80e073d0
Remove BatteryFixSlice as it's not used
...
The BatteryFixSlice hasn't been used for a while, and it's introducing
memory leaks due to a design change at the framework's end. Hence,
remove it.
Bug: 245385410
Test: robotests
Change-Id: I517cab71a32613d5cb5fcd3beb991a24926a2902
Merged-In: I517cab71a32613d5cb5fcd3beb991a24926a2902
(cherry picked from commit e3fcf1f082 )
2022-11-18 10:58:42 +00:00
Wesley Wang
9a539a46d1
Invoke close() method for BatteryUsageStats to close cursor window
...
- Invoke close() method for BatteryUsageStats to close cursor window,
avoid OOM.
Bug: 245385410
Test: make SettingsRoboTests
Change-Id: I68f36a42a33d2546cb191cec88f5431e24dd5b84
(cherry picked from commit f164be387e )
2022-11-18 10:19:07 +00:00
Joshua Mccloskey
1d04eb6eb7
Merge "Ensure text doesnt jump during enrollment" into tm-qpr-dev
2022-11-17 16:56:48 +00:00
Sam Dubey
a2d06273c1
Revert "Add configuration for defaulting notification behavior"
...
Likely causing b/259499400
This reverts commit a92688d642 .
Change-Id: I781a7ecf9139eca11e1db895f86268b893258543
2022-11-17 07:33:18 +00:00
Sayak Dutta
03ed8c0477
Merge "Modify call to Header function of Glif Layout to disable autosize" into tm-qpr-dev
2022-11-17 06:07:12 +00:00
Diya Bera
b4a0a0563d
Merge "Remove header "When using fingerprint unlock" for Udfps" into tm-qpr-dev
2022-11-17 00:59:35 +00:00
Diya Bera
dfe2bd2df2
Merge "Device displays fingerprint enrollment after swiping back" into tm-qpr-dev
2022-11-17 00:59:16 +00:00
Diya Bera
68903de369
Remove header "When using fingerprint unlock" for Udfps
...
Fixes: 257272989
Test: Manual - Open Fingerprint Settings and observe the UI
Change-Id: I98235e56a3537eff00490584c88f459ac755433f
2022-11-16 21:08:04 +00:00
TreeHugger Robot
73348a8859
Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev
2022-11-16 20:36:20 +00:00
TreeHugger Robot
30522878e9
Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev
2022-11-16 20:18:50 +00:00
Diya Bera
c4b95de536
Device displays fingerprint enrollment after swiping back
...
Fixes: 259198369
Test: Manual - repro steps in bug
Change-Id: Ide7fa0d16daba795cfc3c63a5da351000f918a81
2022-11-16 18:34:26 +00:00
Bill Yi
544000b27b
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I03421835110a4f99b59f5718e078f167c2b44443
2022-11-16 05:10:21 -08:00
Bill Yi
ece082dcaf
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Iabd3b4c4146bec3960af589135f39a5e2fe96d03
2022-11-16 05:04:31 -08:00
Pasty Chang
1d4e011f41
Migrate ambiguous getId method into getLink
...
The method name getId in setup library LinkSpane would be changed to the name getLink, so migrate the app that is used to getId to getLink.
Bug: 256095678
Change-Id: I2f9d58d82d99775575249e9e245949a0bc1d553e
Test: manual
2022-11-16 07:18:01 +00:00
Binyi Wu
d5d2dc4e22
Merge "Update survey triggering mechanisms" into tm-qpr-dev
2022-11-16 07:13:53 +00:00
changbetty
125a6fcec9
[automerger skipped] RESTRICT AUTOMERGE Make bluetooth switch not discoverable via SliceDeepLinkTrampoline am: 3cc8db3c58 am: 8f412f14d2 -s ours am: f79bce9e6a -s ours am: 3da973ce0f -s ours am: 6244c65c24 -s ours am: 2857cae239 -s ours am: 3b388643b0 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20419569
Change-Id: I623779b926a3fcb7f3089e81cc60e25830111dfd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-11-16 05:30:22 +00:00
changbetty
29a32c0348
[automerger skipped] RESTRICT AUTOMERGE Make bluetooth switch not discoverable via SliceDeepLinkTrampoline am: fecf464fb4 -s ours am: 990c3d2a45 -s ours am: edc81984ac -s ours am: 0ddaaccbd0 -s ours am: 90b39af26d -s ours am: f8a47d0305 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20419568
Change-Id: Id4b0299779cccebd08d3484b9ea1ee50dba527f5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-11-16 05:30:16 +00:00
changbetty
dcf39bd877
[automerger skipped] RESTRICT AUTOMERGE Make bluetooth switch not discoverable via SliceDeepLinkTrampoline am: c55c060361 am: 36b97edab0 -s ours am: 5fc32464aa -s ours am: fbaede66b4 -s ours am: 92dfbb3f46 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20419567
Change-Id: I4d5b52a87798eec16874f1ac749b42191c19ac6a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-11-16 05:30:11 +00:00
changbetty
e1f7628fd4
[automerger skipped] RESTRICT AUTOMERGE Make bluetooth switch not discoverable via SliceDeepLinkTrampoline am: 31fb7bd480 -s ours am: 1cb32c446d -s ours am: cc4dea7377 -s ours am: 6bf913c2cf -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20419566
Change-Id: I48c5a23d135a7bbb3f551a89ba2168f6ff0f28be
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-11-16 05:30:06 +00:00
changbetty
3b388643b0
[automerger skipped] RESTRICT AUTOMERGE Make bluetooth switch not discoverable via SliceDeepLinkTrampoline am: 3cc8db3c58 am: 8f412f14d2 -s ours am: f79bce9e6a -s ours am: 3da973ce0f -s ours am: 6244c65c24 -s ours am: 2857cae239 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20419569
Change-Id: Iec0e0e6e33005b8317a1883f874aaa4b4d30ee97
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-11-16 05:01:00 +00:00
changbetty
f8a47d0305
[automerger skipped] RESTRICT AUTOMERGE Make bluetooth switch not discoverable via SliceDeepLinkTrampoline am: fecf464fb4 -s ours am: 990c3d2a45 -s ours am: edc81984ac -s ours am: 0ddaaccbd0 -s ours am: 90b39af26d -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20419568
Change-Id: I04eb4cbc3c13ee58f22e562f8574f2d803eac304
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-11-16 05:00:55 +00:00
changbetty
92dfbb3f46
[automerger skipped] RESTRICT AUTOMERGE Make bluetooth switch not discoverable via SliceDeepLinkTrampoline am: c55c060361 am: 36b97edab0 -s ours am: 5fc32464aa -s ours am: fbaede66b4 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20419567
Change-Id: I80e44ec17a6994e3e074d894b652a9d651c38c4f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-11-16 05:00:50 +00:00
changbetty
6bf913c2cf
[automerger skipped] RESTRICT AUTOMERGE Make bluetooth switch not discoverable via SliceDeepLinkTrampoline am: 31fb7bd480 -s ours am: 1cb32c446d -s ours am: cc4dea7377 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20419566
Change-Id: I1ecd2230b2581f3c1d08948be26ce9165dc999cd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-11-16 05:00:45 +00:00
changbetty
114a948885
[automerger skipped] RESTRICT AUTOMERGE Make bluetooth switch not discoverable via SliceDeepLinkTrampoline am: e644704bee -s ours am: 094c3df0b0 -s ours am: cf8be928f5 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20419565
Change-Id: I8098b896f573c709c9bfa4bfcdd5d1a56aaf2615
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-11-16 04:54:22 +00:00