mSubId is a protected member provided by parent class.
Overriding mSubId should be avoided.
Bug: 150535296
Test: manual
Merged-In: I391b034c9badd43094ab52b8b6488bca07ef3c86
Change-Id: I65fda30d1e699695315eb57d8930a27fdebb5a46
Wrap IMS related APIs in order to support replacing ImsManager.
Bug: 140542283
Test: build pass
Merged-In: I10aff50b6f3fc50b2f336ee320740f9f4a81e256
Change-Id: Ibc8c1c36fe031a3d845b99f878ef45ce5db7de28
Rotate usb preference screen from horizontal to landscape
or vice versa. USB preference screen title changes.
Bug: 152895735
Test: manual
Change-Id: Ib8493662ab68146f0b5470936a8ba97a058c2a6d
Revert "access system resources with android.R package"
Revert submission 10146616-sim_colors
Reason for revert: b/151455581
Bug:151455581
Test: make
Reverted Changes:
I1e698d404:access system resources with android.R package
Id1eab78a8:access system resources with android.R package
I38b2e096e:access system resources with android.R package
I82bff7bd4:access system resources with android.R package
I554812a9d:access system resources with android.R package
I17831cd35:access system resources with android.R package
I2ccb04c0e:access system resources with android.R package
If25b159e1:access system resources with android.R package
Idc1095563:access system resources with android.R package
Ie0189ef3b:make sim_colors a system config
Merged-In: Ia2b1fd28dee08da03b6f1e7892ac3562edad00e4
Change-Id: Ia2b1fd28dee08da03b6f1e7892ac3562edad00e4
Add Ethernet Tethering settings
- Show prefernce if config_ethernet_iface_regex is set
- Activate if tethered ethernet interface is exist
Bug: 148824036
Test: manual test
- update prefernce plug-in, plug-out
Change-Id: Ia4f365ddc1a53a926d716046db3e6ac463c978b9
Merged-In: Ia4f365ddc1a53a926d716046db3e6ac463c978b9
Adds a new controller to monitor the capability discovery opt-in
setting as well as a new DialogFragment, which displays a dialog
providing the user with more information before they enable the
setting.
Bug: 111305845
Test: manual
Merged-In: I70821964bc618c3c389c9039cd7f5028e34c7ebb
Change-Id: I70821964bc618c3c389c9039cd7f5028e34c7ebb
Added slot index information in the broadcast
so the receiver knows which slot to get information.
Test: Manual
Merged-In: Icd1bcc2fa905bae6b0f2220e9a27178711bac0c7
Change-Id: Icd1bcc2fa905bae6b0f2220e9a27178711bac0c7
Fix: 150126754
(cherry picked from commit 5a4dabcba2)
Use the new method that filters out changes that shouldn't be in the
developer UI.
Exempt-From-Owner-Approval: Roll forward of unchanged reverted change previously approved.
Test: make RunSettingsRoboTests ROBOTEST_FILTER=PlatformCompatDashboardTest
Bug: 151299145
Change-Id: I5b461b33484a38d0c6a5b7bf7e928231dd662668
Merged-In: I5b461b33484a38d0c6a5b7bf7e928231dd662668
Allow LockScreenPattern to be launched in the pinning screen
If work profile lock is enabled and work app is pinned, users will get a
black/white screen on the phone. That's because Settings is prevented
from other apps launch any pages of Settings in the pinning mode.
In order to launch some pages of Settings from other apps, we add a
condition to the preventive mechanism and allow the activity inherited
from SettingsBaseActivity to override the condition to have the activity
to be launched from other apps in the pinning mode.
Bug: 137015265
Bug: 135604684
Test: manual test
Change-Id: I8070de79a83350d1658efcb19e983669dad0e673
(cherry picked from commit 077dd9b07f)
