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

90898 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Yanting Yang
6a3c5698ca Merge "Clear legacy code about AppAndNotificationDashboard" into sc-dev am: ca0415d475 am: 5f125d8284 am: b578288050 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15102780

Change-Id: If10a15c6e243b0d7e3ad3f7f0116f83c89393423
 2021-06-28 13:21:35 +00:00
Yanting Yang
2097537645 Merge "Clear legacy code about AppAndNotificationDashboard" into sc-dev am: ca0415d475 am: 93b716660e am: b43ae18803 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15102780

Change-Id: Ica06fac92e1ae37e30cf33b9ac40bc64fbcc491c
 2021-06-28 13:21:27 +00:00
Yanting Yang
b578288050 Merge "Clear legacy code about AppAndNotificationDashboard" into sc-dev am: ca0415d475 am: 5f125d8284 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15102780

Change-Id: I64924b77329f73f7b0474d12318608ed1756a2d8
 2021-06-28 13:12:35 +00:00
Yanting Yang
b43ae18803 Merge "Clear legacy code about AppAndNotificationDashboard" into sc-dev am: ca0415d475 am: 93b716660e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15102780

Change-Id: I8e95fe4e5faca892ef578067c434ed75b01881bc
 2021-06-28 13:12:12 +00:00
Yanting Yang
9830f4452a Merge "Clear legacy code about AppAndNotificationDashboard" into sc-dev am: ca0415d475 am: 1267eb0550 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15102780

Change-Id: I1379efd86d8b75f0a7bfab2499fb9fd4c9886487
 2021-06-28 13:11:52 +00:00
Yanting Yang
93b716660e Merge "Clear legacy code about AppAndNotificationDashboard" into sc-dev am: ca0415d475 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15102780

Change-Id: Ia8428ecdc0f9c5ef0f3130b58ab9a099c3033146
 2021-06-28 13:03:30 +00:00
Yanting Yang
1267eb0550 Merge "Clear legacy code about AppAndNotificationDashboard" into sc-dev am: ca0415d475 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15102780

Change-Id: I68b3a1c7fe39c285fddaf54c31851349b94c108c
 2021-06-28 13:02:47 +00:00
Yanting Yang
5f125d8284 Merge "Clear legacy code about AppAndNotificationDashboard" into sc-dev am: ca0415d475 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15102780

Change-Id: I068ec6d73a402db50f4a292fd76d8943ca8ea415
 2021-06-28 13:02:41 +00:00
Yanting Yang
ca0415d475 Merge "Clear legacy code about AppAndNotificationDashboard" into sc-dev 2021-06-28 12:54:44 +00:00
Tiffany Nguyen
f9416e6a40 Log Battery Saver states. 
Test: Unit test
Bug: 189914747

Change-Id: Ib815e60a52ec549df2ab2b90df29bca1eeeef339
 2021-06-28 11:22:20 +00:00
Mill Chen
139fa375cd Add line spacing multiplier for CollapsingToolbarLayout 
Since there is a problem with a small line spacing between multiline
title of collapsing toolbar in a few locales, that caused the title is
overlapping with each other. Enlarging the line spacing by using
lineSpacingMultiplier to fix it.

Fix: 183223866
Test: visual verified
1) Change to MY locale
2) Navigate to Settings > Sounds & vibration > Do not disturb > Alarms &
other interruptions
3) Observe the title and check if it is overlapping with each other

Change-Id: I87f0af5151a6367bc623ac07b15e04c39b51c6ca
 2021-06-28 18:39:20 +08:00
Bonian Chen
d8e290bf98 Merge "Revert "[Settings] Code Refactor - ActiveSubscip..."" into sc-dev am: a3f28b034d am: 6be744ee95 am: fa9481c92b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15125273

Change-Id: I6f2d50db8799bb22d27d3b8443569526f03a4c6d
 2021-06-28 10:36:52 +00:00
Bonian Chen
e1f374594e Merge "Revert "[Settings] Code Refactor - ActiveSubscip..."" into sc-dev am: a3f28b034d am: 26af8823ef am: ffb5c7f2fe 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15125273

Change-Id: Ib28c3628584bbbd7ee4a87735b6e9081cadb75b4
 2021-06-28 10:36:20 +00:00
Yanting Yang
4124284bb7 Improve the latency of first entering Apps page 
Root cause:
AppsPreferenceController will query the recent app usages twice on
the main thread.

Solution:
Set flag to ensure only triggering refreshUi() once when entering
the Apps page.

Also correct the preference key of apps.xml since we don’t have
duplicated preferences now.

Fixes: 183176038
Test: robotests & visual
Change-Id: Ia41ee1e4a1946b8122deca63e318d3915afcc426
 2021-06-28 18:30:39 +08:00
Bonian Chen
fa9481c92b Merge "Revert "[Settings] Code Refactor - ActiveSubscip..."" into sc-dev am: a3f28b034d am: 6be744ee95 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15125273

Change-Id: I2ceba6b0d544e23b9874fe69a0813aa20205e915
 2021-06-28 10:24:22 +00:00
Bonian Chen
ffb5c7f2fe Merge "Revert "[Settings] Code Refactor - ActiveSubscip..."" into sc-dev am: a3f28b034d am: 26af8823ef 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15125273

Change-Id: I2315933474450633b5639f992935a071f5561267
 2021-06-28 10:24:11 +00:00
Bonian Chen
c353a6b327 Merge "Revert "[Settings] Code Refactor - ActiveSubscip..."" into sc-dev am: a3f28b034d am: 6123d844d5 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15125273

Change-Id: Ie7aba1f1b8f232817083057e919814216f94a969
 2021-06-28 10:23:45 +00:00
Bonian Chen
26af8823ef Merge "Revert "[Settings] Code Refactor - ActiveSubscip..."" into sc-dev am: a3f28b034d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15125273

Change-Id: I988673df4227bfae943eea3df6b9de49a5e28364
 2021-06-28 10:15:39 +00:00
Bonian Chen
6123d844d5 Merge "Revert "[Settings] Code Refactor - ActiveSubscip..."" into sc-dev am: a3f28b034d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15125273

Change-Id: Ic665f9bc531d79e8349292ccebc3c6f178e87668
 2021-06-28 10:15:22 +00:00
Bonian Chen
6be744ee95 Merge "Revert "[Settings] Code Refactor - ActiveSubscip..."" into sc-dev am: a3f28b034d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15125273

Change-Id: Iec3c149b6caeb872c952d833083a3570f9ebb6f7
 2021-06-28 10:14:32 +00:00
Bonian Chen
a3f28b034d Merge "Revert "[Settings] Code Refactor - ActiveSubscip..."" into sc-dev 2021-06-28 10:06:21 +00:00
Wesley.CW Wang
30b60195e8 Remove unnecessary converting us to ms in BatteryInfo 
The class "Estimate" has the menber estimateMillis and
the unit of batteryUsageStats.getBatteryTimeRemainingMs() is millisecond,
so converting from us to ms is unnecessary.

Bug: 187379252
Test: make RunSettingsRoboTests
Change-Id: Iefbd8751608eb749367cf08a4a9b184b948a6d33
 2021-06-28 17:59:35 +08:00
Bonian Chen
d9bf670725 Revert "[Settings] Code Refactor - ActiveSubscip..." 
There seems to be an issue on system when a modification on file name get referenced by multiple submit(s).
(ag/15106410 and ag/15102785).

It seems to me that, build system got build breakage immediately instead of merging all of the files (even within same package).

Reason for revert: Try to submit all of the modifications within single submit as a workaround.

Bug: 192204057
Test: build pass
Change-Id: Ie497088a58c6ac564fde193fad2c0b67a965933c
 2021-06-28 09:32:54 +00:00
Weng Su
7a45b33c42 [Provider Model] Hide Connectivity Subsystems when recovering 
- Hide Carrier Network

- Hide Wi-Fi toggle

- Hide all of Wi-Fi Networks

Bug: 186590805
Test: manual test
atest InternetResetHelperTest
atest NetworkMobileProviderControllerTest
make RunSettingsRoboTests ROBOTEST_FILTER=NetworkProviderSettingsTest

Change-Id: Ib8462f890847d14bfc6ef533d1147822fd797a13
 2021-06-28 17:19:13 +08:00
Jernej Virag
149fb3397c Restore long press power setting back to gestures 
The settings menu content will be reworked to be consistent with other gesture entries.

Bug: 191899039
Test: manual
Change-Id: Ia98fed5d9f04a66e22dae747e63e7d1a0bc37fa3
 2021-06-28 08:25:51 +00:00
Edgar Wang
92d2c96c1d Improve pointerSpeedPreference a11y content description 
Fixes: 189725080
Test: manual
Change-Id: I1638acd986fd791c2fbb7b69decda1bc461dee74
 2021-06-28 16:22:23 +08:00
Stanley Wang
6c553ea3f1 Fix the problem that the unknown item will be announced when 
using Switch Access.

- Disable the importantForAccessibility of the
  SettingsMainSwitchBar's parent layout.

Fix: 182227784
Test: robotest and operate the switch preference manually
Change-Id: I5e0e4bb972f6996192d5a30525bb5370a006b115
 2021-06-28 16:13:20 +08:00
Hugh Chen
b1f467f445 [automerger skipped] RESTRICT AUTOMERGE Fix phishing attacks over Bluetooth due to unclear warning message am: 8fe8e0fc21 -s ours am: c551f39977 -s ours am: e849d212b7 -s ours am: b8aa9ad04d -s ours am: 2a2a81dea5 -s ours am: 346b049fb1 -s ours am: 52b13e9795 -s ours am: c52b6bc4bb -s ours am: bca964069b -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Id6ba5d9a8d31021d7bdf7e043289d2bf4fb346a4
 2021-06-28 07:52:06 +00:00
Hugh Chen
e957900715 [automerger skipped] RESTRICT AUTOMERGE Update string am: 3d6641a468 -s ours am: 9316df9560 -s ours am: 368ba20c95 -s ours am: d9fc75875e -s ours am: 064bf9dd81 -s ours am: c91f8b0991 -s ours am: b17f196c3d -s ours am: 9e08ebacf4 -s ours am: 495b66de91 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I7027389c94e1e03202deddbf9eb0eb271860d31d
 2021-06-28 07:52:00 +00:00
Hugh Chen
c7eab66630 [automerger skipped] RESTRICT AUTOMERGE Fix phishing attacks over Bluetooth due to unclear warning message am: 8fe8e0fc21 -s ours am: c551f39977 -s ours am: e849d212b7 -s ours am: b8aa9ad04d -s ours am: 2a2a81dea5 -s ours am: 1e764fb0a6 -s ours am: 5e708fd301 -s ours am: 603f0a5b14 -s ours am: 8ff6323394 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ief23cb6007dc8243a8f92ee8994cd84d3626c133
 2021-06-28 07:51:55 +00:00
Hugh Chen
aa1b04462a [automerger skipped] RESTRICT AUTOMERGE Update string am: 3d6641a468 -s ours am: 9316df9560 -s ours am: 368ba20c95 -s ours am: d9fc75875e -s ours am: 064bf9dd81 -s ours am: d8ef6bc5af -s ours am: ad3ecbdd0c -s ours am: 8e922b95f3 -s ours am: 999cccd462 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I2b303f4454682a71f2640e5579d4425718e9c332
 2021-06-28 07:51:48 +00:00
Hugh Chen
f219828cab [automerger skipped] RESTRICT AUTOMERGE Fix phishing attacks over Bluetooth due to unclear warning message am: 8fe8e0fc21 -s ours am: c551f39977 -s ours am: e849d212b7 -s ours am: b8aa9ad04d -s ours am: 2a2a81dea5 -s ours am: 346b049fb1 -s ours am: 52b13e9795 -s ours am: 80d8aaad3d -s ours am: c4a519897f -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I0f6243ec76699c479784c8fb0948c5274614f091
 2021-06-28 07:51:41 +00:00
Hugh Chen
9b4119455b [automerger skipped] RESTRICT AUTOMERGE Update string am: 3d6641a468 -s ours am: 9316df9560 -s ours am: 368ba20c95 -s ours am: d9fc75875e -s ours am: 064bf9dd81 -s ours am: c91f8b0991 -s ours am: b17f196c3d -s ours am: d5b07b03d1 -s ours am: b49d68d7ce -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I4aec401ef3c4e915dce6c3580d8b87f813270dbc
 2021-06-28 07:51:35 +00:00
Hugh Chen
e4255f4d29 [automerger skipped] RESTRICT AUTOMERGE Fix phishing attacks over Bluetooth due to unclear warning message am: 8fe8e0fc21 -s ours am: c551f39977 -s ours am: e849d212b7 -s ours am: b8aa9ad04d -s ours am: 2a2a81dea5 -s ours am: 1e764fb0a6 -s ours am: 5e708fd301 -s ours am: aff7f97f8c -s ours am: 474c9fd1da -s ours 
am skip reason: subject contains skip directive

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

Change-Id: If5c613e81cd7dff7236d53acfcf7c3b1d43b8191
 2021-06-28 07:51:28 +00:00
Hugh Chen
f5b62e3ac6 [automerger skipped] RESTRICT AUTOMERGE Update string am: 3d6641a468 -s ours am: 9316df9560 -s ours am: 368ba20c95 -s ours am: d9fc75875e -s ours am: 064bf9dd81 -s ours am: d8ef6bc5af -s ours am: ad3ecbdd0c -s ours am: a3c7b58697 -s ours am: d3a1edfdab -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I8fcf34707e59a1a731593ef7d3f862043ed22744
 2021-06-28 07:51:21 +00:00
Hugh Chen
bca964069b [automerger skipped] RESTRICT AUTOMERGE Fix phishing attacks over Bluetooth due to unclear warning message am: 8fe8e0fc21 -s ours am: c551f39977 -s ours am: e849d212b7 -s ours am: b8aa9ad04d -s ours am: 2a2a81dea5 -s ours am: 346b049fb1 -s ours am: 52b13e9795 -s ours am: c52b6bc4bb -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I5b024d6b80686f7bf3a810d56d9e3770fb44bc41
 2021-06-28 07:40:44 +00:00
Hugh Chen
495b66de91 [automerger skipped] RESTRICT AUTOMERGE Update string am: 3d6641a468 -s ours am: 9316df9560 -s ours am: 368ba20c95 -s ours am: d9fc75875e -s ours am: 064bf9dd81 -s ours am: c91f8b0991 -s ours am: b17f196c3d -s ours am: 9e08ebacf4 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I251493467f31e090a3c6045c36712ddf8f13e46e
 2021-06-28 07:40:38 +00:00
Hugh Chen
8ff6323394 [automerger skipped] RESTRICT AUTOMERGE Fix phishing attacks over Bluetooth due to unclear warning message am: 8fe8e0fc21 -s ours am: c551f39977 -s ours am: e849d212b7 -s ours am: b8aa9ad04d -s ours am: 2a2a81dea5 -s ours am: 1e764fb0a6 -s ours am: 5e708fd301 -s ours am: 603f0a5b14 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I32c43f22c00b91633fafa164c9cfb29b157eb743
 2021-06-28 07:40:33 +00:00
Hugh Chen
999cccd462 [automerger skipped] RESTRICT AUTOMERGE Update string am: 3d6641a468 -s ours am: 9316df9560 -s ours am: 368ba20c95 -s ours am: d9fc75875e -s ours am: 064bf9dd81 -s ours am: d8ef6bc5af -s ours am: ad3ecbdd0c -s ours am: 8e922b95f3 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ied2dd046476816e4038800c3be82888056f65e17
 2021-06-28 07:40:28 +00:00
Hugh Chen
c4a519897f [automerger skipped] RESTRICT AUTOMERGE Fix phishing attacks over Bluetooth due to unclear warning message am: 8fe8e0fc21 -s ours am: c551f39977 -s ours am: e849d212b7 -s ours am: b8aa9ad04d -s ours am: 2a2a81dea5 -s ours am: 346b049fb1 -s ours am: 52b13e9795 -s ours am: 80d8aaad3d -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I95c245b0eda14f6dbf5d95b0bab6bd65e391760d
 2021-06-28 07:40:21 +00:00
Hugh Chen
b49d68d7ce [automerger skipped] RESTRICT AUTOMERGE Update string am: 3d6641a468 -s ours am: 9316df9560 -s ours am: 368ba20c95 -s ours am: d9fc75875e -s ours am: 064bf9dd81 -s ours am: c91f8b0991 -s ours am: b17f196c3d -s ours am: d5b07b03d1 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Iae9910c8a85ed028079c96d5f09e6291f550087a
 2021-06-28 07:40:16 +00:00
Hugh Chen
474c9fd1da [automerger skipped] RESTRICT AUTOMERGE Fix phishing attacks over Bluetooth due to unclear warning message am: 8fe8e0fc21 -s ours am: c551f39977 -s ours am: e849d212b7 -s ours am: b8aa9ad04d -s ours am: 2a2a81dea5 -s ours am: 1e764fb0a6 -s ours am: 5e708fd301 -s ours am: aff7f97f8c -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Id1304f50a7b82d6836cd4911a5e1730e9eb5ad05
 2021-06-28 07:40:12 +00:00
Hugh Chen
d3a1edfdab [automerger skipped] RESTRICT AUTOMERGE Update string am: 3d6641a468 -s ours am: 9316df9560 -s ours am: 368ba20c95 -s ours am: d9fc75875e -s ours am: 064bf9dd81 -s ours am: d8ef6bc5af -s ours am: ad3ecbdd0c -s ours am: a3c7b58697 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I5945a5d193132bdfedc1f0c4c3caf359c154fe59
 2021-06-28 07:40:07 +00:00
Hugh Chen
8ed3e48297 [automerger skipped] RESTRICT AUTOMERGE Fix phishing attacks over Bluetooth due to unclear warning message am: 8fe8e0fc21 -s ours am: c551f39977 -s ours am: e849d212b7 -s ours am: b8aa9ad04d -s ours am: 2a2a81dea5 -s ours am: 346b049fb1 -s ours am: 52b13e9795 -s ours am: 24fab85cb7 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ieeb30e0edbb23ff6008ecd6466f6861f8ef217f0
 2021-06-28 07:40:02 +00:00
Hugh Chen
f23808d9a2 [automerger skipped] RESTRICT AUTOMERGE Update string am: 3d6641a468 -s ours am: 9316df9560 -s ours am: 368ba20c95 -s ours am: d9fc75875e -s ours am: 064bf9dd81 -s ours am: c91f8b0991 -s ours am: b17f196c3d -s ours am: 7ec6f543a0 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Id44f88169f31993ccd6bc617f2325a27bd122646
 2021-06-28 07:39:56 +00:00
Hugh Chen
c36133a62a [automerger skipped] RESTRICT AUTOMERGE Fix phishing attacks over Bluetooth due to unclear warning message am: 8fe8e0fc21 -s ours am: c551f39977 -s ours am: e849d212b7 -s ours am: b8aa9ad04d -s ours am: 2a2a81dea5 -s ours am: 1e764fb0a6 -s ours am: 5e708fd301 -s ours am: 3f0cddb7ff -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I787706cb94dd1ea4e09d9245a4d267c4540abaad
 2021-06-28 07:39:50 +00:00
Hugh Chen
8104096c1d [automerger skipped] RESTRICT AUTOMERGE Update string am: 3d6641a468 -s ours am: 9316df9560 -s ours am: 368ba20c95 -s ours am: d9fc75875e -s ours am: 064bf9dd81 -s ours am: d8ef6bc5af -s ours am: ad3ecbdd0c -s ours am: 937984f37f -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I8ddfb561de26406924d469bf66ad950ba33c19c0
 2021-06-28 07:39:41 +00:00
Hugh Chen
80d8aaad3d [automerger skipped] RESTRICT AUTOMERGE Fix phishing attacks over Bluetooth due to unclear warning message am: 8fe8e0fc21 -s ours am: c551f39977 -s ours am: e849d212b7 -s ours am: b8aa9ad04d -s ours am: 2a2a81dea5 -s ours am: 346b049fb1 -s ours am: 52b13e9795 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I42a6ad11e692ffda53b86b78ca8edb1a9dd3fc29
 2021-06-28 07:28:03 +00:00
Hugh Chen
d5b07b03d1 [automerger skipped] RESTRICT AUTOMERGE Update string am: 3d6641a468 -s ours am: 9316df9560 -s ours am: 368ba20c95 -s ours am: d9fc75875e -s ours am: 064bf9dd81 -s ours am: c91f8b0991 -s ours am: b17f196c3d -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I131999e135f1965bafe5b9aa67f5d737b869491f
 2021-06-28 07:27:59 +00:00
Hugh Chen
aff7f97f8c [automerger skipped] RESTRICT AUTOMERGE Fix phishing attacks over Bluetooth due to unclear warning message am: 8fe8e0fc21 -s ours am: c551f39977 -s ours am: e849d212b7 -s ours am: b8aa9ad04d -s ours am: 2a2a81dea5 -s ours am: 1e764fb0a6 -s ours am: 5e708fd301 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: If5378005cf7a5445c24748a4aa07e0b539cec352
 2021-06-28 07:27:54 +00:00