ADFA-4553 (slice 2b): remove the tunnel/SOCKS layout, strings and colors#138
Merged
Merged
Conversation
Final slice. The Java that referenced these was removed in slice 2, so this is an atomic resource-only removal (layout + its string/color references together). - fragment_usage.xml: removed the Control button, control_description, the dash_tunnel dashboard tile (+ led_tunnel + tunnel label), and the SOCKS fields (addr/port in config, udp_addr/user/pass in advanced). All were visibility=gone. - values*/strings.xml (6 locales): removed control_enable, control_disable, vpn_description, vpn_starting, vpn_stopping, tunnel, socks_addr, socks_port, socks_udp_addr, socks_user, socks_pass. - values/colors.xml: removed btn_vpn_on/off/on_dim/off_dim. No visible/behaviour change (all removed views were already hidden). XML verified well-formed; no remaining reference to any removed id/string/color across res + java. lint-baseline.xml still has stale 'vpn/socks' entries (a filter, not a gate) — can be regenerated separately.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
What
Final slice. The Java that referenced these resources was removed in slice 2 (#137), so this is an atomic resource-only removal — the layout views and the strings/colors they referenced go together, keeping the build consistent.
fragment_usage.xml: removed the Control button,control_description, thedash_tunneldashboard tile (withled_tunnel+ the "tunnel" label), and the SOCKS fields (socks_addr/socks_portin config,socks_udp_addr/socks_user/socks_passin advanced). All werevisibility="gone".values*/strings.xml(6 locales): removedcontrol_enable,control_disable,vpn_description,vpn_starting,vpn_stopping,tunnel,socks_addr,socks_port,socks_udp_addr,socks_user,socks_pass.values/colors.xml: removedbtn_vpn_on/btn_vpn_off/btn_vpn_on_dim/btn_vpn_off_dim.Behaviour
No visible/behaviour change — every removed view was already hidden.
Verification (sandbox)
btn_vpn*,@string/tunnel,control_enable/disable,vpn_*,socks_*,dash_tunnel,led_tunnel,R.id.control).lint-baseline.xmlstill has ~18 stalevpn/socksentries — a filter, not a gate (unmatched baseline entries are ignored), so they don't fail the build. Can be regenerated in a routine baseline refresh.:app:lintDebug+assembleDebug.Test (device)
Closes ADFA-4553
With slices 1 + 2 + 2b, the legacy SOCKS-proxy / "tunnel" / VPN mechanism is fully gone; the app serves content exclusively from the native local server.