Alex Salo
d1b9b7f87f
Merge "Implemented nearby button that displays wifi sharing intent and long press button that opens wifi qr share fragment"
2021-02-05 00:02:42 +00:00
changbetty
4de946a1e3
[automerger skipped] [Telephony settings] Settings crashes when rotate screen in Preferred network type am: acdb2d29e9 -s ours
...
am skip reason: Change-Id Id169353f6dc10306dddd823a904f0803b26a6ddc with SHA-1 dd91eadaaf is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13472811
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ib38e3dea462169b38e1f0be4350e33a42005522b
2021-02-04 23:42:03 +00:00
Abel Tesfaye
2babd2d36a
Implemented nearby button that displays wifi sharing intent and long press button that opens wifi qr share fragment
...
Test: locally with phone
Change-Id: I73663cd3e9e86431a9264925661159fbcd16b9d3
Merged-In: I931aabaada09c87b4a7936bcde4fcff8bc237dd0
2021-02-04 22:07:08 +00:00
Sarah Chin
57fbecc6c1
Update onSubscriptonOverride listener
...
Test: atest FrameworksTelephonyTests
Test: atest SubscriptionManagerTest
Bug: 175723642
Change-Id: I9436b414608d7c964185d3d5c3f1f554c65b2c12
Merged-In: I9436b414608d7c964185d3d5c3f1f554c65b2c12
2021-02-04 13:13:24 -08:00
Bill Yi
3f3eae8742
[automerger skipped] Merge "Merge RQ1A.210205.004 to aosp-master - DO NOT MERGE" am: 0e0360963a -s ours am: 21cea68a24 -s ours am: 573a375a5a -s ours am: 5f20dd4ce2 -s ours
...
am skip reason: Change-Id Ied29947db9713f171dd3c582554fddbb0a1c8d7e with SHA-1 3e1fb17420 is in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1573546
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I5678f476c9141a38eb618aa18e23607c27faa46e
2021-02-04 19:44:36 +00:00
Bill Yi
5f20dd4ce2
[automerger skipped] Merge "Merge RQ1A.210205.004 to aosp-master - DO NOT MERGE" am: 0e0360963a -s ours am: 21cea68a24 -s ours am: 573a375a5a -s ours
...
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1573546
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I34dda9fbcb9c5a75df2d97f31e21a88409a9c5a2
2021-02-04 19:22:30 +00:00
Bill Yi
181c387dcf
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: fe25d2494e -s ours am: 44e8570dc9 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13434320
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I6a31391dc1475c82a19e6c7a3150c98ec40e62e5
2021-02-04 18:43:39 +00:00
Bill Yi
573a375a5a
[automerger skipped] Merge "Merge RQ1A.210205.004 to aosp-master - DO NOT MERGE" am: 0e0360963a -s ours am: 21cea68a24 -s ours
...
am skip reason: Change-Id Ied29947db9713f171dd3c582554fddbb0a1c8d7e with SHA-1 3e1fb17420 is in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1573546
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I97e093144665318f408cf8031422b8b0ab06101a
2021-02-04 18:40:34 +00:00
Bill Yi
a3fea95b0d
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 3d1da30897 -s ours am: e00f3ea0a9 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13407414
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I1a3da8b0ea3f6d1872229f2874ee557099cfea7f
2021-02-04 18:40:14 +00:00
Bill Yi
44e8570dc9
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: fe25d2494e -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13434320
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I6b5392b3bca474937a5515a45a0f0dea2934087a
2021-02-04 18:33:53 +00:00
Bill Yi
e00f3ea0a9
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 3d1da30897 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13407414
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: If293bbaadd6761441027ebdc81e058d797e8253b
2021-02-04 18:21:07 +00:00
Bill Yi
21cea68a24
[automerger skipped] Merge "Merge RQ1A.210205.004 to aosp-master - DO NOT MERGE" am: 0e0360963a -s ours
...
am skip reason: Change-Id Ied29947db9713f171dd3c582554fddbb0a1c8d7e with SHA-1 3e1fb17420 is in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1573546
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Id4a3153c551d622287caed126207c367a8427c0d
2021-02-04 18:19:16 +00:00
Manish Singh
f8b9101314
Disable MTP transcoding by default
...
BUG: 178769134
Test: manual
Change-Id: Ib87d0f499bd699276326a41b37f42c7a85893afe
2021-02-04 17:41:20 +00:00
Bill Yi
0e0360963a
Merge "Merge RQ1A.210205.004 to aosp-master - DO NOT MERGE"
2021-02-04 17:08:42 +00:00
Weng Su
6463ee3b4f
[Provider Model] Internet Panel - Airplane mode is on am: 7a62ab1fff
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13461408
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I4699f0a556aa64c345ad2168ff454a12bf0cf74c
2021-02-04 15:19:57 +00:00
Mill Chen
d072e8501a
Restructure app info page
...
When the collapsing toolbar is applied in the Settings app, some pages
they used manage_applications_apps will have the collapsing toolbar not
work properly. This was caused by using multiple CoordinatorLayout and
AppBarLayout in these pages.
Bug: 177375909
Test: visual verified
Change-Id: Ibfeeab9cf907a23d18ee1ec2c450c523316cfc92
2021-02-04 18:53:44 +08:00
Weng Su
7a62ab1fff
[Provider Model] Internet Panel - Airplane mode is on
...
- Add "Airplane mode is on" to sub-title
- Set the header layout to CENTER_HORIZONTAL if it's no icon
- Hide "Settings" button
- Screenshot
https://screenshot.googleplex.com/6m5dFVZu7ar4nKW
Bug: 178717651
Test: manual test
atest InternetConnectivityPanelTest \
PanelFragmentTest \
ProviderModelSliceTest
Change-Id: I899a817fd99415e9cad608aa4deac1e45365696a
2021-02-04 18:48:34 +08:00
Treehugger Robot
e28a517416
Merge "[Settings] Add owner into Settings/network" am: 18b440997f am: 14993282f1 am: 93726f4de6 am: bcfd351521
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1574280
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I48b576783fe35f4443adb1d320be8f9595637920
2021-02-04 10:09:41 +00:00
Treehugger Robot
bcfd351521
Merge "[Settings] Add owner into Settings/network" am: 18b440997f am: 14993282f1 am: 93726f4de6
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1574280
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Icab0aeb6a8141489a70f80d4f39b54e09c16319a
2021-02-04 09:47:58 +00:00
Treehugger Robot
93726f4de6
Merge "[Settings] Add owner into Settings/network" am: 18b440997f am: 14993282f1
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1574280
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ibec0968f801f6a0d581394f06b41f26204277c37
2021-02-04 09:19:27 +00:00
Wesley.CW Wang
8cd4fd329e
Remove battery usage column icon (1/2)
...
Bug: 179236309
Test: make RunSettingsRoboTests -j40
Change-Id: I89b741e4cd5c8c53e3c67f4702eff0d95200731f
2021-02-04 09:12:53 +00:00
Treehugger Robot
14993282f1
Merge "[Settings] Add owner into Settings/network" am: 18b440997f
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1574280
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I5cd2673f9d2daea6de8c3329172e1f65590a03e1
2021-02-04 08:26:11 +00:00
Treehugger Robot
18b440997f
Merge "[Settings] Add owner into Settings/network"
2021-02-04 08:01:46 +00:00
Jeremy Goldman
230b6cb4e8
Unique display name util uses available, rather than active, subscriptions. am: 9e949b1920
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13472808
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I0a8866ca37e6792d22c34f99661a8044f22db637
2021-02-04 05:13:27 +00:00
Zoey Chen
f74551eb47
[Settings] Add owner into Settings/network
...
Bug: None
Test: Not required
Change-Id: I7cc22c9455f4f074c1e22dd27e1f9cb4028376a8
2021-02-04 13:11:04 +08:00
changbetty
acdb2d29e9
[Telephony settings] Settings crashes when rotate screen in Preferred network type
...
When activity is recreated, fragments are automatically reattached.
Need to check the savedInstanceState is null or not when we want to add framgment in MobileNetworkActivity.
(lost to check in ag/9667137)
Bug: 154087690
Test: Manual
make RunSettingsRoboTests -j ROBOTEST_FILTER=MobileNetworkActivityTest
Change-Id: Id169353f6dc10306dddd823a904f0803b26a6ddc
Merged-In: Id169353f6dc10306dddd823a904f0803b26a6ddc
2021-02-04 12:53:16 +08:00
Jeremy Goldman
9e949b1920
Unique display name util uses available, rather than active, subscriptions.
...
Test: atest -c SettingsUnitTest
Bug: 178560175
Change-Id: Ief035cf3de3ac03fe348095f36bfb78a41f93d2c
(cherry picked from commit c14e3b3115 )
Merged-In: Ief035cf3de3ac03fe348095f36bfb78a41f93d2c
2021-02-04 03:15:41 +00:00
Chiachang Wang
384b88e3fb
Replace NetworkUtils methods
...
NetworkUtils is moved to connectivity mainline module which is
not accessible for module outside. getNetworkPart() method is
used by wifi lib and Settings but no usage inside the module,
so move the method to framework lib to share with wifi lib and
Settings.
Also, NetworkUtils.numericToInetAddress() method is also hidden
and deprecated. It should be replaced by
InetAddresses.parseNumericAddress().
Update the corresponding usage to refer to these methods.
Bug: 172183305
Test: atest SettingsRoboTests
Change-Id: I2fb674e0d7da0b11ba70177853fd6259bce372a3
2021-02-04 02:14:17 +00:00
Bill Yi
0f8ac7d168
Merge RQ1A.210205.004 to aosp-master - DO NOT MERGE
...
Merged-In: Ied29947db9713f171dd3c582554fddbb0a1c8d7e
Merged-In: I402b212594a9e9f4c118d94008f53177d3430361
Change-Id: I19cd6d4c1152270a8936d7a9b999c870415f4221
2021-02-03 17:01:33 -08:00
Hall Liu
00a3a070f0
Merge "Rename setMobileDataPolicyEnabledStatus" into sc-dev am: 3717d5feda
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13459906
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I8aa91a4547cc6466fe0c384c3af635b4ef1b3e37
2021-02-03 20:17:15 +00:00
Hall Liu
3717d5feda
Merge "Rename setMobileDataPolicyEnabledStatus" into sc-dev
2021-02-03 19:54:14 +00:00
TreeHugger Robot
14c0c0aa7b
[automerger skipped] Merge "[Security Report] Fix Settings WifiScanModeActivity Overlaid issue" into rvc-qpr-dev am: 6dc9f825ec am: 15cd80a3b5 -s ours am: e14dc177f3 -s ours
...
am skip reason: Change-Id Ia7acad6d456ce5ebea2d982d4cb063d4f28cbfff with SHA-1 d47d8e4fc5 is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13432622
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ie6a1c125560a9f5229b848442427748f0922ee5c
2021-02-03 19:30:51 +00:00
TreeHugger Robot
e14dc177f3
[automerger skipped] Merge "[Security Report] Fix Settings WifiScanModeActivity Overlaid issue" into rvc-qpr-dev am: 6dc9f825ec am: 15cd80a3b5 -s ours
...
am skip reason: Change-Id Ia7acad6d456ce5ebea2d982d4cb063d4f28cbfff with SHA-1 d47d8e4fc5 is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13432622
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I4535cb790898cc014d951800efb77c3c9bb6caeb
2021-02-03 18:42:49 +00:00
TreeHugger Robot
15cd80a3b5
Merge "[Security Report] Fix Settings WifiScanModeActivity Overlaid issue" into rvc-qpr-dev am: 6dc9f825ec
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13432622
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I935c42a6c063f5a2a881aea48b33576b3a2ae572
2021-02-03 17:59:37 +00:00
TreeHugger Robot
6dc9f825ec
Merge "[Security Report] Fix Settings WifiScanModeActivity Overlaid issue" into rvc-qpr-dev
2021-02-03 17:24:05 +00:00
TreeHugger Robot
6f1c1e4541
Merge "WifiCallingPreferenceControllerTest migrated to junit" into sc-dev am: aa172787de
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13472005
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ie9f2afed1e931e097c40069386bc8085440c31f5
2021-02-03 16:31:49 +00:00
TreeHugger Robot
aa172787de
Merge "WifiCallingPreferenceControllerTest migrated to junit" into sc-dev
2021-02-03 15:47:31 +00:00
SongFerngWang
6ac2e7e04b
WifiCallingPreferenceControllerTest migrated to junit
...
Bug: 179246773
Test: atest -c WifiCallingPreferenceControllerTest
Change-Id: I9a097db77f71b31d8c92d5596ecf1794fe61a042
2021-02-03 22:11:56 +08:00
Aaron Huang
6c0e445f11
Merge "Replace @hide API with public API" am: d52cff9b57 am: 3178dfc76a am: 68bdb8e8b8 am: f31cb783da
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1566248
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Icbd995392f5974503d1db5bfc90c2aeb305c524a
2021-02-03 11:09:37 +00:00
Aaron Huang
f31cb783da
Merge "Replace @hide API with public API" am: d52cff9b57 am: 3178dfc76a am: 68bdb8e8b8
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1566248
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I71dd0c79cdf216746d57ea6686c3d8141c721a57
2021-02-03 10:23:59 +00:00
Aaron Huang
68bdb8e8b8
Merge "Replace @hide API with public API" am: d52cff9b57 am: 3178dfc76a
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1566248
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I1a1b589342e82b22a5a5a960fe94feaca2505adc
2021-02-03 09:35:49 +00:00
Aaron Huang
3178dfc76a
Merge "Replace @hide API with public API" am: d52cff9b57
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1566248
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I1a7897d737557abe1b7ede7f3931b2798e9610ab
2021-02-03 08:30:43 +00:00
Yanting Yang
4d7deb9873
Merge "Fix divider missing with AppButtonsPreference" into sc-dev am: 09010fe9f2
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13451892
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Id40706da32a3d5517fa28b73990362a179945a0a
2021-02-03 08:29:43 +00:00
Yanting Yang
09010fe9f2
Merge "Fix divider missing with AppButtonsPreference" into sc-dev
2021-02-03 08:08:54 +00:00
Aaron Huang
d52cff9b57
Merge "Replace @hide API with public API"
2021-02-03 07:37:33 +00:00
TreeHugger Robot
7b0815d729
Merge "Fix security issue" into sc-dev am: 384cf0e9e7
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13448954
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I1793b301bf854cc8f198a8e9beb4c86f4035937b
2021-02-03 06:42:34 +00:00
Yanting Yang
868eb6410d
Fix divider missing with AppButtonsPreference
...
Symptom:
The divider below of the AppButtonsPreference is missing on the
Storage & cache and Battery pages of app.
Root cause:
The PreferenceCategory divider has been hidden for Android S design.
If we put the AppButtonsPreference and the PreferenceCategory together,
the divider will be default hidden by PreferenceCategory.
Solution:
To add back the divider for AppButtonsPreference, override the
allowDividerAbove in the PreferenceCategory.
Fixes: 179118594
Test: visual
Change-Id: I74ba7679a69a578a87734b9920f53a20c79d6567
2021-02-03 14:38:50 +08:00
TreeHugger Robot
384cf0e9e7
Merge "Fix security issue" into sc-dev
2021-02-03 05:56:17 +00:00
Bill Yi
d6192516e0
[automerger skipped] Merge RQ1A.210205.004 to stage-aosp-master - DO NOT MERGE am: 3e1fb17420 -s ours am: d5c30053f5 -s ours am: 95e0060abb -s ours
...
am skip reason: Change-Id Ia1d85c7136b824e69077ea06c68d142a706c2b11 with SHA-1 62f6b96b51 is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13462033
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I08aceed18621db28ff1775e42911e92577b39808
2021-02-03 02:56:53 +00:00
Bill Yi
95e0060abb
[automerger skipped] Merge RQ1A.210205.004 to stage-aosp-master - DO NOT MERGE am: 3e1fb17420 -s ours am: d5c30053f5 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13462033
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I064b66ba616f5ec30a9f7360135e2372b526b12a
2021-02-03 02:20:17 +00:00