PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
59,754 Commits 1 Branch 0 Tags
a3798023666b9747dca5dd6d87ff4a89b28b881c
Commit Graph

59754 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Automerger Merge Worker
f3aa88ccf2 Merge "Fix NPE when coming back to settings homepage." into rvc-dev am: 21338186d5 
Change-Id: I5cf0e713e0016b1463ba7e7e39628adc3cc407c2
 2020-03-11 11:40:51 +00:00
TreeHugger Robot
21338186d5 Merge "Fix NPE when coming back to settings homepage." into rvc-dev 2020-03-11 11:40:02 +00:00
Automerger Merge Worker
2df7ee7f0e Merge "[Wi-Fi] Fix 2 Wi-Fi shortcuts bug" into rvc-dev am: f9570ad33f 
Change-Id: I7191ca8a3c7c1afcd4472649c11eb19eb0df919d
 2020-03-11 11:34:37 +00:00
Yi-Ling Chuang
b8eb466dd1 Fix WifiTetherSettingsTest 
Bug: 151201888
Test: run WifiTetherSettingsTest successfully
Change-Id: I80df83f3dc720c80734ec083c33bab5c56c52796
 2020-03-11 19:33:09 +08:00
TreeHugger Robot
f9570ad33f Merge "[Wi-Fi] Fix 2 Wi-Fi shortcuts bug" into rvc-dev 2020-03-11 11:32:12 +00:00
Automerger Merge Worker
ebe7dcaff8 Merge "Update the OWNER files" into rvc-dev am: a38859b2b7 
Change-Id: I8507db93e0193beb937e6684c18d4fbbdef08c99
 2020-03-11 11:29:06 +00:00
Yi-Ling Chuang
f46fd991fa Fix DevelopmentSettingsDashboardFragmentTest 
Fixes: 151206654
Bug: 150907639
Test: robotests
Change-Id: I36a1dacc7fe2ccd3b724a9aa135447db97fa3d41
 2020-03-11 19:16:35 +08:00
TreeHugger Robot
a38859b2b7 Merge "Update the OWNER files" into rvc-dev 2020-03-11 11:08:21 +00:00
Tsung-Mao Fang
a5da81db36 Tweak strings for assist app 
Follow up the new Assist app string updates.

Bug: 151193605
Test: build and see this page.
Change-Id: Ibbc51cd282c6ae0f9ef1722c33688f21e0c78da7
 2020-03-11 10:22:09 +00:00
Yi-Ling Chuang
542f76a51e Fix TetherSettingsTest 
Fixes: 151204777
Test: run TetherSettingsTest
Change-Id: Ic510aac7fc7f9af095e78473bc191a4e903dcaba
 2020-03-11 18:18:36 +08:00
menghanli
19cf6ddff8 Update R acessibility assets and strings (2/n) 
- Temporary-use template summary by shortcut state

Bug: 148837311
Test: Manual test
Change-Id: Ia720b8f3f317bb1874d6758ebc4fbf4145d0c217
 2020-03-11 17:21:27 +08:00
Yi-Ling Chuang
a591d7a082 Fix NPE when coming back to settings homepage. 
When users navigate back to the homepage, if there is a slice being
displayed, slice callback will be triggered. It will then check if this
slice has any error hint, where NPE would occur if the slice turns out
to be null. Hence, add a null check before checking slice hint.

Fixes: 148158780
Test: rebuild and navigate back to the homepage.
Change-Id: I2b04dc0d64a223cc85f6af55b2ae2dbc5f3e1f40
 2020-03-11 16:52:44 +08:00
Sunny Shao
3d3757683c Update the OWNER files 
Bug: 151179432
Test: manual review
Change-Id: I2bfd917c2bea2d71303ed9aecf29d850f12eec3d
 2020-03-11 16:45:14 +08:00
Arc Wang
0a45c4099d [Wi-Fi] Fix 2 Wi-Fi shortcuts bug 
Check feature flag to show the shortcut of
WifiSettingsActivity or WifiSettings2Activity.

Bug: 151133236
Test: manual
      Home context menu -> Widgets -> Settings shortcut
      Should only show 1 Wi-Fi shortcut option.
Change-Id: Ie980b69ce1f23614475070b5c74d9a6d5cdab7ae
 2020-03-11 15:41:13 +08:00
Automerger Merge Worker
e740596789 Merge "[Wi-Fi] Add STA+AP information in Hotspot & tethering footer" into rvc-dev am: b8fb854e98 am: cb9cfc19c3 am: 423c789130 
Change-Id: I08b8fd741fdebd4caa5f354ddbc14fcfe5c1a0f3
 2020-03-11 04:54:19 +00:00
Automerger Merge Worker
423c789130 Merge "[Wi-Fi] Add STA+AP information in Hotspot & tethering footer" into rvc-dev am: b8fb854e98 am: cb9cfc19c3 
Change-Id: Ic33bc4574017d972cd4007ab25373c9b6443652e
 2020-03-11 04:34:11 +00:00
Automerger Merge Worker
cb9cfc19c3 Merge "[Wi-Fi] Add STA+AP information in Hotspot & tethering footer" into rvc-dev am: b8fb854e98 
Change-Id: I0764e99d5970a34f7cf3a01665870123151a94f5
 2020-03-11 04:20:12 +00:00
Arc Wang
b8fb854e98 Merge "[Wi-Fi] Add STA+AP information in Hotspot & tethering footer" into rvc-dev 2020-03-11 04:00:49 +00:00
Automerger Merge Worker
579a1462a0 Merge "Revert "Ignore some failed tests."" into rvc-dev am: 6aa40f6ea7 am: 88321847f2 am: a4f49c2211 
Change-Id: Ib3dd9cf888c4de1c29d193bc4f606fb256b6d9e9
 2020-03-11 04:00:13 +00:00
Automerger Merge Worker
a4f49c2211 Merge "Revert "Ignore some failed tests."" into rvc-dev am: 6aa40f6ea7 am: 88321847f2 
Change-Id: Id257eb221584b0236ca15ed49486419979a8e828
 2020-03-11 03:46:30 +00:00
Automerger Merge Worker
88321847f2 Merge "Revert "Ignore some failed tests."" into rvc-dev am: 6aa40f6ea7 
Change-Id: I56111d64a362e93fae8ff5b12af7f12e53bfc043
 2020-03-11 03:33:13 +00:00
TreeHugger Robot
6aa40f6ea7 Merge "Revert "Ignore some failed tests."" into rvc-dev 2020-03-11 03:16:49 +00:00
Yi-Ling Chuang
ef4550c504 Revert "Ignore some failed tests." 
This reverts commit db4fd2b1c3.

Reason for revert: Test failures are fixed.

Fixes: 150914017
Change-Id: I561816d51427f1141aae42128659b42cc25221dd
 2020-03-11 03:16:33 +00:00
Automerger Merge Worker
c8ec6b0fd6 Merge "Fix Tx link speed still showing after disconnecting from wifi network" into rvc-dev am: bff2347964 am: b56ca208d9 am: e09cffdfdb 
Change-Id: I36b5bbba5da4c9983643af41629e06c83faa90d6
 2020-03-11 01:07:11 +00:00
Automerger Merge Worker
e09cffdfdb Merge "Fix Tx link speed still showing after disconnecting from wifi network" into rvc-dev am: bff2347964 am: b56ca208d9 
Change-Id: I8c71ba4fec4304dbb8d5370c0f71c0ec8202a93d
 2020-03-11 00:54:35 +00:00
Automerger Merge Worker
b56ca208d9 Merge "Fix Tx link speed still showing after disconnecting from wifi network" into rvc-dev am: bff2347964 
Change-Id: I1f920eab1476d7365ea1cac9fd680f4b2aa56637
 2020-03-11 00:42:55 +00:00
Quang Luong
bff2347964 Merge "Fix Tx link speed still showing after disconnecting from wifi network" into rvc-dev 2020-03-11 00:31:29 +00:00
Kevin Chyn
59834e6bf4 Partial revert of ag/10482633 
SUW is using activity result codes already. Let's stick with the old
behavior until/if there's a way to make it work nicely.

Fixes: 151058692

Test: Skip fingerprint in SUW. Fingerprint not shown again in SUW.
Change-Id: I3c52cddd568dc5ded6bf810272ffb77f0841c692
 2020-03-10 17:26:26 -07:00
Christopher Tate
36f182159f DO NOT MERGE - Track framework changes to crashApplication 
Bug: 128649910
Test: manual
Test: atest OsHostTests#testForegroundServiceBadNotification
Merged-In: Ia613372360f8b32f6ad3b7d2092e7cb27f067fbc
Change-Id: I6894e3df309669ba98ad23432aa18d6043739aad
 2020-03-10 15:52:05 -07:00
Automerger Merge Worker
9a71912db6 Merge "Disable 5G Scanning in NetworkScanHelper" into rvc-dev am: a8bee76d11 am: 17718f979a am: 2cec639f03 
Change-Id: Ibe4f5cd65b531f0b26a38cdef0227b1b482d4987
 2020-03-10 17:31:59 +00:00
Automerger Merge Worker
2cec639f03 Merge "Disable 5G Scanning in NetworkScanHelper" into rvc-dev am: a8bee76d11 am: 17718f979a 
Change-Id: I0d35897985d9ab4506971bb75c5d4b614efedb4c
 2020-03-10 17:19:23 +00:00
Automerger Merge Worker
17718f979a Merge "Disable 5G Scanning in NetworkScanHelper" into rvc-dev am: a8bee76d11 
Change-Id: I4421beef3f7468b58d3b83c444fcebaf1a758d83
 2020-03-10 16:58:22 +00:00
Nathan Harold
a8bee76d11 Merge "Disable 5G Scanning in NetworkScanHelper" into rvc-dev 2020-03-10 16:35:02 +00:00
Kenny Guy
37295f86bf DO NOT MERGE 
Update battery manager toggle to support on / off summary.

Screenshots attached to the bug.

Bug: 148847755
Test: Visual - on blueline aosp build / boot / check settings pages
Test: Visual - on blueline eng build / boot / check settings pages
Change-Id: I44b1c74baf4bafa549519d4f20fa470389cd5e0b
(cherry picked from commit 1a289bdeba)
 2020-03-10 16:10:29 +00:00
Automerger Merge Worker
90d62de46c Merge "The text contrast of "disconnected" in Switch media output panel is insufficient." into rvc-dev am: 1334a7e986 am: 2f2d8d5949 am: 548a47fa63 
Change-Id: I4d1b553a81bce90ca9dea5d93935012378fc45b4
 2020-03-10 15:41:15 +00:00
Automerger Merge Worker
548a47fa63 Merge "The text contrast of "disconnected" in Switch media output panel is insufficient." into rvc-dev am: 1334a7e986 am: 2f2d8d5949 
Change-Id: I0bae6ab0e8783f46f189ec7eb7bdd8c2e739f1ef
 2020-03-10 15:16:06 +00:00
Automerger Merge Worker
2f2d8d5949 Merge "The text contrast of "disconnected" in Switch media output panel is insufficient." into rvc-dev am: 1334a7e986 
Change-Id: I4bfd5350cbf0365770f3504206febce23ef2c09f
 2020-03-10 15:02:04 +00:00
TreeHugger Robot
1334a7e986 Merge "The text contrast of "disconnected" in Switch media output panel is insufficient." into rvc-dev 2020-03-10 14:45:46 +00:00
Automerger Merge Worker
b5ee8d3119 Merge "[Wi-Fi] Use startActivityForResult instead of startActivity to launch google help page" into rvc-dev am: 7c2979c340 am: 9bc76d1b50 am: 5c874710a3 
Change-Id: I0e5d07cd7c690eef446ff0c49ded2ced37478706
 2020-03-10 13:10:06 +00:00
Automerger Merge Worker
5c874710a3 Merge "[Wi-Fi] Use startActivityForResult instead of startActivity to launch google help page" into rvc-dev am: 7c2979c340 am: 9bc76d1b50 
Change-Id: Id7b516abb8e8f01bdf0eff32359925e8c517cd56
 2020-03-10 12:43:45 +00:00
Automerger Merge Worker
9bc76d1b50 Merge "[Wi-Fi] Use startActivityForResult instead of startActivity to launch google help page" into rvc-dev am: 7c2979c340 
Change-Id: I5a5b4379c819f83bdc2296e2f0e4d1efb2479987
 2020-03-10 12:28:50 +00:00
TreeHugger Robot
7c2979c340 Merge "[Wi-Fi] Use startActivityForResult instead of startActivity to launch google help page" into rvc-dev 2020-03-10 12:12:46 +00:00
calvinpan
75867d8f63 Hide the 5G opiton when 5G has been disallowed 
1. Create PreferenceEntriesBuilder for 5G entry. In the past, the
preferred network type entries was based on CarrierConfigManger value
but 5G option is based on allowed netowork type and device access
family, so include 4G and 5G logic in PreferenceEntriesBuilder.

2. If user selected item not in preferred network option, settings will
auto selected on the first item. For example, if user selected on 5G and
device disallowed 5G(5G option will be hide), so settings will selected
on first item(4G).

Bug: 149721842
Test: EnabledNetworkModePreferenceControllerTest

Change-Id: Ic447a137f9db4cf1a0048a8e58487c29b402bb48
 2020-03-10 10:23:43 +00:00
Arc Wang
005fe6951c [Wi-Fi] Add STA+AP information in Hotspot & tethering footer 
Use WifiManager#isStaApConcurrencySupported() to check if a
device supports STA+AP and shows the footer information.

Bug: 121328949
Test: make RunSettingsRoboTests ROBOTEST_FILTER=TetherSettingsTest
      make RunSettingsRoboTests ROBOTEST_FILTER=WifiTetherFooterPreferenceControllerTest
Change-Id: I3446abb5cc9cdf76da8d17f5de31bd65715c165c
 2020-03-10 18:15:13 +08:00
Automerger Merge Worker
e7b21c94f1 Merge "Change sticky card UI back to homepage card style" into rvc-dev am: e5110e9388 am: f6a24c2596 am: 03e6686a61 
Change-Id: If8ad476347207f711b2e09b9ff50bee896a2b2ab
 2020-03-10 08:57:12 +00:00
Automerger Merge Worker
857f165afc Merge "Add entry point at output switcher to do group operation" into rvc-dev am: 378ca1dac4 am: f77dab373b am: 4a76ef4d6f 
Change-Id: I1dc3e269ffe76c98b595fa7cc906a2c9b516c90e
 2020-03-10 08:56:51 +00:00
Automerger Merge Worker
03e6686a61 Merge "Change sticky card UI back to homepage card style" into rvc-dev am: e5110e9388 am: f6a24c2596 
Change-Id: Iec81a0116b36372b0a99975e02a3f9a1133d4379
 2020-03-10 08:39:51 +00:00
Automerger Merge Worker
4a76ef4d6f Merge "Add entry point at output switcher to do group operation" into rvc-dev am: 378ca1dac4 am: f77dab373b 
Change-Id: If11cc848c81c5756e05f945a843cb7b1e29e62de
 2020-03-10 08:37:58 +00:00
Automerger Merge Worker
f6a24c2596 Merge "Change sticky card UI back to homepage card style" into rvc-dev am: e5110e9388 
Change-Id: I55dc5ee5c67bbb270278fb7f66a70121e46d21a0
 2020-03-10 08:30:41 +00:00
TreeHugger Robot
e5110e9388 Merge "Change sticky card UI back to homepage card style" into rvc-dev 2020-03-10 08:25:47 +00:00