OSDN Git Service

Remove duplicate layout mobile_network_settings_container_v2
authorRaff Tsai <rafftsai@google.com>
Fri, 8 Nov 2019 04:04:16 +0000 (12:04 +0800)
committerRaff Tsai <rafftsai@google.com>
Fri, 8 Nov 2019 04:04:16 +0000 (12:04 +0800)
commit8fe35bff52e4f059e50db4254bb5b9519e33f78a
treeab5ec415de45c66f7a82b995f28047b78a3e2737
parentadfdb0ddf18700a803f54b8ba990cfb93fb2878e
Remove duplicate layout mobile_network_settings_container_v2

- MobileNetworkActivity can use settings_base_layout.xml as layout.
- MobileNetworkActivity need to use Theme.Settings.Home because
it requests Window.FEATURE_NO_TITLE. Otherwise MobileNetworkActivity
will show title defined in xml first then change to new title.

Fixes: 123794771
Test: rebuild, manual
Change-Id: I39ae25b6d335437ffddb2f1562e7a0347db97108
res/layout/mobile_network_settings_container_v2.xml [deleted file]
res/xml/mobile_network_settings.xml [moved from res/xml/mobile_network_settings_v2.xml with 100% similarity]
res/xml/network_and_internet.xml [moved from res/xml/network_and_internet_v2.xml with 100% similarity]
src/com/android/settings/network/NetworkDashboardFragment.java
src/com/android/settings/network/telephony/MobileNetworkActivity.java
src/com/android/settings/network/telephony/MobileNetworkSettings.java