OSDN Git Service
Jason Chiu [Fri, 5 Apr 2019 03:27:39 +0000 (20:27 -0700)]
Merge "Add prompt to sign in at captive portal to Wi-Fi Slice" into qt-dev
am:
973eff2eb2
Change-Id: I1096c318ceecccadb63cecfb50008697987cd44a
jackqdyulei [Fri, 5 Apr 2019 03:24:58 +0000 (20:24 -0700)]
Merge "Customized Wifi calling text" into qt-dev
am:
83f60c81f5
Change-Id: I9b052ee41bbcdbc3289a28a06567518e56ec05ea
Andrew Sapperstein [Fri, 5 Apr 2019 03:20:57 +0000 (20:20 -0700)]
Merge "Update char limit for reset_esim_title." into qt-dev
am:
576d601032
Change-Id: Ia284c8ddc50f663b830fc58c0e319f055998eeba
TreeHugger Robot [Fri, 5 Apr 2019 03:19:22 +0000 (03:19 +0000)]
Merge "Add prompt to sign in at captive portal to Wi-Fi Slice" into qt-dev
Fan Zhang [Fri, 5 Apr 2019 03:18:58 +0000 (20:18 -0700)]
Merge "DND should be displayed on search as slice." into qt-dev
am:
b05af56a64
Change-Id: Idf7e940b22cd2cae697afbcb0979cc804fe7cdc1
TreeHugger Robot [Fri, 5 Apr 2019 03:17:18 +0000 (03:17 +0000)]
Merge "Customized Wifi calling text" into qt-dev
TreeHugger Robot [Fri, 5 Apr 2019 03:07:09 +0000 (03:07 +0000)]
Merge "Update char limit for reset_esim_title." into qt-dev
Fan Zhang [Fri, 5 Apr 2019 02:53:12 +0000 (02:53 +0000)]
Merge "DND should be displayed on search as slice." into qt-dev
Stanley Wang [Mon, 1 Apr 2019 11:20:54 +0000 (19:20 +0800)]
DND should be displayed on search as slice.
Add ZenModeSoundSettingsPreferenceController extends ZenModePreferenceController,
and update availability status to AVAILABLE.
This is cherry-picked from ag/
6897872
Change-Id: I8dcb6808cc21c4f5c06548a363c998e369646487
Bug:
129320642
Test: manual & robotests
Alex Salo [Fri, 5 Apr 2019 02:23:08 +0000 (19:23 -0700)]
Merge "Update adaptive sleep setting with the latest copy" into qt-dev
am:
02576b6e2e
Change-Id: I04efc7f8d3c052d7ce2627188190f2dd9e76b0b1
Kevin Chyn [Fri, 5 Apr 2019 01:53:50 +0000 (18:53 -0700)]
Merge changes from topic "face-profile-qt-dev" into qt-dev
am:
388295a80c
Change-Id: I1ce1eb796113c4f106d63a5a55f32dfb56c761aa
Kevin Chyn [Fri, 5 Apr 2019 01:52:11 +0000 (18:52 -0700)]
Add face profile settings
am:
39ca021586
Change-Id: I218b2cfbfc123a591774bdeb77faa46fd5d36e20
Fan Zhang [Fri, 5 Apr 2019 01:50:10 +0000 (18:50 -0700)]
Merge "Add uri to custom slice PendingIntent." into qt-dev
am:
f768b451c3
Change-Id: Id8ed81d56b4e131995583846677adb4f99159f49
Fan Zhang [Fri, 5 Apr 2019 01:30:52 +0000 (18:30 -0700)]
Merge "Update strings" into qt-dev
am:
a4ea8e94a0
Change-Id: I98adc0b17087954fa8bb913ce4a99a3e9743c01e
TreeHugger Robot [Fri, 5 Apr 2019 01:16:23 +0000 (01:16 +0000)]
Merge "Update adaptive sleep setting with the latest copy" into qt-dev
Michael Groover [Fri, 5 Apr 2019 01:13:02 +0000 (18:13 -0700)]
Use Settings instead of DeviceConfig to relax device ID dev option
am:
9e3b3d77a2
Change-Id: Ib2338724fcbf2cba26f8305499c547a84f445fdf
Kevin Chyn [Fri, 5 Apr 2019 00:41:17 +0000 (00:41 +0000)]
Merge changes from topic "face-profile-qt-dev" into qt-dev
* changes:
Settings should be per-profile
Add face profile settings
TreeHugger Robot [Fri, 5 Apr 2019 00:35:24 +0000 (00:35 +0000)]
Merge "Add uri to custom slice PendingIntent." into qt-dev
TreeHugger Robot [Fri, 5 Apr 2019 00:28:29 +0000 (00:28 +0000)]
Merge "Update strings" into qt-dev
Fan Zhang [Thu, 4 Apr 2019 23:12:38 +0000 (16:12 -0700)]
Add uri to custom slice PendingIntent.
Discovered flashlight slice sometimes does not work, throwing exception
similar as it b/
117445451. Adding a data uri fixes it.
Bug:
129981692
Test: manual
Change-Id: I16bc19027dd342f85aaabbf1a2853bb55564f64f
Kevin Chyn [Thu, 4 Apr 2019 02:47:31 +0000 (19:47 -0700)]
Settings should be per-profile
Also, don't show keyguard option for work profile
Fixes:
129905061
Test: Builds
Change-Id: I18f573f39ee4e54a3385cc65079bb794633cc560
Michael Groover [Wed, 3 Apr 2019 22:03:42 +0000 (15:03 -0700)]
Use Settings instead of DeviceConfig to relax device ID dev option
The 'Disable device identifier restrictions' developer option
currently uses DeviceConfig to set whether the new access
restrictions should be disabled. However this API now requires
the WRITE_DEVICE_CONFIG permission and should only be used from
the server side. This change modifies the developer option to use the
Settings to relax the device identifier check, and the option will
be hidden if the new restrictions have been disabled from the server.
Bug:
129888611
Test: Manually verified device ID check was relaxed with option
enabled. Also verified option is not displayed if DeiviceConfig
option is set.
Change-Id: Id8759f2219e702c1f93a638d45ac99bce685383b
(cherry picked from commit
60c80bb2953892f8bd423a0b2b1d83ca4741c222)
Kevin Chyn [Wed, 3 Apr 2019 21:51:17 +0000 (14:51 -0700)]
Add face profile settings
Fixes:
110907543
Test: Builds
Change-Id: I9761f289bb250c5d9f5b5e75cf682d164c591050
Fan Zhang [Wed, 3 Apr 2019 22:46:59 +0000 (15:46 -0700)]
Update strings
Fixes:
129885706
Fixes:
129855545
Test: visual
Change-Id: I655655033c019de4365de9fe208c8c362134dfe3
Alex Salo [Tue, 2 Apr 2019 21:24:07 +0000 (14:24 -0700)]
Update adaptive sleep setting with the latest copy
Bug:
129352433
Change-Id: I3c9594f9ed49208ef1d7bbc33e8083a0c733b1f8
Test: manually confirmed it works and looks correct
(cherry picked from commit
fdeb07c05bf44e428ecbd5c315627735cb7afc05)
jackqdyulei [Wed, 3 Apr 2019 22:43:28 +0000 (15:43 -0700)]
Customized Wifi calling text
This only fixed in old page from aosp/777974. We need to migrate
it to new preference controller
Fixes:
117257109
Test: Manual
Change-Id: I257be10d7cc1fc4a91ee0df404dd69b4d2ee8ae2
(cherry picked from commit
acacaf44d3e5c8d27c6b16a910e5dba83ca82526)
Jason Chiu [Tue, 2 Apr 2019 05:57:29 +0000 (13:57 +0800)]
Add prompt to sign in at captive portal to Wi-Fi Slice
- Support signing in captive portal APs in WifiSlice
- Show ContextualWifiSlice when signing in is required
- Generifies SliceBackgroundWorker.getInstance() to return <T extends SliceBackgroundWorker>
Fixes:
128056349
Test: make RunSettingsRoboTests -j
Change-Id: Ib4d3942591a65e81018389e4c0bbddfea6854dbc
(cherry picked from commit
dd9f92280bac5c86c6a3ac3fbebcd5d5ff510f13)
Andrew Sapperstein [Tue, 2 Apr 2019 19:25:51 +0000 (12:25 -0700)]
Update char limit for reset_esim_title.
Fixes:
129711512
Test: verified manually with larger string.
Change-Id: I802ed901ad65d79dbe761929467607f5e783be9e
Rich Cannings [Thu, 4 Apr 2019 07:39:11 +0000 (00:39 -0700)]
[automerger skipped] Merge "DO NOT MERGE Refactor passwords/pins/patterns to byte[]" into pi-dev am:
5d9189fab2 -s ours
am:
44427259e8
Change-Id: I6dd5016aa9636457b740f92f3770e5b5a69d4c78
Rich Cannings [Thu, 4 Apr 2019 07:17:57 +0000 (00:17 -0700)]
[automerger skipped] Merge "DO NOT MERGE Refactor passwords/pins/patterns to byte[]" into pi-dev
am:
5d9189fab2 -s ours
am skip reason: subject contains skip directive
Change-Id: Id431f40576a5375d541b4b41d2880ac0c9ac7519
Rich Cannings [Thu, 4 Apr 2019 07:13:15 +0000 (00:13 -0700)]
[automerger skipped] DO NOT MERGE Refactor passwords/pins/patterns to byte[] am:
34042bbf1d -s ours
am:
2095ac82c4
Change-Id: I124662fa7bd0513fea6f7b8a6b2330835c6c386b
Rich Cannings [Thu, 4 Apr 2019 06:56:43 +0000 (23:56 -0700)]
[automerger skipped] DO NOT MERGE Refactor passwords/pins/patterns to byte[]
am:
34042bbf1d -s ours
am skip reason: subject contains skip directive
Change-Id: I903bcc9500ea4732fdacd9f7c77538ba8390f34d
Xiangyu/Malcolm Chen [Thu, 4 Apr 2019 00:15:19 +0000 (17:15 -0700)]
[automerger skipped] Merge "Clean up a few names of Telephony intent extra." am:
6bb737c5b9 am:
681bf8a664
am:
37683154b4 -s ours
am skip reason: change_id I5d47b132abb722282bd10b9fbb362fb1f1d32f11 with SHA1
f2fca31c51 is in history
Change-Id: I8d45b26d7863190ddf51a8e8a5e86b4acfbde816
Bill Rassieur [Wed, 3 Apr 2019 23:59:32 +0000 (16:59 -0700)]
Merge master@
5406228 into git_qt-dev-plus-aosp.
am:
d09106b207
Change-Id: I9de6ed0dae680c55f3f1396cb8fbc95c6a77f9a3
Xiangyu/Malcolm Chen [Wed, 3 Apr 2019 23:50:20 +0000 (16:50 -0700)]
Merge "Clean up a few names of Telephony intent extra." am:
6bb737c5b9
am:
681bf8a664
Change-Id: I8576bf49c27620f873c501d3bf837ec0b0b3e679
Kevin Chyn [Wed, 3 Apr 2019 23:46:14 +0000 (23:46 +0000)]
Merge "Set/Get features with new interface"
Xiangyu/Malcolm Chen [Wed, 3 Apr 2019 23:25:05 +0000 (16:25 -0700)]
Merge "Clean up a few names of Telephony intent extra."
am:
6bb737c5b9
Change-Id: I1a2232458ab8fd4a89c1ada1e5195bf346e31074
Xiangyu/Malcolm Chen [Wed, 3 Apr 2019 23:06:47 +0000 (23:06 +0000)]
Merge "Clean up a few names of Telephony intent extra."
Lei Yu [Wed, 3 Apr 2019 22:45:28 +0000 (22:45 +0000)]
Merge "Move telephony method to worker thread"
jackqdyulei [Wed, 3 Apr 2019 00:27:41 +0000 (17:27 -0700)]
Move telephony method to worker thread
Get bug complaining it blocks UI even though it works fine some devices.
This CL moves methods to worker thread and keep progressbar
shown at least for 1 second, to avoid janky UI.
Fixes:
129329645
Test: RunSettingsRoboTests
Change-Id: Iee51949b7f6dfe2ede0fc4e6cd0f7b96d7199081
Chen Xu [Wed, 3 Apr 2019 22:17:46 +0000 (22:17 +0000)]
Merge "SDK API doesSwitchModemConfigTriggerReboot"
TreeHugger Robot [Wed, 3 Apr 2019 22:07:38 +0000 (22:07 +0000)]
Merge "Add tests for ContextualCardManager."
Kevin Chyn [Wed, 3 Apr 2019 03:01:05 +0000 (20:01 -0700)]
Set/Get features with new interface
Bug:
127382095
Test: Builds
Change-Id: Ideb252989a49eec88b8ee7f3ce6ea4f9d85bb3bc
TreeHugger Robot [Wed, 3 Apr 2019 21:17:45 +0000 (21:17 +0000)]
Merge "Add tests for ContextualCardsAdapter."
TreeHugger Robot [Wed, 3 Apr 2019 20:48:23 +0000 (20:48 +0000)]
Merge "Add a flashlight handler activity to support indexability."
TreeHugger Robot [Wed, 3 Apr 2019 20:41:21 +0000 (20:41 +0000)]
Merge "Disable "Battery dialog" for default apps"
TreeHugger Robot [Wed, 3 Apr 2019 19:42:25 +0000 (19:42 +0000)]
Merge "Convert xml based API allowDynamicSummaryInSlice to java"
Fan Zhang [Tue, 2 Apr 2019 23:41:01 +0000 (16:41 -0700)]
Add a flashlight handler activity to support indexability.
Fixes:
128465925
Fixes:
123711093
Test: reindex
Change-Id: Ie082e65ee070f6143c4c65db3f70615b16af0e52
chen xu [Wed, 3 Apr 2019 17:31:19 +0000 (10:31 -0700)]
SDK API doesSwitchModemConfigTriggerReboot
Bug:
129424775
Change-Id: I95045f8e2c572a9ee7e8f402568e72ac02a2d1be
clownshen [Mon, 1 Apr 2019 13:27:14 +0000 (21:27 +0800)]
Add Wi-Fi data usage field
Add Wi-Fi data usage field at Wi-Fi Setting to show out the total Wi-Fi
data usage for user.
Bug:
129474341
Test: atest WifiSettingsTest
Test: manual test
Change-Id: Iad5bee47bd83ed143a2730f042d77907344f4017
Cn Chen [Wed, 3 Apr 2019 15:36:47 +0000 (15:36 +0000)]
Merge "Pass back number of fingerprint enrolled from settings to SUW"
TreeHugger Robot [Wed, 3 Apr 2019 11:47:38 +0000 (11:47 +0000)]
Merge "Remove unused method from NotificationChannelSlice"
Yi-Ling Chuang [Wed, 3 Apr 2019 09:28:50 +0000 (17:28 +0800)]
Add tests for ContextualCardsAdapter.
Fixes:
114307549
Test: robotests
Change-Id: I6ce023bf97c9f7b3c709bda2aa991a349c7aa825
Jason Chiu [Wed, 3 Apr 2019 10:26:48 +0000 (10:26 +0000)]
Merge "Micro cleanup and refactoring"
Yi-Ling Chuang [Tue, 22 Jan 2019 04:12:08 +0000 (12:12 +0800)]
Add tests for ContextualCardManager.
Bug:
114307549
Test: robotests
Change-Id: Iac9450ed21011cb6e8186fbe686ff4d03547ba5e
Alan Stokes [Wed, 3 Apr 2019 09:37:56 +0000 (09:37 +0000)]
Merge "Take default for background activity starts from DeviceConfig."
Yanting Yang [Wed, 3 Apr 2019 09:29:24 +0000 (17:29 +0800)]
Remove unused method from NotificationChannelSlice
Fixes:
129835504
Test: robotests
Change-Id: Id0bcad694bba39ce67c77388b9bde7018aae1560
TreeHugger Robot [Wed, 3 Apr 2019 07:56:21 +0000 (07:56 +0000)]
Merge "Play vibration when Wi-Fi QR code scanner recognize a valid QR code"
Po-Chien Hsueh [Wed, 3 Apr 2019 07:55:55 +0000 (07:55 +0000)]
Merge "Make feature flag settings_dynamic_system persistent"
Jason Chiu [Wed, 3 Apr 2019 05:49:26 +0000 (13:49 +0800)]
Micro cleanup and refactoring
- remove unused dimen resources
- remove unused and refactor codes
Test: make RunSettingsRoboTests -j
Change-Id: Ic2a5b16323667741d048e20e3db8da3fb4dc348a
Arc Wang [Tue, 2 Apr 2019 06:31:33 +0000 (14:31 +0800)]
Play vibration when Wi-Fi QR code scanner recognize a valid QR code
Bug:
127377350
Test: manual
Change-Id: I9bfcb6f4d1d4dee45d2cacdedfc07d2f4eccd758
Clown SHEN [Wed, 3 Apr 2019 02:16:05 +0000 (02:16 +0000)]
Merge "Only show Sign In button for connected network"
Malcolm Chen [Sat, 23 Mar 2019 00:59:00 +0000 (17:59 -0700)]
Clean up a few names of Telephony intent extra.
Bug:
128645056
Test: build
Change-Id: I5d47b132abb722282bd10b9fbb362fb1f1d32f11
Merged-In: I5d47b132abb722282bd10b9fbb362fb1f1d32f11
Linda Tseng [Wed, 3 Apr 2019 02:06:42 +0000 (02:06 +0000)]
Merge "Fix tinting on injected pref icon"
TreeHugger Robot [Wed, 3 Apr 2019 02:04:30 +0000 (02:04 +0000)]
Merge "Allow NEW type battery early warning to show in homepage"
Arc Wang [Wed, 3 Apr 2019 01:50:14 +0000 (01:50 +0000)]
Merge "Update Wi-Fi QR code scan icon and share icon"
Fan Zhang [Tue, 2 Apr 2019 22:45:51 +0000 (15:45 -0700)]
Allow NEW type battery early warning to show in homepage
Fixes:
129492004
Test: robotest
Change-Id: I443866a832e4e02c128117dacd766d4fbbd8fc2e
lindatseng [Tue, 2 Apr 2019 18:27:25 +0000 (11:27 -0700)]
Fix tinting on injected pref icon
We used to tint the injected pref icon when refreshing Tile. However,
when we are going to render the icon, we used Tile.getIcon which uses
the icon resource id to get the original version of icon directly.
Do a little refactor here to move the tinting logic inside Tile.getIcon.
Test: Manual/Visual inspection
Fixes:
129010399
Change-Id: I6f187b12cb6d91b54dcfe43e0ff34add55fd7b07
TreeHugger Robot [Tue, 2 Apr 2019 19:58:42 +0000 (19:58 +0000)]
Merge "Show the disclaimer for WFC emergency call limitation"
TreeHugger Robot [Tue, 2 Apr 2019 19:36:30 +0000 (19:36 +0000)]
Merge "Remove unnecessary notify in BT preference"
TreeHugger Robot [Tue, 2 Apr 2019 19:07:26 +0000 (19:07 +0000)]
Merge "Add FLAG_RECEIVER_FOREGROUND flag"
TreeHugger Robot [Tue, 2 Apr 2019 18:17:14 +0000 (18:17 +0000)]
Merge "Settings unexpectedly open after turning work profile on"
Quang Luong [Tue, 2 Apr 2019 17:19:21 +0000 (17:19 +0000)]
Merge "Removed Write to NFC dialog"
Alan Stokes [Tue, 2 Apr 2019 14:37:54 +0000 (15:37 +0100)]
Take default for background activity starts from DeviceConfig.
We've modified the implementation to use the value set by DeviceConfig
if the user has not touched the developer options setting (change
fb227077b8652b817a094d37a5215ad7466ee603). We want the Settings screen
to reflect this default until the user explicitly sets it.
Additionally if the user disables developer settings we want to go
back to using whatever DeviceConfig sets.
Bug:
129533810
Test: croot && make RunSettingsRoboTests \
ROBOTEST_FILTER=AllowBackgroundActivityStartsPreferenceControllerTest
Change-Id: I73901a22da928f9a6924b30882b26494cdcd94bc
Chandan Nath [Tue, 2 Apr 2019 14:20:41 +0000 (14:20 +0000)]
Merge "Show "Backup service isn't active" if backup isnt active for work profile"
Chandan Nath [Mon, 1 Apr 2019 20:05:15 +0000 (21:05 +0100)]
Show "Backup service isn't active" if backup isnt active for work
profile
Bug:
127821779
Test: 1) Set up work profile.
2) adb shell bmgr --user 19 activate true
3) Settings -> System -> Backup -> Work -> Shows google backup settings
4) adb shell bmgr --user 19 activate false
5) Settings -> System -> Backup -> Work -> "Backup service isn't active"
Change-Id: Ifc16cf3e69fd9db87d519cbad68f0f8e9d8ef6f3
TreeHugger Robot [Tue, 2 Apr 2019 08:42:30 +0000 (08:42 +0000)]
Merge "Add Wi-Fi connect listener in ConnectToWifiHandler"
clownshen [Mon, 1 Apr 2019 08:01:06 +0000 (16:01 +0800)]
Only show Sign In button for connected network
The Sign In button may appeared in details page for disconnected network
if current network is Captive Portal network. Should hide the button
for disconnected network.
Bug:
129514576
Test: make RunSettingsRoboTests -j32 ROBOTEST_FILTER=com.android.settings.wifi.details.WifiDetailPreferenceControllerTest
Test: manual test
Change-Id: I8b4f79e7ba731ce83c49576fffd3e78a27598be3
Clown SHEN [Tue, 2 Apr 2019 08:38:05 +0000 (08:38 +0000)]
Merge "Add test cases for disconnected/not in range network"
hughchen [Tue, 2 Apr 2019 06:22:39 +0000 (14:22 +0800)]
Add FLAG_RECEIVER_FOREGROUND flag
Bug:
129726026
Test: make -j42 RunSettingsRoboTests
Change-Id: Idf994396a5dcf78e520ff3cf7c928d4dd19b606e
Po-Chien Hsueh [Tue, 2 Apr 2019 05:53:21 +0000 (13:53 +0800)]
Make feature flag settings_dynamic_system persistent
Bug:
119647479
Test: turn on/off feature flag and use DynamicSystem
Change-Id: Icc26e649caea2c6dfc6e09d8f2c9f0f37568d445
Jason Chiu [Thu, 28 Mar 2019 07:56:21 +0000 (15:56 +0800)]
Add Wi-Fi connect listener in ConnectToWifiHandler
- Extract the connect listener from WifiSettings
- Add a listener to display a toast on failure to connect in ConnectToWifiHandler
- Also for the new AccessPoint.startOsuProvisioning() which accepts a connect listener
Bug:
123697580
Test: make RunSettingsRoboTests -j ROBOTEST_FILTER=com.android.settings.wifi
Change-Id: I29b2c1e2c58312d692675ecabf2818b4bbed3b51
TreeHugger Robot [Tue, 2 Apr 2019 05:12:32 +0000 (05:12 +0000)]
Merge "Disallow Package Installer to be disabled"
Mill Chen [Fri, 29 Mar 2019 02:14:25 +0000 (19:14 -0700)]
Settings unexpectedly open after turning work profile on
ConfirmDeviceCredentialActivity doesn't set a taskAffinity, so the
default taskAffinity is the package name. That's why Settings
unexpectedly open after users turn work profile on. We specified an
unique name to taskAffinity to avoid launching Settings activity.
Fixes:
129330530
Test: turn work profile off then turn it on, repeat
Change-Id: I1f71c3d1bb37a09a6393fae4c01bc9b18cab49a8
Tony Zhu [Tue, 2 Apr 2019 03:36:03 +0000 (03:36 +0000)]
Merge "Control VoLTE toggle names by "show_4g_for_lte_data_icon_bool"."
Clown SHEN [Tue, 2 Apr 2019 03:20:34 +0000 (03:20 +0000)]
Merge "Enlarge wifi signal icon from 24dp to 32dp for header view"
clownshen [Fri, 29 Mar 2019 07:27:03 +0000 (15:27 +0800)]
Add test cases for disconnected/not in range network
Since detail page support to display for saved network which connection
state may be disconnected or not in range, add more test cases for this
new change.
Bug:
124707751
Test: atest WifiDetailPreferenceControllerTest passed
Change-Id: Ia6426ed6336c09f387317c5597f8deb14c1a9502
Clown SHEN [Tue, 2 Apr 2019 03:03:49 +0000 (03:03 +0000)]
Merge "Update state as disconnected when Wi-Fi disabled"
clownshen [Fri, 29 Mar 2019 06:20:32 +0000 (14:20 +0800)]
Update state as disconnected when Wi-Fi disabled
Connect button display wrong string "Connecting..." and be disabled
when Wi-Fi turned off at quick setting. Update state as disconnected
when Wi-Fi disabled to fix this issue.
Bug:
129514552
Test: manual test
Change-Id: I76a247ce0ed951357172e67221281b004df386d8
tonyzhu [Thu, 28 Mar 2019 12:07:18 +0000 (20:07 +0800)]
Control VoLTE toggle names by "show_4g_for_lte_data_icon_bool".
Using "show_4g_for_lte_data_icon_bool" to control VoLTE toggle names,
making sure strings can be correspond to the icon.
Bug:
128325427
Test: Use commands to override carrier config to observe the
UI as expected.
Test: atest pass.
Change-Id: I41dd28eb2c14d385a8396c551bf5ef2cf9258997
Hall Liu [Tue, 2 Apr 2019 00:58:07 +0000 (17:58 -0700)]
[automerger skipped] Merge "Show the disclaimer regarding WFC location privacy policy" am:
5697a7e85d am:
fa412244c8
am:
23551e561f -s ours
am skip reason: change_id I03895743fb8da95269069ad7eda9a7b3e282857e with SHA1
a37337349c is in history
Change-Id: Ic1a35b2edfeb9ecd2780cb73452d52c5f4488e4d
Hall Liu [Tue, 2 Apr 2019 00:13:21 +0000 (17:13 -0700)]
Merge "Show the disclaimer regarding WFC location privacy policy" am:
5697a7e85d
am:
fa412244c8
Change-Id: Id628e249c421740339dab7ce8abf60371fb12110
Hao Zhang [Tue, 28 Aug 2018 10:20:21 +0000 (19:20 +0900)]
Show the disclaimer for WFC emergency call limitation
The emergency calls might not work properly via wifi calling, especially
in areas with no 2G/3G coverage. Display the disclaimer for the this
limitation when a user enabled the wifi calling setting.
Test: manual - Checked that the disclaimer for emergency call limitation
is shown when changing wifi calling setting to turned on.
Test: auto - Passed EmergencyCallLimitationDisclaimerTest.
Bug:
68115846
Change-Id: I881d479c1e02525ac614c66594637a5e0347d70c
jackqdyulei [Fri, 29 Mar 2019 18:37:47 +0000 (11:37 -0700)]
Disable "Battery dialog" for default apps
If it is default active app(i.e. Phone, SMS), disable battery
optimzation dialog so user can't optimize it.
Fixes:
118910079
Test: RunSettingsLibRoboTests
Change-Id: I7223913c1e6ef68d84adfc2c54d133661a529202
Hall Liu [Mon, 1 Apr 2019 23:25:49 +0000 (16:25 -0700)]
Merge "Show the disclaimer regarding WFC location privacy policy"
am:
5697a7e85d
Change-Id: Iddb15758aefffade3138d0d8c42a953d50640b14
Hall Liu [Mon, 1 Apr 2019 22:55:51 +0000 (22:55 +0000)]
Merge "Show the disclaimer regarding WFC location privacy policy"
TreeHugger Robot [Mon, 1 Apr 2019 22:48:16 +0000 (22:48 +0000)]
Merge "Don't allow RRO uninstall if overlay is enabled"
Linda Tseng [Mon, 1 Apr 2019 22:07:32 +0000 (22:07 +0000)]
Merge "Tint icon colors of storage screen same as other screen"
Fan Zhang [Mon, 1 Apr 2019 21:56:58 +0000 (14:56 -0700)]
Merge "WifiCallingSettingsForSubTest: Solve casting problem in setup" am:
8877dc8fd0 am:
3a19c32bfe
am:
74fa961299
Change-Id: I5c71c56414783b97d4faf1ecd56c20f5fd5793a3
Fan Zhang [Mon, 1 Apr 2019 21:50:41 +0000 (14:50 -0700)]
Merge "WifiCallingSettingsForSubTest: Solve casting problem in setup" am:
8877dc8fd0
am:
3a19c32bfe
Change-Id: Ifc39462efeb50a6776cf4e419df650164ad5f1a5