Xin Li
ccbee6a795
DO NOT MERGE - Merge qt-qpr1-dev-plus-aosp-without-vendor (6129114) into stage-aosp-master
...
Bug: 146167222
Change-Id: I77344517b74a2192af49a3f8956d8756b81741d9
2020-01-15 15:57:20 -08:00
Bonian Chen
4a16d794e8
Merge "[Settings] Remove unused ImsStatusPreferenceController"
...
am: b36f57ae5a
2020-01-15 15:08:44 -08:00
Bonian Chen
b36f57ae5a
Merge "[Settings] Remove unused ImsStatusPreferenceController"
2020-01-15 22:46:00 +00:00
Bonian Chen
96e43012a1
Merge "[Settings] Replacing accessing of PhoneConstants$DataState"
...
am: e9324b48ab
2020-01-15 07:02:18 -08:00
Bonian Chen
e9324b48ab
Merge "[Settings] Replacing accessing of PhoneConstants$DataState"
2020-01-15 14:56:36 +00:00
Bonian Chen
368c885b98
[Settings] Remove unused ImsStatusPreferenceController
...
Legacy code clean up.
Bug: 147534443
Test: build pass
Change-Id: I4dd9c1c623296385eab6e14c10956cea27a04f75
2020-01-15 20:50:24 +08:00
Bonian Chen
8845af8a14
[Settings] Replacing accessing of PhoneConstants$DataState
...
1. Replaced by PhoneStateListner#onPreciseDataConnectionStateChanged().
2. Remove usage of hidden API SubscriptionManager#getPhoneId()
Bug: 147080692
Test: manual
Change-Id: I6e7c9910ed63e027fc02c1835853175745b31b66
2020-01-14 01:18:50 +08:00
Kevin Chang
658444b986
Merge "Modify the code logic of OnLayoutChangeListener in Caption preferences"
...
am: 9c79dfb493
2020-01-13 00:06:28 -08:00
Kevin Chang
9c79dfb493
Merge "Modify the code logic of OnLayoutChangeListener in Caption preferences"
2020-01-13 07:44:18 +00:00
Kevin Chang
01357b5b73
Modify the code logic of OnLayoutChangeListener in Caption preferences
...
Remove the listener and add statement to refresh the text when the caption turns on.
Bug: 142632389
Test: Manual
Change-Id: Ic5711309c5b8af9834e5439d825b4cb2ed55fe01
Merged-In: Ic5711309c5b8af9834e5439d825b4cb2ed55fe01
2020-01-13 10:10:36 +08:00
Automerger Merge Worker
0e5c9124f0
[automerger skipped] Import translations. DO NOT MERGE am: 5680c7b0e4 -s ours
...
am skip reason: subject contains skip directive
Change-Id: I0990e22af9fca905e34d8afa5dc978f3d5f11af1
2020-01-11 19:34:44 +00:00
Bill Yi
5680c7b0e4
Import translations. DO NOT MERGE
...
Change-Id: I2ef156b791ffe0cd24dcdb6501cf18dc07625d50
Auto-generated-cl: translation import
2020-01-11 06:40:09 -08:00
Automerger Merge Worker
875ac6925a
[automerger skipped] Merge "5G meteredness for telephony framework" am: 5ce99e22ff am: dd1c7d0a8a -s ours
...
am skip reason: Change-Id I0c8e84f74fd1f69ffc7e1046819966fcb04732a6 with SHA-1 9ea18281ee
2020-01-10 17:18:30 +00:00
Sarah Chin
dd1c7d0a8a
Merge "5G meteredness for telephony framework"
...
am: 5ce99e22ff
2020-01-10 09:03:56 -08:00
Sarah Chin
5ce99e22ff
Merge "5G meteredness for telephony framework"
2020-01-10 16:36:48 +00:00
Sarah Chin
c21d0ca119
Merge "5G meteredness for telephony framework" into qt-qpr1-dev-plus-aosp
2020-01-10 16:32:40 +00:00
Automerger Merge Worker
d41ee5451c
Merge "mainline:Replace serviceState.getDataRegState with getDataRegistrationState" am: c5e7864948 am: ed119d3b0e
...
Change-Id: I694cb96db9ebb8258bb2c423e6c04133b747f1c8
2020-01-10 07:40:16 +00:00
SongFerngWang
ed119d3b0e
Merge "mainline:Replace serviceState.getDataRegState with getDataRegistrationState"
...
am: c5e7864948
2020-01-09 23:26:03 -08:00
Treehugger Robot
c5e7864948
Merge "mainline:Replace serviceState.getDataRegState with getDataRegistrationState"
2020-01-10 07:24:57 +00:00
Sarah Chin
9ea18281ee
5G meteredness for telephony framework
...
Bug: 139070884
Test: atest FrameworksTelephonyTests
Change-Id: I0c8e84f74fd1f69ffc7e1046819966fcb04732a6
Merged-In: I0c8e84f74fd1f69ffc7e1046819966fcb04732a6
(cherry picked from commit 0c518d5aab
2020-01-10 05:53:22 +00:00
SongFerngWang
9cd3d0daeb
mainline:Replace serviceState.getDataRegState with getDataRegistrationState
...
Bug: 146637978
Test: - make RunSettingsRoboTests ROBOTEST_FILTER\
=PreferredNetworkModePreferenceControllerTest (PASS)
- make RunSettingsRoboTests ROBOTEST_FILTER\
=EnabledNetworkModePreferenceControllerTest (PASS)
Change-Id: I5a4a1a2b0dc5140257963651b69c0f427ef5ae93
Merged-In: I5a4a1a2b0dc5140257963651b69c0f427ef5ae93
2020-01-10 13:05:36 +08:00
Automerger Merge Worker
7e1e2b7d7d
Dark theme settings text am: 176d4ea28e
...
Change-Id: I57dc5d3dcb8cc96e4ad61259372360edebe14d9e
2020-01-09 23:21:23 +00:00
Jay Aliomer
176d4ea28e
Dark theme settings text
...
Dark theme text should be appropriate for all types of screens and
not only OLED types
Test: manual
Bug: 147432824
Change-Id: I1e59329064405c72c6f57c92a82b652cd71853a7
(cherry picked from commit d63839afda
2020-01-09 21:51:47 +00:00
Automerger Merge Worker
c0b3551310
Merge "[Settings] Avoid from accessing createManageSubscriptionIntent(int)" am: d792d20001 am: 77cc57d9c2
...
Change-Id: Id34a3b5da71400c651e3a05198210acae155067c
2020-01-09 06:15:54 +00:00
Bonian Chen
77cc57d9c2
Merge "[Settings] Avoid from accessing createManageSubscriptionIntent(int)"
...
am: d792d20001
2020-01-08 22:03:25 -08:00
Bonian Chen
d792d20001
Merge "[Settings] Avoid from accessing createManageSubscriptionIntent(int)"
2020-01-09 06:00:05 +00:00
Automerger Merge Worker
58e5e9966a
[automerger skipped] Merge "Handle 5G meteredness in telephony framework" am: f7d2691e1e am: 9e040a1198 -s ours
...
am skip reason: Change-Id Ided2e445d3758ebc6c4f4df63145f61f9a56f64e with SHA-1 f123f98510
2020-01-09 05:30:14 +00:00
Sarah Chin
9e040a1198
Merge "Handle 5G meteredness in telephony framework"
...
am: f7d2691e1e
2020-01-08 21:06:16 -08:00
Sarah Chin
f7d2691e1e
Merge "Handle 5G meteredness in telephony framework"
2020-01-09 05:03:24 +00:00
Automerger Merge Worker
d0401b1883
Merge "MAP: Add developer option to control map version" am: a24f03d58e am: d8e0b57e3a
...
Change-Id: I91537221abd287ca66fbc5b1d945b8a464b3e3de
2020-01-09 03:46:22 +00:00
Automerger Merge Worker
d3a80330ba
Merge "(Cherry-pick from internal) Adapt test to change internal API SubscriptionController#getActiveSubscriptionInfoList" am: 664ac2ebd7 am: f9dd9dfd52
...
Change-Id: Idd566f53353a083093ad4ebd15c8289244acce36
2020-01-09 03:45:18 +00:00
Chienyuan
d8e0b57e3a
Merge "MAP: Add developer option to control map version"
...
am: a24f03d58e
2020-01-08 19:11:04 -08:00
Philip P. Moltmann
f9dd9dfd52
Merge "(Cherry-pick from internal) Adapt test to change internal API SubscriptionController#getActiveSubscriptionInfoList"
...
am: 664ac2ebd7
2020-01-08 19:06:21 -08:00
Treehugger Robot
a24f03d58e
Merge "MAP: Add developer option to control map version"
2020-01-09 03:00:28 +00:00
Treehugger Robot
664ac2ebd7
Merge "(Cherry-pick from internal) Adapt test to change internal API SubscriptionController#getActiveSubscriptionInfoList"
2020-01-09 02:48:14 +00:00
Automerger Merge Worker
46f5e64f94
Merge "Removed reference to RadioAccessFamily" am: b13a4ef322 am: d934d5eda2
...
Change-Id: I1b13f79040ba776e8a0c763280d4fc3f89e3f373
2020-01-09 02:26:28 +00:00
Sarah Chin
0904e65eb8
Merge "Handle 5G meteredness in telephony framework" into qt-qpr1-dev-plus-aosp
2020-01-09 02:23:13 +00:00
Lee Chou
d934d5eda2
Merge "Removed reference to RadioAccessFamily"
...
am: b13a4ef322
2020-01-08 18:11:26 -08:00
Treehugger Robot
b13a4ef322
Merge "Removed reference to RadioAccessFamily"
2020-01-09 02:09:10 +00:00
Automerger Merge Worker
b85d1971bf
Merge "Fix policy for platform compat UI" am: 3208f994c1 am: e184ff6028
...
Change-Id: If560c3b115101910ab4e7e2976463ebd30d79d1b
2020-01-08 18:54:09 +00:00
Andrei-Valentin Onea
e184ff6028
Merge "Fix policy for platform compat UI"
...
am: 3208f994c1
2020-01-08 10:47:45 -08:00
Andrei-Valentin Onea
3208f994c1
Merge "Fix policy for platform compat UI"
2020-01-08 18:42:44 +00:00
Automerger Merge Worker
db65d2b0b2
Merge "[Settings] Remove IMS factoryReset()" am: bf3aaf0f37 am: dc4e189dbc
...
Change-Id: I019d3a5df41512a142a4745b4d56a53b73a05c60
2020-01-08 18:25:01 +00:00
Bonian Chen
dc4e189dbc
Merge "[Settings] Remove IMS factoryReset()"
...
am: bf3aaf0f37
2020-01-08 10:09:32 -08:00
Bonian Chen
bf3aaf0f37
Merge "[Settings] Remove IMS factoryReset()"
2020-01-08 17:29:10 +00:00
Andrei Onea
96de9d4cac
Fix policy for platform compat UI
...
Only show debuggable apps on user builds. Also, only enable changes that
are overrideable.
Bug: 138280620
Bug: 144552011
Test: Settings->Developer Options->App Compatibility Changes on user
build
Test: atest PlatformCompatDashboardTest
Exempt-From-Owner-Approval: Previously approved
Change-Id: Ibf9611d1809492ebe979fc55f9331daf78ca9b27
2020-01-08 16:44:36 +00:00
Bonian Chen
31e07211d9
[Settings] Avoid from accessing createManageSubscriptionIntent(int)
...
Avoid from accessing
SubscriptionManager#createManageSubscriptionIntent(int).
Create a copy of source code into Settings.
Bug: 147334060
Test: make RunSettingsRoboTests -j ROBOTEST_FILTER=DataUsageSummaryPreferenceControllerTest
Change-Id: Id44a6b214a8f5d378d7a536fbf984a0512e6a92d
2020-01-08 23:32:30 +08:00
Bonian Chen
4fa40aed87
[Settings] Remove IMS factoryReset()
...
IMS factoryReset() has been done within
TelephonyManager.resetSettings().
Bug: 147342492
Test: manual
Change-Id: Ic17b8235e76a4bcf3e6bf5329a88477697a33c51
Merged-In: Id5c868726189397fc2a85717326e56e055b640af
2020-01-08 14:15:37 +00:00
Lee Chou
373b43c16e
Removed reference to RadioAccessFamily
...
1. Removed reference to RadioAccessFamily#getNetworkTypeFromRaf,
RadioAccessFamily#getRafFromNetworkType
2. Migrated hidden NETWORK_MODE_* constants in TelephonyManager
Bug: 147079703
Test: build and test manually
Change-Id: I94745edc37d80336197f874cb7b4afd42dfc97a8
2020-01-08 19:13:47 +08:00
Chienyuan
01f4f8432e
MAP: Add developer option to control map version
...
Bug: 146916756
Test: manual
Change-Id: I6015e5dae8e2c19549babe556b84a2c5b24dd669
Merged-In: If32db03072e02b7b2477c7da943b6b0e6a9be260
2020-01-08 17:04:25 +08:00
