Raff Tsai
0e8a45a7f5
Prevent null point exception
...
Test: Settings -> click search bar, not seeing null point exception
Change-Id: Ib9df9d97b374246fa36c79f531760b57d7c6c508
2019-11-26 12:05:58 +08:00
Bonian Chen
95e1c8d099
Merge "[Settings] Fix conflict of AOSP merge on wifi call"
2019-11-25 03:07:16 +00:00
Bonian Chen
cacf047daa
[Settings] Fix conflict of AOSP merge on wifi call
...
Merge for fixing conflict of Ib4b0e1191c83e23377ccf8ed013252728ef9dd95
Bug: 144960427
Test: build pass
Change-Id: I2979a9a2ee1bc690486e25b7d470cf905cf02d17
Merged-In: Idb063bdab3d3b11c348804c1c0ecb268cca3068e
2019-11-22 20:38:13 +00:00
Andrei-Valentin Onea
0e7b8f7a93
Merge "Add compatibility change preference"
2019-11-22 13:02:45 +00:00
Bonian Chen
56385ed9f8
Merge "[Settings] Fix conflict of AOSP merge"
2019-11-22 09:05:29 +00:00
Bonian Chen
821a1259e7
[Settings] Fix conflict of AOSP merge
...
Merge for fixing conflict of Ib4b0e1191c83e23377ccf8ed013252728ef9dd95
Bug: 144960427
Test: build pass
Change-Id: I0e8c9b060f23547cec541819e657fc5560d6312c
Merged-In: I7a86395c86d31fe2ba54c04ac16b1a0ebfc843f3
2019-11-22 02:36:11 +00:00
Andrei Onea
486fd49e87
Add compatibility change preference
...
Add UI for modifying the compatibility change overrides per-app.
Test: make RunSettingsRoboTests ROBOTEST_FILTER=PlatformCompatDashboardTest
Bug: 138280620
Change-Id: I07c7602e7a439e47b0b1fa59b047231afbbc0ab6
2019-11-21 11:48:07 +00:00
Bonian Chen
6c9b9f41d6
Merge "[Settings] Fix robotest build breakage"
2019-11-21 02:56:12 +00:00
James Mattis
76632c01fd
Merge "Swap param order in registerSoftApCallback"
2019-11-20 18:16:53 +00:00
Bonian Chen
4a1dbccac6
[Settings] Fix robotest build breakage
...
Add annotation library into test build
Bug: 144810473
Test: build pass
Change-Id: Idb4e056fb73a349ac268e5d2292a31fe7d9a6642
2019-11-20 23:05:55 +08:00
James Mattis
def3e9f734
Swap param order in registerSoftApCallback
...
Moving executor to be the first argument in registerSoftApCallback.
Bug: 144379300
Test: Manually on pixel 3
Change-Id: I5563c1059cc04014a0fd909e2508f7bf497d708e
Merged-In: I5563c1059cc04014a0fd909e2508f7bf497d708e
2019-11-18 13:16:34 -08:00
James Mattis
60bd816476
Merge "SoftApCallback using executor vs handler"
2019-11-15 23:17:54 +00:00
Hunter Knepshield
64efbe1240
Merge "Synced the code from master branch"
2019-11-15 18:19:06 +00:00
Sunny Shao
f3865e9264
Synced the code from master branch
...
Fixes: 144364245
Test: make RunSettingsRoboTests ROBOTEST_FILTER=com.android.settings.deviceinfo.PhoneNumberPreferenceControllerTest
Test: make RunSettingsRoboTests ROBOTEST_FILTER=com.android.settings.deviceinfo.simstatus.SimStatusDialogControllerTest
Test: make RunSettingsRoboTests ROBOTEST_FILTER=com.android.settings.network.telephony.RenameMobileNetworkDialogFragmentTest
Test: make RunSettingsRoboTests ROBOTEST_FILTER=com.android.settings.homepage.contextualcards.deviceinfo.DeviceInfoSliceTest
Change-Id: Ibb26f5a63a969b28915a226a0197bc4033c91346
Merged-In: I5dfb71ceb87a8f658ef7fbceacf460ef8d35593a
2019-11-14 21:57:12 +08:00
James Mattis
90c23d2fe7
SoftApCallback using executor vs handler
...
Updating classes to support making SoftApCallback methods available to @SystemAPI including
the API for registration of a SoftApCallback which includes a change to
now use executor vs handler.
Bug: 143564153
Test: make RunSettingsRoboTests ROBOTEST_FILTER=WifiTetherPreferenceControllerTest
Also tested manually on a Pixel 3.
Change-Id: I952ad10dd88b7d97b3cd86b269b8f67b00b1fa15
Merged-In: I952ad10dd88b7d97b3cd86b269b8f67b00b1fa15
2019-11-13 21:39:26 -08:00
James Mattis
2b7c8937de
Merge "Support for hotspot client visibility."
2019-11-13 16:37:27 +00:00
Kevin Chang
1595fc8fc8
Merge "Add accessibility timeout video and illustration"
2019-11-13 00:53:49 +00:00
James Mattis
03d65cee36
Support for hotspot client visibility.
...
Adding support for visibility into clients that connect to an active hotspot.
Bug: 137309578
Test: Tested manually on a Pixel 3.
Change-Id: Ife4bb5ca7bbcf075683cb0a233f2b5716ccd51d9
Merged-In: Ife4bb5ca7bbcf075683cb0a233f2b5716ccd51d9
2019-11-11 22:30:45 -08:00
Kevin Chang
6915e6a551
Add accessibility timeout video and illustration
...
Add the new assets of accessibility timeout.
Bug: 143861394
Test: Visual
Change-Id: I0e4ba60c934191afbcaddb81e6d07d37244dce64
Merged-In: I0e4ba60c934191afbcaddb81e6d07d37244dce64
2019-11-08 19:47:02 +08:00
Treehugger Robot
eed0f8816b
Merge "Refactor usages of getAliasName to use getAlias in Settings"
2019-11-05 18:20:50 +00:00
Treehugger Robot
9d29833485
Merge "Settings: fix apn_editor carrier_enabled summaryOff string"
2019-11-05 17:15:45 +00:00
Treehugger Robot
68ddb3afdb
Merge "Settings: Fix QrCamera crash on devices without flash"
2019-10-30 06:29:47 +00:00
LuK1337
b056ea70f0
Settings: Fix QrCamera crash on devices without flash
...
Change-Id: Ife34b5fb87a9a4f509b665a3433e0b2ba857c885
2019-10-30 02:45:08 +00:00
Raff Tsai
0e40f46fe2
Merge "Settings: Respect preference's visibility in VideoPreferenceController"
2019-10-29 16:39:13 +00:00
LuK1337
9c3ab97182
Settings: Respect preference's visibility in VideoPreferenceController
...
* Since AbstractPreferenceController's displayPreference()
sets the visibility based on isAvailable() we need to
set mVideoPreference early and make getAvailabilityStatus()
return UNSUPPORTED_ON_DEVICE if needed.
Test: manual, open battery manager
Change-Id: Ibf72971b49fa1162fb99f9fc61cbb54ba39a2dfa
2019-10-29 15:39:27 +01:00
Josh Hou
27bf33e053
Merge changes Ibec13fbe,If89c67c0
...
* changes:
Fix ViLTE is not available when WiFi Calling is disabled
Check the missing useHomeWfMode case
2019-10-28 12:18:53 +00:00
Josh Hou
e2cdd74174
Fix ViLTE is not available when WiFi Calling is disabled
...
Bug: 141831293
Test: 1. Set carrier config carrier_wfc_ims_available_bool to false,
then verify Wi-Fi calling option is not shown.
2. Set carrier config carrier_vt_available_bool to false, then
verify video calling option is not shown.
3. Set both carrier_wfc_ims_available_bool and
carrier_vt_available_bool to false, then verify calling category
is not shown.
Change-Id: Ibec13fbeb5acf1d62342286687b2ba969beb4e14
Merged-In: Ibec13fbeb5acf1d62342286687b2ba969beb4e14
2019-10-28 11:12:49 +00:00
Youming Ye
001a2e774d
Check the missing useHomeWfMode case
...
Bug: 133812904
Test: Build
Change-Id: If89c67c0595808a1339517c6084f1d1e23f5974b
Merged-In: If89c67c0595808a1339517c6084f1d1e23f5974b
2019-10-28 10:16:24 +00:00
Jack Yu
49358c53b2
Merge "Change Wi-Fi Calling text for SFR France"
2019-10-27 07:20:47 +00:00
Xin Li
e2c2504c94
Merge "Merge Coral/Flame into AOSP master"
2019-10-27 04:44:30 +00:00
Chen Xu
12a7368ad2
Merge "move CellBroadcastMessage from telephony-common to app"
2019-10-25 17:28:22 +00:00
Xin Li
52bb254eea
Merge Coral/Flame into AOSP master
...
Bug: 141248619
Change-Id: I3850f512dadd5e2c6d51af3c8abab1fa5dbc86ad
Merged-In: I46ad5cff3809191483b48fe292dba220a0d699c6
2019-10-25 10:28:05 -07:00
Aaron Huang
f67076dad5
Merge "Replace getNetworkPrefixLength() with public API"
2019-10-25 05:15:16 +00:00
Raff Tsai
c53771e80a
Merge "Skip loading contextual cards if legacy cards are used"
2019-10-25 01:35:20 +00:00
Aaron Huang
9251280615
Replace getNetworkPrefixLength() with public API
...
Use public API getPrefixLength() instead
Test: build pass
Change-Id: Ib85aa12dc22ac5b03c9bb7101beaf340014eb4fd
2019-10-24 10:51:53 +00:00
Lucas Lin
5eda5a3e7f
Merge "Improve the wifi description for the case of private DNS broken"
...
am: 37b17ae752
Change-Id: I46ad5cff3809191483b48fe292dba220a0d699c6
2019-10-23 02:52:01 -07:00
Lucas Lin
37b17ae752
Merge "Improve the wifi description for the case of private DNS broken"
2019-10-23 09:20:09 +00:00
Rahul Sabnis
c96469f2bd
Refactor usages of getAliasName to use getAlias in Settings
...
Bug: 142352567
Test: Manual
Change-Id: I40af1b1e0453900fd888317ae46b20ef359db473
2019-10-22 15:34:40 -07:00
Niclas Rokicki
90f0230b54
Merge "translate="false" -> translatable="false""
...
am: b333e79df9
Change-Id: I3955c9f03c741efa86fcf03baafea81d7073d5ef
2019-10-22 09:41:58 -07:00
Treehugger Robot
b333e79df9
Merge "translate="false" -> translatable="false""
2019-10-22 16:29:50 +00:00
Niclas Rokicki
af548beaea
translate="false" -> translatable="false"
...
Fixed a typo related to String translation
Bug: 142888682
Test: Manual
Change-Id: I86fd2d9a4c5b085679ed627c7ecb7578da168ced
2019-10-22 16:30:02 +08:00
Daniel Hunt
dfd5e4fed5
Skip loading contextual cards if legacy cards are used
...
This stops a jarring animation that occurs when returning to the
settings top level when legacy contextual cards are enabled and
shown at the top of the top level list,
Bug: 142936956
Test: Manual
Change-Id: I43605adf6f1bf63cc40157ac97c8e3295dd3cd99
2019-10-20 15:46:39 +00:00
Chen Xu
24a72eb92a
move CellBroadcastMessage from telephony-common to app
...
1. add slotIndex in SmsCbMesage(cellbroadcast can be received
when sim is absent)
2. move cellbroadcastMessage from telephony-common to app
next step, considering merging CellBroadcast to SmsCbMessage
Bug: 135956699
Bug: 141962867
Test: build & unit test
Change-Id: Iba5e727fc1a1adaf44a7fa1eebfefe34fa8644aa
(cherry picked from commit 86a8e9b627 )
Merged-in: Iba5e727fc1a1adaf44a7fa1eebfefe34fa8644aa
2019-10-20 04:05:06 +00:00
Anamika Singh
251411674b
Merge "Move Emergency call button"
...
am: 2501f6e268
Change-Id: Ie687f4b03f7ebf572057dca6678ac4d70666f76f
2019-10-18 01:49:54 -07:00
Treehugger Robot
2501f6e268
Merge "Move Emergency call button"
2019-10-18 08:37:39 +00:00
Raff Tsai
2bb6e54317
Merge "Make sure close button has proper color"
...
am: 0f9ad6d7f9
Change-Id: I3f785f159c9b0e46a293acb8656eb47c9b6e4550
2019-10-15 03:32:29 -07:00
Raff Tsai
0f9ad6d7f9
Merge "Make sure close button has proper color"
2019-10-15 10:11:56 +00:00
Xin Li
acfebe21ac
DO NOT MERGE - Merge QD1A.190821.011 into stage-aosp-master
...
Bug: 141248619
Change-Id: I8d4b7b73176b7323ea231bd98c5f74f6b6e96471
2019-10-14 22:54:19 +00:00
SongFerng Wang
951e9b7742
Merge changes Ifaed6ca8,I4a78e2e7,I945d3c2f,Ia0d1333c,I5dfe4843
...
am: bc6a65ca32
Change-Id: I3ec33adf894393b43296e83b450f3a894785fc92
2019-10-14 00:34:20 -07:00
SongFerngWang
10d41f52b7
Preferred network list add 5G item
...
am: 76422cab68
Change-Id: I05771619c27d7ce0dd40fd83a9b3560758d29621
2019-10-14 00:34:10 -07:00