Brad Ebinger
397fe0806e
Merge "Allow SimDialogActivity to be started for result" into qt-dev am: d204d6c33f
...
am: 9761dd4634
Change-Id: I5dc3f6b791e258be13d073640be77f89de460570
2019-05-10 22:20:42 -07:00
hughchen
1042c287ac
Merge "Clear media switcher items when in phone call" into qt-dev am: 12dcbe7c71
...
am: 26aa660541
Change-Id: Id7ade81d98528bb6c16fee243d148d359101712d
2019-05-10 20:22:01 -07:00
Brad Ebinger
9761dd4634
Merge "Allow SimDialogActivity to be started for result" into qt-dev
...
am: d204d6c33f
Change-Id: Ib448a6901581294050fc988ed9c16f7e93066860
2019-05-10 13:12:21 -07:00
Brad Ebinger
d204d6c33f
Merge "Allow SimDialogActivity to be started for result" into qt-dev
2019-05-10 19:42:55 +00:00
hughchen
26aa660541
Merge "Clear media switcher items when in phone call" into qt-dev
...
am: 12dcbe7c71
Change-Id: Ieb3326b10dd25c22c9e16286585a6dbdedf2fa35
2019-05-10 11:49:43 -07:00
Brad Ebinger
d206835fe3
Allow SimDialogActivity to be started for result
...
In Telephony, we sometimes need to be able to launch
the SIM pick dialog activity for SMS without setting
a new default (i.e. user chose "ask every time") for
default SMS subscription.
Adds the ability for the SimDialogActivity to be
called using startActivityForResult and not set the
user's choice as the default.
Bug: 130853716
Bug: 130567323
Test: run Telephony SmsManagerTestApp
Change-Id: If9f9ebbfe9b7b6718ed759937abbcfa6d22c6295
2019-05-10 18:29:54 +00:00
TreeHugger Robot
12dcbe7c71
Merge "Clear media switcher items when in phone call" into qt-dev
2019-05-10 18:14:02 +00:00
Arc Wang
a8bd70f7a9
Merge "Fix "Turn on Wi-Fi scanning?" does not pop up when clicking "Turn on Wi-Fi automatically"" into qt-dev am: 41656de5d4
...
am: 3ce4382031
Change-Id: Idd3be7b3e359a0e71bab0afd6ea016dae38f6f17
2019-05-10 07:13:08 -07:00
lindatseng
11cd648dea
Merge "Set panel launch mode to singleInstance and fix animation" into qt-dev am: 04623e81b8
...
am: d40facddb0
Change-Id: I6ae75cbea7463353a62df9431b81660b9c16d2a7
2019-05-10 07:09:10 -07:00
Kevin Chang
529753c9eb
Merge "Override performClick method to eliminate redundant click" into qt-dev am: 1915fe3b67
...
am: 9714ce162a
Change-Id: If9b40d1fe2e44c6f614a6fcff97b34f073f2b254
2019-05-10 07:00:47 -07:00
Pengquan Meng
f44a812872
Merge "Fixed network name for about/sim_status" into qt-dev am: b73d3c70c8
...
am: f7c9da43cf
Change-Id: Id480ee149ec51d52e3d5a705a6201e44b8e953d8
2019-05-10 06:55:47 -07:00
Kevin Chang
d19928b9af
Merge "Improve the Accessibility warning dialog with new design" into qt-dev am: 35890fabae
...
am: 34e42d31b0
Change-Id: Ifdd68f5cd961c1a67a006bbd82b9e794ff55ec49
2019-05-10 06:33:02 -07:00
lindatseng
69b35fe896
Merge "Fix NPE when launching MediaOutput Panel" into qt-dev am: b0f641869b
...
am: f23d16f577
Change-Id: Icb002de55edacad63a1f7f2802d92e72cf2fc0fd
2019-05-10 05:41:44 -07:00
Arc Wang
3ce4382031
Merge "Fix "Turn on Wi-Fi scanning?" does not pop up when clicking "Turn on Wi-Fi automatically"" into qt-dev
...
am: 41656de5d4
Change-Id: I9c051a5ecce1e9f0b2d8b58c1df8fbc7721cb8d7
2019-05-10 05:30:41 -07:00
lindatseng
d40facddb0
Merge "Set panel launch mode to singleInstance and fix animation" into qt-dev
...
am: 04623e81b8
Change-Id: I15fe1fb15753bf7ffb4bdaec3f3045a7c3d0aa66
2019-05-10 05:18:01 -07:00
Jonathan Scott
65f6968cb2
Merge "Make ScreenPinningSettings behaviour consistent with LockTaskController." into qt-dev am: c6ebdfe982
...
am: 21bb8ebde2
Change-Id: I8911e9622bdcd61ddcc0f6ae83cc1128cb71e66c
2019-05-10 03:20:10 -07:00
Kevin Chang
9714ce162a
Merge "Override performClick method to eliminate redundant click" into qt-dev
...
am: 1915fe3b67
Change-Id: I3de055284663373d83657334ae120c599682b97b
2019-05-10 02:24:16 -07:00
Pengquan Meng
f7c9da43cf
Merge "Fixed network name for about/sim_status" into qt-dev
...
am: b73d3c70c8
Change-Id: I4163adc7824982b06324335651b8a5c681d6eef6
2019-05-10 02:14:09 -07:00
TreeHugger Robot
41656de5d4
Merge "Fix "Turn on Wi-Fi scanning?" does not pop up when clicking "Turn on Wi-Fi automatically"" into qt-dev
2019-05-10 09:09:25 +00:00
Kevin Chang
34e42d31b0
Merge "Improve the Accessibility warning dialog with new design" into qt-dev
...
am: 35890fabae
Change-Id: Ib1ae087015aabe65aefd493374cb681536cbc9ef
2019-05-10 02:03:36 -07:00
TreeHugger Robot
04623e81b8
Merge "Set panel launch mode to singleInstance and fix animation" into qt-dev
2019-05-10 08:41:12 +00:00
lindatseng
f23d16f577
Merge "Fix NPE when launching MediaOutput Panel" into qt-dev
...
am: b0f641869b
Change-Id: I82e8906d672fce4831dde200073db5b763205bee
2019-05-10 01:30:15 -07:00
lindatseng
2943c1de7a
Set panel launch mode to singleInstance and fix animation
...
Set panel launch mode to singleInstance to avoid panel can show up
infinite time when user keep launching panels (Easy repro by
pressing volume hard key > settings again and again).
After changing launch mode to singleInstance, we will need to do
some refactors, to avoid weirdness when adding/changing/closing
panels:
1. Move and refactor logic in SettingsPanelActivity#onCreate.
We will need onNewIntent here to handle Panel launching, since
we only have one instance of SettingsPanelActivity now.
Also do refactor here to reuse the PanelFragment instead of
creating one every single time, to better handle the exit
animation, avoid janky exit behavior from the old PanelFragment
2. Move logic from PanelFragment#onCreateView, to reuse it when
updating panel content.
Also add exiting animation when we are transitioning the panel
from one to another. Also add alpha animation to make it move
more smoothly.
3. Adding flags to launch see more intent in settings.
Fixes: 131225920
Fixes: 131254399
Test: manual
Change-Id: I93d3708bd02a2d736e38685475f2d9988ef62d31
2019-05-10 07:14:13 +00:00
Jonathan Scott
21bb8ebde2
Merge "Make ScreenPinningSettings behaviour consistent with LockTaskController." into qt-dev
...
am: c6ebdfe982
Change-Id: I32964e483961eaf3139a864e525e45eb495bc5d7
2019-05-10 00:08:38 -07:00
Kevin Chang
1915fe3b67
Merge "Override performClick method to eliminate redundant click" into qt-dev
2019-05-10 06:32:25 +00:00
Arc Wang
454553ed52
Fix "Turn on Wi-Fi scanning?" does not pop up when clicking "Turn on Wi-Fi automatically"
...
We should make sure both 'Use location' & 'Wi-Fi scanning' are enabled
before calling setWifiWakeupEnabled.
Bug: 131777439
Test: manual
Change-Id: I602917cfa7c5581ecb414e8c44b4e20c8f9ea78d
2019-05-10 14:13:07 +08:00
Pengquan Meng
b73d3c70c8
Merge "Fixed network name for about/sim_status" into qt-dev
2019-05-10 06:10:48 +00:00
Kevin Chang
35890fabae
Merge "Improve the Accessibility warning dialog with new design" into qt-dev
2019-05-10 05:49:59 +00:00
Kevin Chang
d3496412f7
Override performClick method to eliminate redundant click
...
Bug: 132226328
Test: make RunSettingsRoboTests ROBOTEST_FILTER=SwitchBar
Change-Id: I22987a7695dfc84e50d6419604a9512f98cf4d13
2019-05-10 11:52:24 +08:00
Kevin Chang
bb6395eb4a
Improve the Accessibility warning dialog with new design
...
Create new Accessibility warning dialog based on the style of permission
dialog
Bug: 129788631
Test: Visual
Change-Id: I0ec693f9c29e6e85e17d5bd1a64a4c0fe9499f95
2019-05-10 11:46:19 +08:00
hughchen
095c5be448
Clear media switcher items when in phone call
...
- update test case
Bug: 132385707
Test: make -j42 RunSettingsRoboTests
Change-Id: I2bbd35e869e8ab5596d280d04fddc98f05629190
2019-05-10 10:27:26 +08:00
TreeHugger Robot
b0f641869b
Merge "Fix NPE when launching MediaOutput Panel" into qt-dev
2019-05-09 23:58:16 +00:00
TreeHugger Robot
c6ebdfe982
Merge "Make ScreenPinningSettings behaviour consistent with LockTaskController." into qt-dev
2019-05-09 23:46:22 +00:00
Pengquan Meng
0ab776f69d
Fixed network name for about/sim_status
...
The network name in sim status dialog is not the same as the one in the
about page. This CL use the carrier text which is resolved in
ServiceStateTracker as the network name, this keep the network name sync
with the status bar and the summary of sim status in the about page.
Bug: 31784938
Test: build & manual test
Change-Id: Ia741baabaa98ae447dbedf9e28fd2fda222e6d2e
2019-05-09 15:16:20 -07:00
Adam He
b78f572c9b
Merge "Display profile picker for content capture settings." into qt-dev am: f39ed1f432
...
am: 88ada1b06d
Change-Id: Icc6ac834bc00b4c9db8293eda6f3876febb7e481
2019-05-09 14:37:03 -07:00
lindatseng
33c5d72ffe
Fix NPE when launching MediaOutput Panel
...
Add NP check when to avoid NPE when launching MediaOutput Panel
Fixes: 132366620
Test: Manual
Change-Id: I21a481907a5bca83404e59e08ba11ce5c55199a4
2019-05-09 14:03:15 -07:00
tmfang
d31239437f
Merge "Catch another exception when we are building slices data for search" into qt-dev am: 7d3a67b04d
...
am: 1ba833e74e
Change-Id: Iaf2daf83c41f180e42ff7cf49cb759a8bba23d95
2019-05-09 13:39:14 -07:00
Adam He
88ada1b06d
Merge "Display profile picker for content capture settings." into qt-dev
...
am: f39ed1f432
Change-Id: I1103f4ba46db43209ae86f812d27505ce394eae3
2019-05-09 12:18:40 -07:00
TreeHugger Robot
f39ed1f432
Merge "Display profile picker for content capture settings." into qt-dev
2019-05-09 18:27:37 +00:00
tmfang
1ba833e74e
Merge "Catch another exception when we are building slices data for search" into qt-dev
...
am: 7d3a67b04d
Change-Id: I1dec0dd96ff9611677313ba3416f3ca3766eb61e
2019-05-09 11:05:31 -07:00
Arc Wang
2723563a19
Merge "Fix back arrow in wifi settings "connect to this network connection qr code" does not work" into qt-dev am: 5c461a2859
...
am: 6830a691dd
Change-Id: I3c74212e9efa6227f5c591080f3b593fb7e42b5a
2019-05-08 20:32:32 -07:00
Andrew Sapperstein
acd3a9f96d
Merge "Update summary for mobile data toggle for CBRS." into qt-dev am: cf964643b5
...
am: f8058733c2
Change-Id: Id779383a7216a53cc41c96eea76265c0a6b06105
2019-05-08 20:27:49 -07:00
tmfang
6410821f04
Catch another exception when we are building slices data for search
...
We lose chance to build all Settings slices if we got an exception
when settings was creating slice data for controllers.
We should make sure the process goes well even we got an exception
on an incorrect controller.
Also, we log exceptions for each catch.
Bug: 131449561
Test: Open Settings search and then we can see slice for some
search result.
Change-Id: Iac9f0e0a187f6d10cf53886afeb9cab479b6ce02
2019-05-09 10:31:53 +08:00
Arc Wang
6830a691dd
Merge "Fix back arrow in wifi settings "connect to this network connection qr code" does not work" into qt-dev
...
am: 5c461a2859
Change-Id: If6b45a274e22f0bc8c60b2276a0db39778bd2b34
2019-05-08 19:11:24 -07:00
Andrew Sapperstein
f8058733c2
Merge "Update summary for mobile data toggle for CBRS." into qt-dev
...
am: cf964643b5
Change-Id: I01bb48fc8bf405d6d807630e01e1f03a14432f9f
2019-05-08 19:01:36 -07:00
Arc Wang
5c461a2859
Merge "Fix back arrow in wifi settings "connect to this network connection qr code" does not work" into qt-dev
2019-05-09 01:29:48 +00:00
Kevin Chyn
4908680470
Merge changes from topic "Face Intro Changes" into qt-dev am: 0f65b773be
...
am: 82703baa9d
Change-Id: I3b2c9327aeadae1dba660e0bc9ed8d7470c2a50b
2019-05-08 18:17:00 -07:00
TreeHugger Robot
cf964643b5
Merge "Update summary for mobile data toggle for CBRS." into qt-dev
2019-05-09 00:51:31 +00:00
Kevin Chyn
82703baa9d
Merge changes from topic "Face Intro Changes" into qt-dev
...
am: 0f65b773be
Change-Id: I3868316218a7c6cd22e495f8a497941ab7451fc1
2019-05-08 17:08:01 -07:00
Kevin Chyn
0f65b773be
Merge changes from topic "Face Intro Changes" into qt-dev
...
* changes:
Added Face Enroll Education Screen
Updated Face Enroll Introduction
2019-05-08 23:55:22 +00:00