PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
71,997 Commits 1 Branch 0 Tags
74822b6dc323bdb8c5024e3749e1186fe7572f0c
Commit Graph

71997 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
android-build-team Robot
6667467207 Snap for 7041858 from fbd36bc62b to rvc-qpr2-release 
Change-Id: Id1a950177583518971831225ea7d98ea2f2d4857
 2020-12-19 00:20:01 +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
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
android-build-team Robot
05f2862d11 Snap for 7040187 from 60de630fee to rvc-qpr2-release 
Change-Id: I650520617e0703309695184b106e9ca865c459bc
 2020-12-18 00:11:40 +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
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
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
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
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
Bonian Chen
c2232020c4 [Settings] code refactor - rename isSubscriptionCanBeDisplayed 
canSubscriptionBeDisplayed is more readable.

Reasonale:
When cherry-picking ag/12886476 into Android R branch (ag/13209427), a comment from code reviewer suggested this change.
Since ag/12886476 has been merged for a while, another patch for it is perferred option when comparing with reverting that CL and resubmit it.

Bug: 175830728
Change-Id: Ie91eb82504fd7cff6671803a2bc2560139690952
Test: build pass
Merged-In: Ie91eb82504fd7cff6671803a2bc2560139690952
 2020-12-17 03:04:50 +00:00
Bonian Chen
150eb72a81 [Settings] Only display 1 SIM UI when multiple with same group UUID 
Some carrier(s) expand their service through providing eSIM in companion
with pSIM. Group UUID is designed to group them together as a single
SIM.

Bug: 169455114
Bug: 175069803
Test: make RunSettingsRoboTests ROBOTEST_FILTER=SubscriptionsPreferenceControllerTest
Change-Id: I0934a45a2917ab106627c733162efbee9a13f216
(cherry picked from commit a6b249d625)
Merged-In: I0934a45a2917ab106627c733162efbee9a13f216
 2020-12-17 02:12:44 +00:00
Malcolm Chen
de6485b8ea [automerger skipped] Automatically dismiss SIM combination warnings and selection dialogs. am: abd767ab1d -s ours 
am skip reason: Change-Id Iaf30062f555ec2c119c4aafd6aa013e73b5253f0 with SHA-1 1305cee98e is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I7ee77501d3180e81c0622a810dabd7a9a36ee891
 2020-12-16 22:33:34 +00:00
Xiangyu/Malcolm Chen
48bd757fac Merge "Automatically dismiss SIM combination warnings and selection dialogs." am: 33657f8d44 am: 04d95b6e8e 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1531286

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ifd0289d605724fd55adc9a5f37c7555e150efa85
 2020-12-16 20:05:15 +00:00
Xiangyu/Malcolm Chen
04d95b6e8e Merge "Automatically dismiss SIM combination warnings and selection dialogs." am: 33657f8d44 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1531286

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I37c0f54c42db2ba1338238d6477a2e3b88c20e85
 2020-12-16 19:30:17 +00:00
Xiangyu/Malcolm Chen
33657f8d44 Merge "Automatically dismiss SIM combination warnings and selection dialogs." 2020-12-16 19:01:52 +00:00
Jeremy Goldman
6efeeaafec Owners updates 
Add goldmanj to tests/unit for junit migration and
utility library creation
Add connectivity settings eng to settings/datausage.

Test: N/A, just owners update
Change-Id: I182ad6093677dc151b171d9e5aaa15cdd353c474
 2020-12-16 10:40:49 +00:00
Malcolm Chen
1305cee98e Automatically dismiss SIM combination warnings and selection dialogs. 
When configuring CBRS profiles this dialog / notification will be
dismissed after configuration is done, to avoid confusion.

Bug: 142092510
Test: manual and unittest
Change-Id: Iaf30062f555ec2c119c4aafd6aa013e73b5253f0
Merged-In: Iaf30062f555ec2c119c4aafd6aa013e73b5253f0
 2020-12-15 16:45:27 -08:00
android-build-team Robot
10aa9c856c Snap for 7035057 from ee1d07d59b to rvc-qpr2-release 
Change-Id: Ieaf5dca604c95bd1b616409508e3519021145b03
 2020-12-16 00:11:38 +00:00
Malcolm Chen
abd767ab1d Automatically dismiss SIM combination warnings and selection dialogs. 
When configuring CBRS profiles this dialog / notification will be
dismissed after configuration is done, to avoid confusion.

Bug: 142092510
Test: manual and unittest
Change-Id: Iaf30062f555ec2c119c4aafd6aa013e73b5253f0
Merged-In: Iaf30062f555ec2c119c4aafd6aa013e73b5253f0
 2020-12-15 22:11:55 +00:00
android-build-team Robot
81509558db Merge cherrypicks of [13231586, 13231437, 13231588, 13230397, 13230399, 13231350, 13231351, 13231354, 13231356, 13231439, 13231441, 13231358, 13231443, 13231360, 13231030, 13231457, 13230243, 13231032, 13231725, 13230838, 13231034, 13230840, 13230842, 13231361, 13231363, 13231745, 13231458, 13231747, 13231749, 13231751, 13229580, 13229582, 13231589, 13231591, 13231764, 13230400, 13230402, 13231784, 13231786, 13231788, 13231790] into rvc-qpr1-release 
Change-Id: Iaa4c4134161d41c43126a821177254ae2c570783
 2020-12-15 21:47:42 +00:00
Chris Manton
f065b87433 Add bluetooth package to permission request intent 
Limit the component that may resolve this intent to the
bluetooth package.

Bug: 158219161
Test: Security Fix
Tag: #security
Change-Id: If732f940a7aa256f5975349118e8eb6cf5584676
(cherry picked from commit 1951d27669)
 2020-12-15 21:46:25 +00:00
Jakub Pawlowski
763a4d5967 Prevent overlay drawing on top of Bluetooth activity dialog 
Bug: 168504491
Change-Id: I04ebe580db2b299af2bd5e44e0b0f20bd42f8535
(cherry picked from commit 4f7edf692f)
 2020-12-15 21:46:21 +00:00
Eugene Susla
8cef97cb2b RESTRICT AUTOMERGE 
Prevent non-system overlays from showing over notification listener consent dialog

Bug: 170731783
Test: use a visible overlay, ensure it's gone when notification consent is open
Change-Id: I58e017982f385ffc0d0ba2174512490b1d83dd36
(cherry picked from commit bfa7a75545)
 2020-12-15 21:46:16 +00:00
Wesley.CW Wang
421cbc63ad Update Battery Defender tips title am: ee1d07d59b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13223683

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ib651d0c708471af6cac52255b25159730269843e
 2020-12-15 18:48:30 +00:00
Wesley.CW Wang
ee1d07d59b Update Battery Defender tips title 
Bug: 175662315
Test: make SettingsRoboTests
Change-Id: I13ba773ea4402c5ae54260a8b8cbea4620eed535
 2020-12-15 10:21:06 +00:00
Jiashen Wang
c1ed4d5485 Move eSIM reset before telephony manager reset in ResetNetworkConfirm 
TelephonyManager#resetSettings triggers modem restart. It could cause
eSIM reset failure since Modem is not available. In order to resolve
this issue, we move eSIM reset befor telephony manager reset.
Bug: 175239934
Test: Manually tested

Change-Id: I44644c67577469898726ba07dcd6b68b3fb73b2a
 2020-12-14 22:44:41 -08:00
Hugh Chen
416110bac0 Add condition to check case of accessory combinations am: b767df1a08 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13218259

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I4a4502e3568d0049c4fff7f730b42d1bc975cea4
 2020-12-15 05:01:42 +00:00
Hugh Chen
c61ec502f5 Do nothing when choosing file transfer when in accessory mode am: e8dc7bc283 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13218257

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I3bd051363458a75a0dd190f41b0cf2901e3bf680
 2020-12-15 05:01:34 +00:00
Hugh Chen
2676dd763c Fix the usb menu didn't switch to "File Transfer/Android Auto" right after connecting to the car unit. am: 91ed63124c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13218253

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I3ca5a04cc2e8db3b2f50d1656fa54c8e02f8e394
 2020-12-15 05:01:25 +00:00
Diego Vela
25ee8c7cf0 Merge "Revert^2 "Add <uses-library> information."" am: a2e406ed85 am: 8403231bbb 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1526684

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I9a772056ff7f76d79e2f4864e0e796b5fddc1a27
 2020-12-14 22:38:33 +00:00
Diego Vela
acba236677 Merge "Revert "Add <uses-library> information."" am: 54b741096b am: 9d61c8a23d 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1527773

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I04da28694d92bf00afee8eec26f6cf9dc63e13a4
 2020-12-14 22:25:47 +00:00
Diego Vela
8403231bbb Merge "Revert^2 "Add <uses-library> information."" am: a2e406ed85 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1526684

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I1b27110024a7422343149b0eff00ed97bc726419
 2020-12-14 22:24:05 +00:00
Diego Vela
a2e406ed85 Merge "Revert^2 "Add <uses-library> information."" 2020-12-14 22:09:58 +00:00
Diego Vela
1ef19adf52 Revert^2 "Add <uses-library> information." 
7f1950928f

Change-Id: I8d3d6fee8e5a2b6eb337abb53f21b9b909b007c9
 2020-12-14 22:05:04 +00:00
Diego Vela
9d61c8a23d Merge "Revert "Add <uses-library> information."" am: 54b741096b 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1527773

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ib54a0349bf3590b40165d2205171e9c58a0a7b6f
 2020-12-14 21:59:32 +00:00
Diego Vela
54b741096b Merge "Revert "Add <uses-library> information."" 2020-12-14 21:49:14 +00:00
Diego Vela
7f1950928f Revert "Add <uses-library> information." 
Revert submission 1427961-uses-libs-23

Reason for revert: Broken build
Bug: 175607244
Reverted Changes:
I6ab699005:Add <uses-library> information.
Id5d5fe1df:Add <uses-library> information.
Id12741c9b:Add <uses-library> information.
I2fe6e09c2:Add <uses-library> information.

Change-Id: If1ca723c357ba3e8d9343fbb0f5d980d1e7ca1fb
 2020-12-14 21:14:24 +00:00
allenwtsu
91f11e9a47 Change carrier config 
Use KEY_ENABLE_PRESENCE_CAPABILITY_EXCHANGE_BOOL instead of
KEY_USE_RCS_PRESENCE_BOOL

Bug: 173828080
Test: build pass
Change-Id: I384686bd073a00341f4e552b71b24798619502fa
 2020-12-15 00:28:20 +08:00
Hugh Chen
b767df1a08 Add condition to check case of accessory combinations 
Before this CL, we only compare whether the value of function is
equal to accessory to ensure usb is in accessory mode. But in some
cases there are different accessory combinations, like
"accessory,audio source". It will make the condition return false
when encountering accessory combinations.

This CL will check whether the function will include accessory mode
to fix this issue.

Bug: 162451162
Test: make -j42 RunSettingsRoboTests
Change-Id: I7c80f02de5340799e292949608e19b86b187b982
Merged-In: I7c80f02de5340799e292949608e19b86b187b982
(cherry picked from commit 7d71081d45)
 2020-12-14 07:32:41 +00:00