PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
62,204 Commits 1 Branch 0 Tags
339e5b0eee157de7bfc7da83e7873af933c78d18
Commit Graph

30801 Commits

Author SHA1 Message Date
Automerger Merge Worker
818e26464d Merge "Update the OWNER files" into rvc-dev am: a38859b2b7 
Change-Id: Ia773a05c5375a17f8745dd2edf41f7ecf6f20151
 2020-03-11 11:29:17 +00:00
zoey chen
3bfbb818c7 Fix Card 2's pin shows ON when only turn on card 1's pin 
Bug: 150258187
Test: manual
Change-Id: Ifc54090da6737d31a2eb71eeabe6846592ff32fc
 2020-03-11 11:10:39 +00:00
TreeHugger Robot
a38859b2b7 Merge "Update the OWNER files" into rvc-dev 2020-03-11 11:08:21 +00: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
Benedict Wong
1e2a91ba1a Address cleanup comments from aosp/1234607 
This change addresses minor cleanup comments from aosp/1234607, renaming
a method.

Bug: 148991741
Test: Compiles
Change-Id: I2f31f8045040e6065a89e842b034aea605a99bd4
 2020-03-11 05:46:27 +00:00
Treehugger Robot
7ef5614ee2 Merge "Repoint ACTION_SECRET_CODE + ACTION_SIM_STATE_CHANGED" 2020-03-11 05:40:34 +00:00
Automerger Merge Worker
bb1deeca73 Merge "[Wi-Fi] Add STA+AP information in Hotspot & tethering footer" into rvc-dev am: b8fb854e98 am: cb9cfc19c3 am: 570ec6a4a1 am: 99974b69db 
Change-Id: I4a70e6fb297ea12873dc7b71f4bb1de3bafb703d
 2020-03-11 05:08:29 +00:00
Automerger Merge Worker
570ec6a4a1 Merge "[Wi-Fi] Add STA+AP information in Hotspot & tethering footer" into rvc-dev am: b8fb854e98 am: cb9cfc19c3 
Change-Id: Ic62a6994e362f797100bedb425bbc024fc518a34
 2020-03-11 04:34:02 +00:00
Automerger Merge Worker
489d671497 Merge "[Wi-Fi] Add STA+AP information in Hotspot & tethering footer" into rvc-dev am: b8fb854e98 
Change-Id: I26425ff7fa3413bc5cb3458843f643bb346696e5
 2020-03-11 04:20:28 +00:00
Daniel Bright
fa5ffc97e6 Repoint ACTION_SECRET_CODE + ACTION_SIM_STATE_CHANGED 
Bug: 148160428
Test: make, flash
Merged-In: I9404e2c3c816311c7ef3875622fe5cd5a315ec58
Change-Id: I9404e2c3c816311c7ef3875622fe5cd5a315ec58
 2020-03-10 21:12:25 -07: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
Bonian Chen
bb8841c22e Merge "Remove reference of Phoneconstants for SUBSCRIPTION_KEY" 2020-03-11 01:45:14 +00:00
Automerger Merge Worker
c5b9a68b08 Merge "Fix Tx link speed still showing after disconnecting from wifi network" into rvc-dev am: bff2347964 am: b56ca208d9 am: 855712ea9c am: 6dad4a0da6 
Change-Id: I97d35aaa014bdf02a986bd8405e88083ae154fc8
 2020-03-11 01:21:11 +00:00
Automerger Merge Worker
855712ea9c Merge "Fix Tx link speed still showing after disconnecting from wifi network" into rvc-dev am: bff2347964 am: b56ca208d9 
Change-Id: Ie893d697eeb6cce7d490bd061ff755730e6e4a38
 2020-03-11 00:54:23 +00:00
Automerger Merge Worker
6e0521fefd Merge "Fix Tx link speed still showing after disconnecting from wifi network" into rvc-dev am: bff2347964 
Change-Id: I69e1948eef5f572f6de11f2a6ef8021970d85924
 2020-03-11 00:43:56 +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
Chen Chen
847b534fdf MetricId: Avoid byte[] and string ambiguity 
Passing null to the function will result in conflict with Bluetooth proto
(int int int byte[] int)
Bug: 122571213
Test: Build

Change-Id: Iad90e67a2cdde86aabb95585975be56fc33361fe
 2020-03-10 12:49:56 -07:00
Automerger Merge Worker
b4da4c8c9b Merge "Disable 5G Scanning in NetworkScanHelper" into rvc-dev am: a8bee76d11 am: 17718f979a am: b61ad6c1b4 am: 81d81e0bb4 
Change-Id: Ia1e0a825849993c17818e0cc21fc9ef8ad80c93b
 2020-03-10 17:55:14 +00:00
Treehugger Robot
f4e97c4e28 Merge "[Mainline] Remove NETWORK_TYPE_LTE_CA" 2020-03-10 17:26:27 +00:00
Automerger Merge Worker
b61ad6c1b4 Merge "Disable 5G Scanning in NetworkScanHelper" into rvc-dev am: a8bee76d11 am: 17718f979a 
Change-Id: Ifae11bdeae6f9be5cbbfc7caa64c8aab66b1e7ac
 2020-03-10 17:19:14 +00:00
Automerger Merge Worker
43c4fa35da Merge "Disable 5G Scanning in NetworkScanHelper" into rvc-dev am: a8bee76d11 
Change-Id: I8727fec517436adf608b26fc1372c7c43cfa504a
 2020-03-10 16:58:34 +00:00
Nathan Harold
a8bee76d11 Merge "Disable 5G Scanning in NetworkScanHelper" into rvc-dev 2020-03-10 16:35:02 +00:00
Automerger Merge Worker
97e9b51191 Merge "The text contrast of "disconnected" in Switch media output panel is insufficient." into rvc-dev am: 1334a7e986 am: 2f2d8d5949 am: ce61a52720 am: 3dfbb8fe24 
Change-Id: Ia4d59bb39e8c06cf3039363a455fe7bcc8383fa6
 2020-03-10 15:57:46 +00:00
Automerger Merge Worker
ce61a52720 Merge "The text contrast of "disconnected" in Switch media output panel is insufficient." into rvc-dev am: 1334a7e986 am: 2f2d8d5949 
Change-Id: I0ad2bf3fc2c50cd29776a939ea4d907dd4db9c9a
 2020-03-10 15:16:03 +00:00
Automerger Merge Worker
379902636b Merge "The text contrast of "disconnected" in Switch media output panel is insufficient." into rvc-dev am: 1334a7e986 
Change-Id: If8964911c25b2d5cc8a38e4dd319ceb91ce95fe2
 2020-03-10 15:02:13 +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
e5a9590eb5 Merge "[Wi-Fi] Use startActivityForResult instead of startActivity to launch google help page" into rvc-dev am: 7c2979c340 am: 9bc76d1b50 am: 8cab6d80f9 am: 5c9b3e86ff 
Change-Id: Idfcc1a72b9c9ddd3216694209226c4104238c26d
 2020-03-10 13:26:54 +00:00
Automerger Merge Worker
8cab6d80f9 Merge "[Wi-Fi] Use startActivityForResult instead of startActivity to launch google help page" into rvc-dev am: 7c2979c340 am: 9bc76d1b50 
Change-Id: I7c442aa3e7976fa0c8647108e14e02006286f0b8
 2020-03-10 12:43:31 +00:00
Automerger Merge Worker
0a6442df22 Merge "[Wi-Fi] Use startActivityForResult instead of startActivity to launch google help page" into rvc-dev am: 7c2979c340 
Change-Id: I5620a3a5c637aa142b3aa04f7b2a881f3e21ca76
 2020-03-10 12:29:00 +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
Edgar Wang
71099e7a54 Remove duplicated index search data 
Bug: 143055215
Test: manual & robotest
Change-Id: I82583efe37c44014b8949a40d7a695461a7382a9
 2020-03-10 19:47:40 +08: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
70ce4b94b8 Merge "Change sticky card UI back to homepage card style" into rvc-dev am: e5110e9388 am: f6a24c2596 am: fa923a5e37 am: 0f2e2a664c 
Change-Id: Ia1f4e16be17426e968503011d0a52ad8ff5aeab6
 2020-03-10 09:14:34 +00:00
Automerger Merge Worker
07294f8c42 Merge "Add entry point at output switcher to do group operation" into rvc-dev am: 378ca1dac4 am: 48d161b7b0 am: 0ed90e5f4c am: b9289da489 
Change-Id: I6f170f8240293e906ea3ed44c8f318fd87541f92
 2020-03-10 09:12:52 +00:00
Automerger Merge Worker
fa923a5e37 Merge "Change sticky card UI back to homepage card style" into rvc-dev am: e5110e9388 am: f6a24c2596 
Change-Id: I7b3e83bd105dcede447fde3037f4b4737a5cbde1
 2020-03-10 08:39:49 +00:00
Automerger Merge Worker
00e3d66465 Merge "MetricId: Avoid byte[] and string ambiguity" into rvc-dev am: b65866968e am: 84098ef1fc am: e1d122c3a0 am: 8c1731910a 
Change-Id: Idbbff6f0a6ca03c43bca3e2f9864ccd1029d606e
 2020-03-10 08:30:53 +00:00
Automerger Merge Worker
cbc146d3f4 Merge "Change sticky card UI back to homepage card style" into rvc-dev am: e5110e9388 
Change-Id: I8c47d8c3dea5b3f816facdc4775d8653fc0c01d6
 2020-03-10 08:26:07 +00:00
Automerger Merge Worker
48d161b7b0 Merge "Add entry point at output switcher to do group operation" into rvc-dev am: 378ca1dac4 
Change-Id: Ic0758e620662f68ee614e4478e26bad1468b0c70
 2020-03-10 08:25:59 +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
tim peng
378ca1dac4 Merge "Add entry point at output switcher to do group operation" into rvc-dev 2020-03-10 08:07:43 +00:00
Automerger Merge Worker
e1d122c3a0 Merge "MetricId: Avoid byte[] and string ambiguity" into rvc-dev am: b65866968e am: 84098ef1fc 
Change-Id: I64748c07ef3dbd2cdaa81169e781fca20ee08112
 2020-03-10 08:04:12 +00:00
Automerger Merge Worker
fd12e2e677 Merge "MetricId: Avoid byte[] and string ambiguity" into rvc-dev am: b65866968e 
Change-Id: I21d36da4f3826bc1168d607945d9e45dbba8d0a2
 2020-03-10 07:44:09 +00:00
TreeHugger Robot
b65866968e Merge "MetricId: Avoid byte[] and string ambiguity" into rvc-dev 2020-03-10 07:24:52 +00:00
Quang Luong
d0a22bd699 Fix Tx link speed still showing after disconnecting from wifi network 
Make sure the tx link speed preference in the Network Details page
disappears when the network is disconnected.

Bug: 151126855
Test: manually going to network details page and disconnecting and
verifying that the link speed disappears.

Change-Id: I3dfd66085db987535c201d38961e4bca709752c9
 2020-03-10 00:09:52 -07:00
Tim Peng
1a5b896dc2 The text contrast of "disconnected" in Switch media output panel is insufficient. 
-Apply generic color "textColorSecondary"

Bug: 151050490
Test: manual
Change-Id: Id5e967faab6dedb25607f8afb12acbf338211144
 2020-03-10 07:08:24 +00:00