Treehugger Robot
bfdcddcf09
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 5ae81b2084
-s ours am: b5a0cf9253
-s ours
...
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1534238
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Iced1762798a3b2ed8f994e4bab4379b353ae877b
2020-12-20 19:24:54 +00:00
Treehugger Robot
892c868c32
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 3d0be7ca05
-s ours
...
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1534258
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ica30d902800493f8a4f5d36365de2d4dca8e77b7
2020-12-20 19:11:29 +00:00
Treehugger Robot
b5a0cf9253
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 5ae81b2084
-s ours
...
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1534238
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I17af19488236d2b4376dc523c06c5ea27c67b616
2020-12-20 19:07:31 +00:00
Treehugger Robot
3d0be7ca05
Merge "Import translations. DO NOT MERGE ANYWHERE"
2020-12-20 18:43:29 +00:00
Treehugger Robot
5ae81b2084
Merge "Import translations. DO NOT MERGE ANYWHERE"
2020-12-20 18:38:59 +00:00
Bill Yi
cb8819b42f
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: If6d96e565647fb0bbbc643834aebb719fbc2d843
2020-12-20 12:41:07 +00:00
Bill Yi
c741c74967
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Ia7493562157c18c8a1ad4295d310a33400d90b20
2020-12-20 12:14:03 +00:00
TreeHugger Robot
52c92487d7
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: fbe124ac1d
-s ours am: 66cab67fd9
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13248589
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I2f8189f4a516855eb50d232768750ececb105906
2020-12-19 17:06:01 +00:00
TreeHugger Robot
66cab67fd9
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: fbe124ac1d
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13248589
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Iefbabc4c1b931ebc3e6402481dd970707e6905d1
2020-12-19 16:52:51 +00:00
TreeHugger Robot
fbe124ac1d
Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev
2020-12-19 16:30:13 +00:00
Bill Yi
86fcddb29b
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I2a52c07fe48323256cc95a05226098db1e6ae2fa
2020-12-19 06:15:53 +00:00
Tim Peng
65ba41c909
[automerger skipped] Add the explicitly mutable flag for creating a PendingIntent am: fbd36bc62b
am: d9312ce40c
-s ours
...
am skip reason: Change-Id Ic37b37bdbe6de6bdbad741985d3a920334240d80 with SHA-1 40d4e47b05
is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13185577
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I25d23369d8b4700b5329aa62f2b88f4393723434
2020-12-18 15:14:14 +00:00
Tim Peng
d9312ce40c
Add the explicitly mutable flag for creating a PendingIntent am: fbd36bc62b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13185577
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I378d49a95c30cdc330f0f05e89921a968cc86302
2020-12-18 14:56:50 +00:00
Jeremy Goldman
471659f30d
ModuleLicenseProviderTest converted to JUnit
...
The superclass ContentProvider's "getContext" method is final and
cannot be mocked, so a helper method visible for testing was added
to allow for context injection.
Bug: 175389659
Test: atest -c ModuleLicenseProviderTest
Change-Id: I9e20171340ae0a48d74fae44c7b356ea67dba43b
2020-12-18 12:06:16 +00:00
Jason Chang
3abd4c2ff8
Merge "Fix swipe for notification default should be on instead of off"
2020-12-18 09:29:06 +00:00
Tim Peng
fbd36bc62b
Add the explicitly mutable flag for creating a PendingIntent
...
Bug: 174047735
Test: make -j50 RunSettingsRoboTests
Merged-In: Ic37b37bdbe6de6bdbad741985d3a920334240d80
Change-Id: Id4a3c67025a06b63628298f4af28fbf5db45a566
2020-12-18 07:38:18 +00:00
TreeHugger Robot
65f8f1eb35
Merge "Import translations. DO NOT MERGE ANYWHERE"
2020-12-18 06:14:25 +00:00
Bill Yi
bb96edf359
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Ic74400c2f6e03cabfa3a8f6843942140a799b773
2020-12-17 12:12:20 -08:00
Jiashen Wang
5e9380f512
Merge "Move eSIM reset before telephony manager reset in ResetNetworkConfirm" into rvc-qpr-dev am: 60de630fee
am: ac636e9678
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13226296
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ib4b7d4f3c411a05b1d2279928e7831c7c420e37b
2020-12-17 18:52:41 +00:00
Jiashen Wang
ac636e9678
Merge "Move eSIM reset before telephony manager reset in ResetNetworkConfirm" into rvc-qpr-dev am: 60de630fee
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13226296
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Iaa4ad8d86ec4abe910b5eff52e406df0ec302766
2020-12-17 18:19:16 +00:00
Christine Franks
007e0a8e69
Merge "Connect reduce bright colors settings"
2020-12-17 17:55:17 +00:00
Jiashen Wang
60de630fee
Merge "Move eSIM reset before telephony manager reset in ResetNetworkConfirm" into rvc-qpr-dev
2020-12-17 17:44:31 +00:00
Bonian Chen
2d91a76166
[automerger skipped] Merge changes from topic "eSIM with same group UUID" into rvc-qpr-dev am: 0968b8603e
am: bb5688ea22
-s ours
...
am skip reason: Change-Id Ie91eb82504fd7cff6671803a2bc2560139690952 with SHA-1 79b8ce0212
is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13241064
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I98a258c9665bfdaf93965965e5b8bfa31f595415
2020-12-17 16:10:56 +00:00
Bonian Chen
aa1ae299ef
[automerger skipped] [Settings] Only display 1 SIM UI when multiple with same group UUID am: 150eb72a81
am: 4ea9c2d6a5
-s ours
...
am skip reason: Change-Id I0934a45a2917ab106627c733162efbee9a13f216 with SHA-1 a6b249d625
is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13209427
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I864660478553d38ac06c301708362db0ae9e8f04
2020-12-17 16:10:55 +00:00
TreeHugger Robot
9bac9aa6f5
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: bd246b61d2
-s ours am: b9d36a61e9
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13241884
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Iaf9f76af4265377b1887d57721a81f11b9031cc1
2020-12-17 16:10:46 +00:00
TreeHugger Robot
9e32066426
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: d006eb8d9d
-s ours am: d93b288441
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13241471
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I4c4c52b23d5409caadefab2011515c768e029294
2020-12-17 16:10:10 +00:00
Bonian Chen
bb5688ea22
Merge changes from topic "eSIM with same group UUID" into rvc-qpr-dev am: 0968b8603e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13241064
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I104ea3e6ace5e0d3fbe80d62e835d2fa986b852b
2020-12-17 15:52:05 +00:00
Bonian Chen
4ea9c2d6a5
[Settings] Only display 1 SIM UI when multiple with same group UUID am: 150eb72a81
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13209427
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ide453d4b8f1a2b40057804fa1bb47705c05dbf86
2020-12-17 15:52:03 +00:00
TreeHugger Robot
b9d36a61e9
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: bd246b61d2
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13241884
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ie6707ebc2929d9f865e365e0658282782f1dec98
2020-12-17 15:51:35 +00:00
TreeHugger Robot
d93b288441
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: d006eb8d9d
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13241471
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I92c208031dd426533e2193e52cfc1ee7dd1a8733
2020-12-17 15:50:45 +00:00
Bonian Chen
0968b8603e
Merge changes from topic "eSIM with same group UUID" into rvc-qpr-dev
...
* changes:
[Settings] code refactor - rename isSubscriptionCanBeDisplayed
[Settings] Only display 1 SIM UI when multiple with same group UUID
2020-12-17 15:27:46 +00:00
TreeHugger Robot
bd246b61d2
Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev
2020-12-17 15:12:31 +00:00
TreeHugger Robot
d006eb8d9d
Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev
2020-12-17 14:58:08 +00:00
John Li
5d5f57dc15
Merge "Haptic effect on swiping the notification item"
2020-12-17 13:33:45 +00:00
Jeremy Goldman
bcca2b19dd
Merge "Owners updates" am: 59465ee9d3
am: 2b1b458f1a
am: e6765a0dc8
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1531440
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I3aef110b7826093819576162c37974426afdb8a9
2020-12-17 13:28:41 +00:00
Jeremy Goldman
e6765a0dc8
Merge "Owners updates" am: 59465ee9d3
am: 2b1b458f1a
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1531440
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I308590ad0678932d17660264de8f7a81918bd371
2020-12-17 13:16:21 +00:00
Jeremy Goldman
2b1b458f1a
Merge "Owners updates" am: 59465ee9d3
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1531440
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I2de2ba79486a4ec7df4962ca22ea21162c9f7ba3
2020-12-17 12:59:18 +00:00
Jeremy Goldman
59465ee9d3
Merge "Owners updates"
2020-12-17 12:24:01 +00:00
Christine Franks
94f3cb0f2d
Connect reduce bright colors settings
...
Connection through new CDS APIs to come once that CL is merged.
Bug: 168065315
Test: atest SettingsUnitTests:com.android.settings.accessibility.ReduceBrightColorsIntensityPreferenceControllerTest
Change-Id: I9cc6a20ea5ea8a11c5fb3ef8a36e372d9c12b4bc
2020-12-17 01:06:36 -08:00
TreeHugger Robot
852a19b7a6
Merge "Fix phishing attacks over Bluetooth due to unclear warning message"
2020-12-17 08:46:03 +00:00
Bonian Chen
4e077caefc
Merge "[Settings] Close reset network confirm dialog when SIM removed"
2020-12-17 07:31:59 +00:00
Bonian Chen
24b64276fb
Merge "[Settings] code refactor - rename isSubscriptionCanBeDisplayed"
2020-12-17 07:31:24 +00:00
Jason Chang
fc7fbdb8ae
Fix swipe for notification default should be on instead of off
...
Set default "ON" when we can not get
SWIPE_BOTTOM_TO_NOTIFICATION_ENABLED value.
Bug: 175084985
Test: manual check Settings > System > Gesture > Swipe for notifications
Test: manual check it is disabled after One-handed mode toggled on
Test: make RunSettingsRoboTests ROBOTEST_FILTER=\
"SwipeBottomToNotificationSettingsTest"
Test: make RunSettingsRoboTests ROBOTEST_FILTER=\
"SwipeBottomToNotificationPreferenceControllerTest"
Change-Id: I176ba1c0e18c5ed7d1582d380db6ec190b6e1dec
2020-12-17 14:37:13 +08:00
timhypeng
deb93069c3
Remove MediaOutputPanel and MediaOutputSlice
...
Bug: 174192979
Test: build pass
Change-Id: Ibbbb9e7865ae991d13cd7a2d4fb9c5c75a689dea
2020-12-17 13:37:39 +08:00
Bill Yi
b4654c5ed2
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: If6a00d0339bbc6474ec6cdd0c730f0b864b2b701
2020-12-17 05:00:45 +00:00
Bill Yi
f6330f35c6
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I36766724094cdd2b8525fac2177ff61545305a46
2020-12-17 04:32:39 +00:00
John Li
ba55296a44
Haptic effect on swiping the notification item
...
Haptic once the swiping on the notification item is going to snap in either directions. The snap-in scenario is about the notification item when there is a "snap back point" i.e. if swiping the item back till a certain point it just snaps back to initial state but once it goes past a certain location it snaps into the new location.
- screenshot, https://screenshot.googleplex.com/6A8Gxs7yRwqAVk2
Bug: 175364588
Test: manual
Change-Id: I7e2ed19bfb7f863502e10233e3e23ee5d434b3b4
2020-12-17 03:31:18 +00:00
Hugh Chen
db9175015a
Fix phishing attacks over Bluetooth due to unclear warning message
...
Before this CL, there is a possible phishing attack allowing a malicious
BT device to acquire permissions based on insufficient information
presented to the user in the consent dialog. This could lead to local
escalation of privilege with no additional execution privileges needed.
User interaction is needed for exploitation.
This CL add more prompts presented for users to avoid phishing attacks.
Bug: 167403112
Test: send intent to test right prompts message is pop up. make -j42 RunSettingsRoboTests
Change-Id: Idc6ef558b692115bb82ea58cf223f5919b618633
2020-12-17 11:29:31 +08:00
TreeHugger Robot
5c522ea088
Merge "Immediately finish FingerprintEnroll when no FingerprintManager"
2020-12-17 03:29:00 +00:00
tim peng
ff8ce9d88a
Merge "Remove MediaOutputGroupPanel"
2020-12-17 03:18:31 +00:00