TreeHugger Robot
02a90deb8f
Merge "Add a RTT setting in A11y screen"
2020-01-10 07:13:14 +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
Arc Wang
a6ec144392
[Wi-Fi] Revert "support SAE password identifier in wifi dialog"
...
Revert it because SPEC is not clear now.
Bug: 143379656
Test: manual
Click "Add network" in wi-Fi picker and edit a WAP3-personal Wi-Fi network
Change-Id: Ifa859d53c29d0fa83f22cc2d0e50294d0a5c7fc9
2020-01-10 11:53:12 +08:00
Automerger Merge Worker
87e70a6a5f
Dark theme settings text am: 176d4ea28e
am: 7e1e2b7d7d
...
Change-Id: Iace5c492dca128c9d3677b659786af6c55088948
2020-01-09 23:37:38 +00:00
Automerger Merge Worker
7e1e2b7d7d
Dark theme settings text am: 176d4ea28e
...
Change-Id: I57dc5d3dcb8cc96e4ad61259372360edebe14d9e
2020-01-09 23:21:23 +00:00
Curtis Belmonte
5e25500beb
Merge "Fix issues with SUW on fingerprint devices"
2020-01-09 22:45:12 +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
Curtis Belmonte
150e2921d9
Update L2U string for face unlock in settings
...
Test: Checked in Settings for flame-userdebug build
Bug: 143905457
Change-Id: I1e98b95e81dea355c66e8c0f30664db21632d05c
2020-01-09 13:23:17 -08:00
Jay Aliomer
d63839afda
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
2020-01-09 20:22:36 +00:00
Raff Tsai
44a39995f2
Merge work profile storage data together
...
- Storage UI used to have a work profile item. Now the item is
removed, all its size should merge to other item.
Fixes: 147127503
Test: Add work profile user, in Settings -> Storage page. Sum of
each item size should be similar to used size in the top of the page.
Change-Id: I9d4e2c8c53839da22fd0cdd5d2591a3245514191
2020-01-09 19:55:43 +08:00
TreeHugger Robot
4d0fa39b2d
Merge "[Wi-Fi] Edit a never connected WifiEntryPreference in WifiSettings2"
2020-01-09 11:42:53 +00:00
lesl
24a505c4eb
softap: Use set/getPassphrase to replace set/getWpa2Passphrase
...
Bug: 142752869
Test: Manual, on/off/setting change for hotspot function
Test: make RunSettingsRoboTests ROBOTEST_FILTER=CodeInspectionTest
Change-Id: I22c89f15a6ef1c5366394431cc5aa7031a573d45
2020-01-09 19:23:41 +08:00
Arc Wang
5efa92f95f
[Wi-Fi] Remove redundant code in WifiSettings2
...
WifiPickerTracker get WifiEntries at onStart, it's no meaning
to getWifiEntry at WifiSettings2#onActivityCreated.
Bug: 143328194
Test: manual
Edit a Wi-Fi network by clicking context menu 'Modify',
rotate the WiFiDialog and see if any thing wrong
Change-Id: I9746879720b72723259e1b59e8b5e8bae183b8cc
2020-01-09 18:51:58 +08:00
Bonian Chen
9ce7bad930
Merge "[Settings] Code refactor"
2020-01-09 10:37:12 +00:00
Arc Wang
50afc70f8f
[Wi-Fi] Edit a never connected WifiEntryPreference in WifiSettings2
...
If the Wi-Fi network is never connected after it's saved,
edit it instead of connecting when users click the WifiEntryPreference.
Bug: 143328194
Test: manual
Click a saved wrong password Wi-Fi network
Change-Id: If974ce9225fe6b6ed5f8a3c6c0ff619532acc1c2
2020-01-09 18:36:33 +08:00
Bonian Chen
f399bd1a8c
[Settings] Code refactor
...
Bug: 147338143
Test: build pass
Change-Id: Ib4a92f659ceda3584310591f706958a06ba5ab21
2020-01-09 17:07:25 +08:00
Betty Chang
976dca2149
Merge "[Mainline] To use getActiveSubscriptionInfo() instead of get default subscription Info with data/sms/voice"
2020-01-09 08:49:48 +00:00
Betty Chang
595b8f3bc7
Merge "[Mainline] Use public method in SubscriptionManager for mainline"
2020-01-09 08:49:23 +00:00
Tsung-Mao Fang
7f5986b78a
Add a RTT setting in A11y screen
...
- Add RTT setting in Accessibility screen.
- Create a controller for RTT setting preference.
- Create an array strings.
Test: Rebuild, and visual
Change-Id: I248654c822284473b8a8265de4a3938af89cdf7a
Fix: 146540478
2020-01-09 16:43:34 +08:00
Raff Tsai
5d1bcb0408
Merge "Fix search auto-sync work data doesn't focus on work tab"
2020-01-09 07:06:13 +00:00
Betty Chang
b8104d5e70
Merge "[Mainline] To use @SystemApi to replace non-formal APIs for mainline"
2020-01-09 06:50:13 +00:00
ChenJean
2c37f45a35
Support caption second UI structure (3/n)
...
Removed unenable behovior when turn off Show captions.
Bug: 143502915
Test: Manual
Change-Id: Idb59172967872f4c8ba76e6cdcb83ba0a7faeadd
2020-01-09 14:45:54 +08:00
Automerger Merge Worker
dc047e5746
Merge "[Settings] Avoid from accessing createManageSubscriptionIntent(int)" am: d792d20001
am: 77cc57d9c2
am: c0b3551310
...
Change-Id: I340af8aee92498660f7bc65cdf5540d37a2fa148
2020-01-09 06:35:41 +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
Change-Id: I40195cc5643262d310a45c89d1751aa8f6c89f1e
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
824095f728
[automerger skipped] Merge "Handle 5G meteredness in telephony framework" am: f7d2691e1e
am: 9e040a1198
-s ours am: 58e5e9966a
-s ours
...
am skip reason: Change-Id Ided2e445d3758ebc6c4f4df63145f61f9a56f64e with SHA-1 f123f98510
is in history
Change-Id: Ib8511b2056c8f00ff98a5b8b1336d6cc50e0a955
2020-01-09 05:52:42 +00:00
Paul Chang
5d8b2cf314
Merge "Show Settings bugreport handler only when developer option is enabled"
2020-01-09 05:35:51 +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
is in history
Change-Id: I2033fbcb16219688c47bd4ff0838953c1f4b1b7a
2020-01-09 05:30:14 +00:00
Sarah Chin
9e040a1198
Merge "Handle 5G meteredness in telephony framework"
...
am: f7d2691e1e
Change-Id: I605c523ba16df57df339f2c68c330299caa4b3b5
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
0bb6ffd417
[automerger skipped] Merge "MAP: Add developer option to control map version" am: a24f03d58e
am: d8e0b57e3a
am: d0401b1883
-s ours
...
am skip reason: Change-Id If32db03072e02b7b2477c7da943b6b0e6a9be260 with SHA-1 da1ca35dc4
is in history
Change-Id: Ia648ae1e6bfd2c78504d0a0934e975037cf49c3d
2020-01-09 04:00:31 +00:00
Automerger Merge Worker
3a07b8007b
Merge "(Cherry-pick from internal) Adapt test to change internal API SubscriptionController#getActiveSubscriptionInfoList" am: 664ac2ebd7
am: f9dd9dfd52
am: d3a80330ba
...
Change-Id: Iece4ab122985a837795635c20a93de06b2b8adfe
2020-01-09 03:59:44 +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
Bonian Chen
4873d0e894
Merge "[Settings] Code refactor"
2020-01-09 03:34:04 +00:00
Daniel Huang
1f0d504064
Merge "Modify the year of software Lic."
2020-01-09 03:25:53 +00:00
danielwbhuang
e8edc9a616
Modify the year of software Lic.
...
It should be 2020 not 2018.
Original code is merged in ag/10000397.
Bug: 143995814
Test: Build pass.
Change-Id: I9a1a3872825f325b785ed55653e64f388ea6bcee
2020-01-09 03:24:27 +00:00
Chienyuan
d8e0b57e3a
Merge "MAP: Add developer option to control map version"
...
am: a24f03d58e
Change-Id: Idc6aeabc4d88adee6dc1c64eeb3648bb42e5f2fc
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
Change-Id: I646975373dc24244074f761638919239276dbe61
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
a74cbac7af
Merge "Removed reference to RadioAccessFamily" am: b13a4ef322
am: d934d5eda2
am: 46f5e64f94
...
Change-Id: Id01aa204e70d2eb7f9151eccfd2184d06a7aa61b
2020-01-09 02:44:05 +00:00
Automerger Merge Worker
12afd1b101
[automerger skipped] Merge "Handle 5G meteredness in telephony framework" into qt-qpr1-dev-plus-aosp am: 0904e65eb8
-s ours
...
am skip reason: Change-Id Ided2e445d3758ebc6c4f4df63145f61f9a56f64e with SHA-1 f123f98510
is in history
Change-Id: Ibc41af0d95bd15a2b1a7130374920197898941a6
2020-01-09 02:43:36 +00:00
Automerger Merge Worker
e0620e14b5
[automerger skipped] Handle 5G meteredness in telephony framework am: f123f98510
-s ours
...
am skip reason: Change-Id Ided2e445d3758ebc6c4f4df63145f61f9a56f64e with SHA-1 2136bc92fe
is in history
Change-Id: I216eb67b026024b0131c9d2c4ee87f02fe549984
2020-01-09 02:42:15 +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
Change-Id: I982ca4865d7aed198a1e1f78c80f0340218d27a2
2020-01-08 18:11:26 -08:00
Treehugger Robot
b13a4ef322
Merge "Removed reference to RadioAccessFamily"
2020-01-09 02:09:10 +00:00