Commit Graph

97040 Commits

Author SHA1 Message Date
Weng Su
5cbaa375cd [RESTRICT AUTOMERGE] Revert "Add comment to AndroidManifest"
This reverts commit 56a88885cc.

Reason for revert: rollback CLs to avoid compatibility risks

Bug: 185126813
Change-Id: Ie9d17faa536186e9787ff17b9bc7f7e30adabd1c
2021-10-04 07:36:06 +00:00
Weng Su
34b571612f [RESTRICT AUTOMERGE] Revert "Add permission checking to WifiDialogActivity"
This reverts commit 71e728e934.

Reason for revert: rollback CLs to avoid compatibility risks

Bug: 185126813
Change-Id: I9251eb35ecba9bcc07eb3763c47c3ad7f55897f1
2021-10-04 07:29:56 +00:00
TreeHugger Robot
fd6589ab00 Merge "Audio balance slider is off-center" into sc-v2-dev am: 982e22c6e1
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15958175

Change-Id: I99febd12f072b1550c9c330fce2d011f5b9974e3
2021-10-04 05:48:57 +00:00
TreeHugger Robot
982e22c6e1 Merge "Audio balance slider is off-center" into sc-v2-dev 2021-10-04 05:37:24 +00:00
TreeHugger Robot
0f933bcc00 Merge "[Settings] Refactor MobileNetworkUtils" 2021-10-04 03:18:12 +00:00
Weng Su
f603e671e7 [RESTRICT AUTOMERGE] Revert "Add permission checking to WifiDialogActivity"
This reverts commit 71e728e934.

Reason for revert: rollback CLs to avoid compatibility risks

Bug: 185126813
Change-Id: I9251eb35ecba9bcc07eb3763c47c3ad7f55897f1
2021-10-03 18:26:32 +00:00
TreeHugger Robot
b30022a1d4 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev am: da8e9c1108 -s ours am: ce03913deb -s ours
am skip reason: subject contains skip directive

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

Change-Id: I5c82c36722bd3538305a5225dd5e8f30ae840cb7
2021-10-02 06:54:18 +00:00
Bill Yi
38879cdeb1 [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: ae858a0237 am: 853fdb2f22 -s ours am: c58566b623 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I1d00dbcc2a7bcf7f6cc28d3538a895d5b801a5aa
2021-10-02 06:54:14 +00:00
Bill Yi
e3fbef2b5a [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: ae858a0237 am: 7093e26067 -s ours am: c9920edd8e -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ie0f0ba4af2a1b8399b1a374ba65b45835b6e8874
2021-10-02 06:54:07 +00:00
TreeHugger Robot
5cf79e13ec [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev am: da8e9c1108 -s ours am: 02b3384ae1 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Iaaa7224ca5240ac96ebd6e29d5df0d9a875031de
2021-10-02 06:49:58 +00:00
Bill Yi
3560314b3f [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: ae858a0237 am: 853fdb2f22 -s ours am: 35e8964074 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I88214d6d1ef786a7e479e72306fcab0f0b7f55e1
2021-10-02 06:49:42 +00:00
TreeHugger Robot
76bf7b3992 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 131a6a8b05 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ie96199f129f6cc8fcc43153552019b785d7a5673
2021-10-02 06:49:04 +00:00
TreeHugger Robot
ce03913deb [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev am: da8e9c1108 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I2dea37dac41c682b9ed26e4f91e40e55a49fba7f
2021-10-02 06:43:06 +00:00
TreeHugger Robot
02b3384ae1 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev am: da8e9c1108 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I2e108813b56f1a2a0bdfbf26b1299704f818a372
2021-10-02 06:43:05 +00:00
Bill Yi
35e8964074 [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: ae858a0237 am: 853fdb2f22 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I41cdf263c606a7e4307abc7a82afa6cb7012707c
2021-10-02 06:43:02 +00:00
Bill Yi
c58566b623 [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: ae858a0237 am: 853fdb2f22 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I9681141c17e40d26b8125911133e413cf5c501f9
2021-10-02 06:42:59 +00:00
Bill Yi
c9920edd8e [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: ae858a0237 am: 7093e26067 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I3ad7194b9b6159e101b87dc3f8ddd4ad7f1ddf95
2021-10-02 06:42:40 +00:00
TreeHugger Robot
f3e917b850 Merge changes from topic "presubmit-am-334d138faa3d4553b7d7a0e63caceee2" into sc-mainline-prod am: d84c315d38
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15962722

Change-Id: I6436c6f65c384f16cb29d902e230d9e3ea6798fb
2021-10-02 06:35:46 +00:00
TreeHugger Robot
131a6a8b05 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev 2021-10-02 06:34:39 +00:00
TreeHugger Robot
da8e9c1108 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev 2021-10-02 06:34:33 +00:00
TreeHugger Robot
d84c315d38 Merge changes from topic "presubmit-am-334d138faa3d4553b7d7a0e63caceee2" into sc-mainline-prod
* changes:
  [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: ae858a0237
  Import translations. DO NOT MERGE ANYWHERE
2021-10-02 06:32:12 +00:00
TreeHugger Robot
f6e08c8c56 Merge changes from topic "presubmit-am-334d138faa3d4553b7d7a0e63caceee2"
* changes:
  [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: ae858a0237 2p: 58d731dd8e
  [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: ae858a0237
  Import translations. DO NOT MERGE ANYWHERE
2021-10-02 06:32:12 +00:00
TreeHugger Robot
1241c787ca Merge "Import translations. DO NOT MERGE ANYWHERE" 2021-10-02 06:27:27 +00:00
Bill Yi
9e6aca3b26 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: Iced2e8ac5c2387729982b92d55c1776460c4d369
2021-10-02 04:50:03 +00:00
Bill Yi
41533a64d6 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I9a5eb92a2e472ba7faca95791c4b748f71c20a58
2021-10-02 04:46:24 +00:00
Bill Yi
9848b647f7 [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: ae858a0237 2p: 58d731dd8e
Blank merge reason: parent was merged -s ours

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

Change-Id: I63447d82f5c59bb689e4977929af79901c4ca8eb
2021-10-02 04:43:09 +00:00
Bill Yi
7093e26067 [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: ae858a0237
Blank merge reason: commit message contains skip directive

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

Change-Id: I26116054259653dcc9f68186b1a4a6bf0a13c393
2021-10-02 04:43:05 +00:00
Bill Yi
853fdb2f22 [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: ae858a0237
Blank merge reason: commit message contains skip directive

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

Change-Id: If00f802350f9a2769fb8cc2d992c0f7b42f09f43
2021-10-02 04:43:05 +00:00
Bill Yi
58d731dd8e [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: ae858a0237
Blank merge reason: commit message contains skip directive

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

Change-Id: Ie6c0c856bec1c105543c0009f3e95663a821326d
2021-10-02 04:43:05 +00:00
Bill Yi
ae858a0237 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I6ce3387fb38bbb8530d28c7265ccd7563e19be4d
2021-10-02 04:42:52 +00:00
Bill Yi
87872bced9 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I38b8b8fa6200b99afc73e92a3ba3734fe69204b2
2021-10-02 04:38:51 +00:00
Bill Yi
be0325e228 [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 85acba44c7
Blank merge reason: commit message contains skip directive

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

Change-Id: I1780ce0fb21d99454460101949a284ddc78c1182
2021-10-02 04:28:14 +00:00
Bill Yi
85acba44c7 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I4898438471b4b34cd86437ca822a9433471d18e7
2021-10-02 04:28:03 +00:00
TreeHugger Robot
e74c7b8faa [automerger skipped] Merge "Add more info on the dialog of AllowBindAppWidgetActivity" into sc-qpr1-dev am: 468bad73d7 -s ours am: 10198632d3 -s ours
am skip reason: Merged-In Idf1f73bc1cdb8ef9ce632bfe4722b1469a6b8531 with SHA-1 1564ef5ca1 is already in history

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

Change-Id: Ief8876e4da3a000966ec00a30db04c79da8e2d44
2021-10-01 23:54:10 +00:00
TreeHugger Robot
299117b77e [automerger skipped] Merge "Add more info on the dialog of AllowBindAppWidgetActivity" into sc-qpr1-dev am: 468bad73d7 am: 6d4c35933c -s ours
am skip reason: Merged-In Idf1f73bc1cdb8ef9ce632bfe4722b1469a6b8531 with SHA-1 1564ef5ca1 is already in history

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

Change-Id: I904e24c13539c25beae1a61bf2cbf746fd2875b8
2021-10-01 23:53:36 +00:00
TreeHugger Robot
6d4c35933c Merge "Add more info on the dialog of AllowBindAppWidgetActivity" into sc-qpr1-dev am: 468bad73d7
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15952458

Change-Id: I5d3ee4751264b436a3e1bc9d9ff7f90037a92102
2021-10-01 23:44:05 +00:00
TreeHugger Robot
10198632d3 [automerger skipped] Merge "Add more info on the dialog of AllowBindAppWidgetActivity" into sc-qpr1-dev am: 468bad73d7 -s ours
am skip reason: Merged-In Idf1f73bc1cdb8ef9ce632bfe4722b1469a6b8531 with SHA-1 1564ef5ca1 is already in history

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

Change-Id: I7fe4515ab8344495d0086c574c9a099bbf0fc34f
2021-10-01 23:43:30 +00:00
TreeHugger Robot
468bad73d7 Merge "Add more info on the dialog of AllowBindAppWidgetActivity" into sc-qpr1-dev 2021-10-01 23:26:52 +00:00
TreeHugger Robot
2fe1fd69e6 [automerger skipped] Merge "Fetch admin details if not present in Intent." into sc-qpr1-dev am: e750fb7528 am: 83c5600879 -s ours
am skip reason: Merged-In Idda6078a64c03588f0b786ebc79079198ab722fe with SHA-1 49d20fa68e is already in history

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

Change-Id: I064be8d68f3ec14955b07bfd82871be6083a7bc5
2021-10-01 18:29:15 +00:00
TreeHugger Robot
a9b0b5f659 Merge "Fetch admin details if not present in Intent." into sc-qpr1-dev am: e750fb7528 am: 39fae9778c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15843434

Change-Id: If019d80c9d23c420824cff63e58035fd39f647fb
2021-10-01 18:24:26 +00:00
TreeHugger Robot
83c5600879 Merge "Fetch admin details if not present in Intent." into sc-qpr1-dev am: e750fb7528
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15843434

Change-Id: Ie4441b828293a92208ba4b1bcd589fbd1d5e3f7e
2021-10-01 18:21:22 +00:00
TreeHugger Robot
39fae9778c Merge "Fetch admin details if not present in Intent." into sc-qpr1-dev am: e750fb7528
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15843434

Change-Id: I0e708bc4dd419c72389dafb51dadb240fa8a79e7
2021-10-01 18:17:16 +00:00
TreeHugger Robot
e750fb7528 Merge "Fetch admin details if not present in Intent." into sc-qpr1-dev 2021-10-01 18:15:58 +00:00
Diego Vela
7f96530bf8 Update window aar
Update window aar to match api in Jetpack.

Bug: 199123327
Test: Manual
Change-Id: If1b07be9501823b1811a84715e9b9362eef75176
2021-10-01 10:15:03 -07:00
Weng Su
cabcecb2e8 [RESTRICT AUTOMERGE] Revert "Add SafetyNet logging"
This reverts commit 199528d460.

Reason for revert: rollback CLs to avoid compatibility risks

Bug: 185126813
Change-Id: I5ed1782f1a35681ab6be4f74ea3156420b7dad5f
2021-10-01 15:06:20 +00:00
Weng Su
f9e7a17247 [RESTRICT AUTOMERGE] Revert "Add comment to AndroidManifest"
This reverts commit 56a88885cc.

Reason for revert: rollback CLs to avoid compatibility risks

Bug: 185126813
Change-Id: Ie9d17faa536186e9787ff17b9bc7f7e30adabd1c
2021-10-01 15:00:12 +00:00
Bonian Chen
1eef718549 [Settings] Refactor MobileNetworkUtils
Code refactor MobileNetworkUtils
  - reorder the rule within #shouldDisplayNetworkSelectOptions()

Bug: 201757298
Test: presubmit pass
Change-Id: Idba39ca806263b850fa23aa8bb2dd423860bc043
2021-10-01 23:00:03 +08:00
Weng Su
f1f0353ed7 [RESTRICT AUTOMERGE] Revert "Add SafetyNet logging"
This reverts commit 199528d460.

Reason for revert: rollback CLs to avoid compatibility risks

Bug: 185126813
Change-Id: I5ed1782f1a35681ab6be4f74ea3156420b7dad5f
2021-10-01 14:51:33 +00:00
Bonian Chen
b74ccf7f33 [Settings] Refactor MobileNetworkUtils
Code refactor MobileNetworkUtils
  - reduce number of accessing to isWorldMode()

Bug: 201757298
Test: presubmit pass
Change-Id: I710255887b5ba8038c3faf5471a88a02a15c015e
2021-10-01 13:32:57 +00:00
Bonian Chen
bc02a2d939 [Settings] Refactor MobileNetworkUtils
Code refactor MobileNetworkUtils
    - move isWorldMode() detection to the first line
      within shouldSpeciallyUpdateGsmCdma()

Bug: 201757298
Test: presubmit pass
Change-Id: Iccffca52b2e0e48ff62ec749c0cf3faa273b0e18
2021-10-01 11:18:36 +00:00