Commit Graph

52682 Commits

Author SHA1 Message Date
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
Beth Thibodeau
94d4f6ba34 Updating animation asset
Fixes: 132095489
Test: mp settingsg
Change-Id: Icda6eb54496356e2567e1d39ab0c718746e2442d
2019-05-10 14:28:43 -04:00
Andrew Sapperstein
32e3664abf Ignore failing test.
Bug: 132441284
Test: robotests
Change-Id: Ib3c7f9854e3ffba4e7e04bfb1fb1763fc77e160b
2019-05-10 11:25:23 -07: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
Bill Yi
8aaed6866f [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: 60252574a2 -s ours
am: 9e7e046813 -s ours
am skip reason: subject contains skip directive

Change-Id: I6fdc64da342e926d860bccb9642eb46ad39fe538
2019-05-10 07:05:01 -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
Fan Zhang
cea1c52872 Merge "Clean up homepage toolbar after setting transparent navbar." into qt-dev am: 30a9392b21
am: f57d1108df

Change-Id: I3784a56c72ccb8b4a6a0732e0102fc8641df32ce
2019-05-10 06:12:51 -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
Bill Yi
9e7e046813 [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev
am: 60252574a2 -s ours
am skip reason: subject contains skip directive

Change-Id: I04ab64dad79d70177a604da8c3a402cfb101d8f9
2019-05-10 04:43:56 -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
Mill Chen
e3e966689d Update listDivider for PreferenceFragmentCompat
The support library uses preference_list_divider_material for its list
divider and its color is a hardcoded value. That's why the divider color
can't be applied to the PreferenceFragmentCompat in Settings when
updating the divider color in the device defaults theme level. To make
it so we set its listDivider to list_divider_material to facilitate updating
the divider color.

Bug: 129943610
Test: visual
Change-Id: Ie992b925fae0effd4e00682a911ad004ac3fc033
2019-05-10 17:23:49 +08: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
Fan Zhang
f57d1108df Merge "Clean up homepage toolbar after setting transparent navbar." into qt-dev
am: 30a9392b21

Change-Id: I59579f73e7bf75c646989a889dea1b05cf738b6f
2019-05-10 01:56:23 -07:00
TreeHugger Robot
f6a7ecef0f Merge "Import translations. DO NOT MERGE" 2019-05-10 08:47:18 +00: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
Xin Li
18c2c78119 [automerger skipped] Merge "DO NOT MERGE - Merge Pie Bonito/Sargo into master." am: d5ce2c2afc -s ours am: 601dd7f647 -s ours
am: c9b2389025 -s ours
am skip reason: subject contains skip directive

Change-Id: I1872ae0cbdff56fb3f0acd61db87927854f8f116
2019-05-10 01:40:11 -07:00
TreeHugger Robot
60252574a2 Merge "Import translations. DO NOT MERGE" into qt-dev 2019-05-10 08:38:34 +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
Beth Thibodeau
e653d51828 Merge "Make preview image not selectable" into qt-dev am: 43c09673ab
am: 3339763511

Change-Id: Ia95d498ac336b1e4736b73fa6e89e6f9c94be559
2019-05-09 22:51:30 -07:00
Kevin Chang
35890fabae Merge "Improve the Accessibility warning dialog with new design" into qt-dev 2019-05-10 05:49:59 +00:00
Xin Li
69db86bde6 Merge "[automerger skipped] DO NOT MERGE - Merge Pie Bonito/Sargo into master. am: 361819cf69 -s ours am: f0acd850fb -s ours
am: 5d382504c6 -s ours
am skip reason: subject contains skip directive

Change-Id: I041e994432297d067c5894ddd1a7db3745520c10
2019-05-09 22:23:42 -07:00
Xin Li
c9b2389025 [automerger skipped] Merge "DO NOT MERGE - Merge Pie Bonito/Sargo into master." am: d5ce2c2afc -s ours
am: 601dd7f647 -s ours
am skip reason: subject contains skip directive

Change-Id: Id18589a23f387618001ddf689fad3c3a39e00575
2019-05-09 21:49:27 -07:00
Xin Li
c2cbd1db62 [automerger skipped] DO NOT MERGE - Merge Pie Bonito/Sargo into master. am: 361819cf69 -s ours am: f0acd850fb -s ours
am: e401f808d6 -s ours
am skip reason: subject contains skip directive

Change-Id: I5edda975dd18a16597a2dd80a435c5fbe38d09ef
2019-05-09 21:35:15 -07:00
Bill Yi
993efb1707 Import translations. DO NOT MERGE
Auto-generated-cl: translation import

Bug: 64712476
Change-Id: I297c9ea9b5d9d7efb166b4d94f29e7e167e5c2b2
2019-05-09 21:16:18 -07: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
Bill Yi
90b05ce806 Import translations. DO NOT MERGE
Change-Id: Iccb7422cb3ef9f1241f341820008bcaae1075779
Auto-generated-cl: translation import
2019-05-09 20:42:37 -07:00
Yanting Yang
93752a3172 Merge "Fix mirrored arrow issue for RTL" into qt-dev am: a096b6d1f1
am: d2877f805a

Change-Id: Ida7f3c188dce06c5516ed216f5df4d8ed335ea4b
2019-05-09 20:35:48 -07:00
Zhi An Ng
fd906c9bc2 Merge "Update strings used in SAW unsupported screen" into qt-dev am: ece299f902
am: 9604713f49

Change-Id: Ic2ba3d2e49eedf6e21515a050fc88b007ede92df
2019-05-09 20:34:58 -07: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
Xin Li
601dd7f647 [automerger skipped] Merge "DO NOT MERGE - Merge Pie Bonito/Sargo into master."
am: d5ce2c2afc -s ours
am skip reason: subject contains skip directive

Change-Id: Ic4eb5c4bbd9a841279826081f8d714d8c24cbf5b
2019-05-09 19:05:15 -07:00
Raff Tsai
6f162ee6f8 Merge "Fix robolectric test error" into qt-dev am: c617fa2e87
am: 8eed7ab16b

Change-Id: I85f13ff20bb7089b5b0e6021e8b6712e74e35480
2019-05-09 18:15:07 -07:00
Beth Thibodeau
3339763511 Merge "Make preview image not selectable" into qt-dev
am: 43c09673ab

Change-Id: I0764fd89d50361b152f73fe0e9374cffaf35865a
2019-05-09 18:08:42 -07:00
Android Build Merger (Role)
5d382504c6 Merge "[automerger skipped] DO NOT MERGE - Merge Pie Bonito/Sargo into master. am: 361819cf69 -s ours am: f0acd850fb -s ours am skip reason: subject contains skip directive" into qt-dev-plus-aosp 2019-05-10 00:50:02 +00:00
Yanting Yang
d2877f805a Merge "Fix mirrored arrow issue for RTL" into qt-dev
am: a096b6d1f1

Change-Id: Ib6fe4d4302274d4c99094b424ce580ee14c6271c
2019-05-09 17:38:59 -07:00
TreeHugger Robot
30a9392b21 Merge "Clean up homepage toolbar after setting transparent navbar." into qt-dev 2019-05-10 00:27:34 +00:00