Commit Graph

52111 Commits

Author SHA1 Message Date
Adam He
0fab9b60b3 Merge "Profile select only shows with multiple profiles present." into qt-r1-dev
am: c9364bffbc

Change-Id: Id993b35b08fa052544441205c13e18a75e3d7dd1
2019-05-30 11:42:35 -07:00
Yi-Ling Chuang
a88d150d16 Merge "Load wallpaper colors in a background thread." into qt-dev am: 7b332d981d
am: d164bf2309

Change-Id: I72af119919bcae10cc152f239141fe3f84b4e527
2019-05-30 11:42:08 -07:00
TreeHugger Robot
c9364bffbc Merge "Profile select only shows with multiple profiles present." into qt-r1-dev 2019-05-30 18:32:54 +00:00
Yi-Ling Chuang
d164bf2309 Merge "Load wallpaper colors in a background thread." into qt-dev
am: 7b332d981d

Change-Id: I97aea80bd414e26a443d549fcf0cdc93e07b58db
2019-05-30 11:24:31 -07:00
Lei Yu
2fce78ba4d Merge "Update SliceView when slice is null" into qt-dev am: f32025a17d
am: e74d9b438c

Change-Id: Ia254d5178ba54f16530effe64bcb1a92736a5524
2019-05-30 11:06:52 -07:00
Lei Yu
e74d9b438c Merge "Update SliceView when slice is null" into qt-dev
am: f32025a17d

Change-Id: I3ada32a9c34ded2d1324228314272030b6f6b489
2019-05-30 11:00:45 -07:00
TreeHugger Robot
7b332d981d Merge "Load wallpaper colors in a background thread." into qt-dev 2019-05-30 17:59:54 +00:00
Lei Yu
f32025a17d Merge "Update SliceView when slice is null" into qt-dev 2019-05-30 17:38:59 +00:00
Pavel Grafov
22d76382bf Merge "Make work challenge pattern resizeable." into qt-dev am: caa3b34243
am: b49bfe3b02

Change-Id: If555499654b9cfe3af8ed404d98f24af3b4feabd
2019-05-30 09:13:34 -07:00
Pavel Grafov
b49bfe3b02 Merge "Make work challenge pattern resizeable." into qt-dev
am: caa3b34243

Change-Id: I6ec27069266c2efcea3aa6fcfb08a8298eaad00a
2019-05-30 09:06:07 -07:00
Pavel Grafov
caa3b34243 Merge "Make work challenge pattern resizeable." into qt-dev 2019-05-30 13:38:22 +00:00
Raff Tsai
cc3f5aa693 Merge "Fix IllegalArgumentException in AudioHelper" into qt-dev am: fde0bee473
am: 7d0518bdfa

Change-Id: I3cc41c17d4a14c8dba06afe0c62a16efa9cd4c93
2019-05-30 03:05:11 -07:00
Raff Tsai
7d0518bdfa Merge "Fix IllegalArgumentException in AudioHelper" into qt-dev
am: fde0bee473

Change-Id: I979bf482e49c1961b68c9d1f29f2fd4a7d53368c
2019-05-30 02:57:00 -07:00
TreeHugger Robot
fde0bee473 Merge "Fix IllegalArgumentException in AudioHelper" into qt-dev 2019-05-30 09:39:33 +00:00
Raff Tsai
1a2b34b625 Fix IllegalArgumentException in AudioHelper
Audio streams for phone calls in BT device (STREAM_VOICE_CALL) is not
supported in AudioManager.getStreamMinVolume(), fallback to use
STREAM_VOICE_CALL

Fixes: 133812547
Test: make RunSettingsRoboTests
Change-Id: I8e330f60bae2a7cf9cd0cf7288076b8320ccc504
2019-05-30 16:18:37 +08:00
Sunny Shao
ab5418b266 Merge "Fix the crash while tapping "app data usage" as second user" into qt-dev am: 3d16fc9519
am: 9c4fb7ea1d

Change-Id: I9c65c852e6fc21dc1c539f4490588d7508f02899
2019-05-30 00:04:16 -07:00
Lucas Dupin
991e1bb8fc Merge "Add setting to bypass lock screen" into qt-r1-dev
am: 0783505433

Change-Id: I60ce4f2746135e480c714e6a4eaf6e5f56e04b41
2019-05-30 00:02:04 -07:00
Sunny Shao
9c4fb7ea1d Merge "Fix the crash while tapping "app data usage" as second user" into qt-dev
am: 3d16fc9519

Change-Id: I9bd04562a2d86e80c5401434eef5c45baaa6be87
2019-05-30 00:00:22 -07:00
Lucas Dupin
0783505433 Merge "Add setting to bypass lock screen" into qt-r1-dev 2019-05-30 06:50:17 +00:00
TreeHugger Robot
3d16fc9519 Merge "Fix the crash while tapping "app data usage" as second user" into qt-dev 2019-05-30 06:37:12 +00:00
Raff Tsai
c68ac63585 [automerger skipped] Merge "Do not allow draw on top for App notification settings" into oc-dev am: 811229a2fd am: fd058ab872 -s ours am: 3fb5933880 -s ours am: 08672ec74e -s ours am: dd7de36bbc -s ours
am: 079ed79164 -s ours
am skip reason: change_id Ib7b878a23b4a99171c58b5de992fb87feca8a28a with SHA1 fe86a2a51f is in history

Change-Id: I8f4cb70c59e1b348d4d5d1d0a1cd45861da7022e
2019-05-29 18:54:31 -07:00
Raff Tsai
079ed79164 [automerger skipped] Merge "Do not allow draw on top for App notification settings" into oc-dev am: 811229a2fd am: fd058ab872 -s ours am: 3fb5933880 -s ours am: 08672ec74e -s ours
am: dd7de36bbc -s ours
am skip reason: change_id Ib7b878a23b4a99171c58b5de992fb87feca8a28a with SHA1 fe86a2a51f is in history

Change-Id: Ifac0cbe2dfe1b76012bf0d7a182f4eeca69a0e06
2019-05-29 18:49:31 -07:00
Raff Tsai
a046c5cc68 [automerger skipped] Merge "Do not allow draw on top for App notification settings" into oc-mr1-dev am: b95361ab60 -s ours am: 8837b15f78 -s ours am: 93aed56281 -s ours
am: 6d531e67ac -s ours
am skip reason: change_id Ib7b878a23b4a99171c58b5de992fb87feca8a28a with SHA1 fe86a2a51f is in history

Change-Id: I7afa3704627a2c69424874940d655f44eb0fab6f
2019-05-29 18:48:27 -07:00
Raff Tsai
dd7de36bbc [automerger skipped] Merge "Do not allow draw on top for App notification settings" into oc-dev am: 811229a2fd am: fd058ab872 -s ours am: 3fb5933880 -s ours
am: 08672ec74e -s ours
am skip reason: change_id Ib7b878a23b4a99171c58b5de992fb87feca8a28a with SHA1 fe86a2a51f is in history

Change-Id: I1f06a8e5c931e789518ea1a751a93ecfc73a9090
2019-05-29 18:44:27 -07:00
Raff Tsai
6d531e67ac [automerger skipped] Merge "Do not allow draw on top for App notification settings" into oc-mr1-dev am: b95361ab60 -s ours am: 8837b15f78 -s ours
am: 93aed56281 -s ours
am skip reason: change_id Ib7b878a23b4a99171c58b5de992fb87feca8a28a with SHA1 fe86a2a51f is in history

Change-Id: I4f9a572f60d6233d55a3ef973c34c85b33700fdd
2019-05-29 18:40:47 -07:00
Raff Tsai
08672ec74e [automerger skipped] Merge "Do not allow draw on top for App notification settings" into oc-dev am: 811229a2fd am: fd058ab872 -s ours
am: 3fb5933880 -s ours
am skip reason: change_id Ib7b878a23b4a99171c58b5de992fb87feca8a28a with SHA1 9fa8329b02 is in history

Change-Id: I68b1c3e845c9f8cff305583b6cd19869e36cc027
2019-05-29 18:40:29 -07:00
Raff Tsai
3fb5933880 [automerger skipped] Merge "Do not allow draw on top for App notification settings" into oc-dev am: 811229a2fd
am: fd058ab872 -s ours
am skip reason: change_id Ib7b878a23b4a99171c58b5de992fb87feca8a28a with SHA1 e4800786cf is in history

Change-Id: I7fbd29f4d72fda672e986f12d17e37bee1b89e4b
2019-05-29 18:35:24 -07:00
Raff Tsai
93aed56281 [automerger skipped] Merge "Do not allow draw on top for App notification settings" into oc-mr1-dev am: b95361ab60 -s ours
am: 8837b15f78 -s ours
am skip reason: change_id Ib7b878a23b4a99171c58b5de992fb87feca8a28a with SHA1 fe86a2a51f is in history

Change-Id: Iaee4509328c45e5405edc1bae475d2e1cf5f4ba7
2019-05-29 18:33:23 -07:00
Raff Tsai
fd058ab872 Merge "Do not allow draw on top for App notification settings" into oc-dev
am: 811229a2fd

Change-Id: Ie5ed40b8f573b974850234987bacc5ae7db925a4
2019-05-29 18:30:24 -07:00
Raff Tsai
8837b15f78 [automerger skipped] Merge "Do not allow draw on top for App notification settings" into oc-mr1-dev
am: b95361ab60 -s ours
am skip reason: change_id Ib7b878a23b4a99171c58b5de992fb87feca8a28a with SHA1 9fa8329b02 is in history

Change-Id: I66e6f4f24bd7349db363f28f0462d16825e544c8
2019-05-29 18:28:27 -07:00
TreeHugger Robot
811229a2fd Merge "Do not allow draw on top for App notification settings" into oc-dev 2019-05-30 01:14:19 +00:00
TreeHugger Robot
b95361ab60 Merge "Do not allow draw on top for App notification settings" into oc-mr1-dev 2019-05-30 01:11:01 +00:00
Raff Tsai
23c6ead2c9 [automerger skipped] Merge "Do not allow draw on top for App notification settings" into pi-dev am: 4d01717c14 -s ours am: d08b633e28 -s ours
am: a9d597f911 -s ours
am skip reason: change_id Ib7b878a23b4a99171c58b5de992fb87feca8a28a with SHA1 fe86a2a51f is in history

Change-Id: Ia9a84f135beb5f7e5cd4debe51920a100dcfb95b
2019-05-29 17:40:26 -07:00
Raff Tsai
a9d597f911 [automerger skipped] Merge "Do not allow draw on top for App notification settings" into pi-dev am: 4d01717c14 -s ours
am: d08b633e28 -s ours
am skip reason: change_id Ib7b878a23b4a99171c58b5de992fb87feca8a28a with SHA1 fe86a2a51f is in history

Change-Id: Ic89de10d4c3e242a5b5cc442804d26ffbbe8ed72
2019-05-29 17:31:57 -07:00
Raff Tsai
d08b633e28 [automerger skipped] Merge "Do not allow draw on top for App notification settings" into pi-dev
am: 4d01717c14 -s ours
am skip reason: change_id Ib7b878a23b4a99171c58b5de992fb87feca8a28a with SHA1 fe86a2a51f is in history

Change-Id: Ifb49814e6f18d000aafb89652ce26e5469ef0fb5
2019-05-29 17:28:49 -07:00
TreeHugger Robot
4d01717c14 Merge "Do not allow draw on top for App notification settings" into pi-dev 2019-05-30 00:15:17 +00:00
Lucas Dupin
b2aaa26f38 Add setting to bypass lock screen
Test: manual
Test: make RunSettingsRoboTests ROBOTEST_FILTER=LockscreenBypassPreferenceControllerTest
Bug: 130327302
Change-Id: I324c6e384480fa8576ba58d0bf73c1ef20484ee0
2019-05-29 15:57:32 -07:00
Sunny Shao
bddf5149e5 Fix the crash while tapping "app data usage" as second user
Second user or guest is limited some mobile network access. We need to check current user
is admin or not to decide the preferece page will be found in search or not.

Bug: 133466016
Fixes: 133466016
Test: Manual test & make RunSettingsRoboTests -j56 ROBOTEST_FILTER=com.android.settings.network

Change-Id: I48d3064a8aa28ac1f2ac699b42a999b9682b1b52
2019-05-30 06:15:11 +08:00
Adam He
83f0d24f67 Profile select only shows with multiple profiles present.
Bug: 133328247
Change-Id: Id5d03a1aa74f1789c41af37562848603a90db84f
Test: manual verification
2019-05-29 14:22:22 -07:00
Antony Sargent
72de2003e3 Merge "Switch to using an intent for eSIM erasing" into qt-dev am: f010cb4034
am: e4ede480d7

Change-Id: I94d9082b67ccab4c2f34d5be23db151a7f203372
2019-05-29 13:21:58 -07:00
Antony Sargent
e4ede480d7 Merge "Switch to using an intent for eSIM erasing" into qt-dev
am: f010cb4034

Change-Id: Ic7ab832ec9997bf50d7b9277dfbd9e50adda9517
2019-05-29 13:16:31 -07:00
Lei Yu
798b80e5ad Update SliceView when slice is null
When it is null, we should also update SliceView, so SliceView can
update to be "invisible"

Fixes: 133790296
Test: RunSettingsRoboTests
Change-Id: I239405cce8bcadacbd374ccbb24d0fcbadc04880
2019-05-29 13:11:57 -07:00
TreeHugger Robot
f010cb4034 Merge "Switch to using an intent for eSIM erasing" into qt-dev 2019-05-29 20:02:48 +00:00
Evan Laird
89c0cea838 Merge "Change title to "Alerting"" into qt-dev am: c64d41fd98
am: f7ad71aab2

Change-Id: I1cda8875095d33653ffef77ef077a3c19bd689eb
2019-05-29 12:44:14 -07:00
Evan Laird
f7ad71aab2 Merge "Change title to "Alerting"" into qt-dev
am: c64d41fd98

Change-Id: I9b45e08a54097a5e04f58439a87443902f1c28bf
2019-05-29 12:39:14 -07:00
TreeHugger Robot
c64d41fd98 Merge "Change title to "Alerting"" into qt-dev 2019-05-29 19:19:59 +00:00
Amit Mahajan
6d44aa5680 Merge "Allow renaming inactive subscriptions." into qt-dev am: d133a026cd
am: 355340fd7e

Change-Id: Id71dc4661fba528adda9ba49edfb5001da46fd57
2019-05-29 11:37:55 -07:00
Amit Mahajan
355340fd7e Merge "Allow renaming inactive subscriptions." into qt-dev
am: d133a026cd

Change-Id: Ic4d5cc450923ed422ef97761c8a16303a81268dc
2019-05-29 11:28:42 -07:00
TreeHugger Robot
d133a026cd Merge "Allow renaming inactive subscriptions." into qt-dev 2019-05-29 18:16:40 +00:00
Julia Reynolds
ea147d788d Merge "Add snooze notification setting" into qt-dev am: b8f7db90ce
am: 75034e5c20

Change-Id: Ica0a52e8c09471df96c414254fbcc90eae33f2b3
2019-05-29 10:26:19 -07:00