Commit Graph

54699 Commits

Author SHA1 Message Date
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
Yi-Ling Chuang
abccbcb23b Merge "Load wallpaper colors in a background thread." into qt-dev am: 7b332d981d
am: dd7133e523

Change-Id: Ic9c0446a211db1e9de2094fe5f13d30281a2508c
2019-05-30 11:20:43 -07:00
Yi-Ling Chuang
dd7133e523 Merge "Load wallpaper colors in a background thread." into qt-dev
am: 7b332d981d

Change-Id: I36b5b699bb4e844083fc2d9b269b1cfe311a3575
2019-05-30 11:18:03 -07:00
Lei Yu
72340ab3af Merge "Update SliceView when slice is null" into qt-dev am: f32025a17d
am: e74d9b438c

Change-Id: Ifd48a04a6e574a92568b8d370fdc516d4fc7bf51
2019-05-30 11:12:49 -07:00
Lei Yu
2dd116845a Merge "Update SliceView when slice is null" into qt-dev am: f32025a17d
am: 949c937fce

Change-Id: Ied1099bc8d4781e6b804e53cb04b61614543cb9a
2019-05-30 11:10:41 -07:00
Lei Yu
949c937fce Merge "Update SliceView when slice is null" into qt-dev
am: f32025a17d

Change-Id: Ic68f9ecae701ed79e11401ec089cf02ab786c4ad
2019-05-30 11:00:47 -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
Fan Zhang
2f9c6ca6af Merge "Add interface and extend db to support storing slice uris" 2019-05-30 17:56:34 +00:00
joshmccloskey
5ef0a1d11d String update.
Test: Manual.
Bug: 133783098
Change-Id: If8ea2b6c9372a3da02b93b815f76e3143cc54dea
2019-05-30 10:51:34 -07:00
Lei Yu
f32025a17d Merge "Update SliceView when slice is null" into qt-dev 2019-05-30 17:38:59 +00:00
Pavel Grafov
111fc7dccb Merge "Make work challenge pattern resizeable." into qt-dev am: caa3b34243 am: b49bfe3b02
am: 275f036189

Change-Id: I7d0183c3996f1c484375da1cf43334f8170a39a3
2019-05-30 09:27:07 -07:00
Pavel Grafov
c9b6519fea Merge "Make work challenge pattern resizeable." into qt-dev am: caa3b34243 am: c690471080
am: 12fc1492b0

Change-Id: Ifd5e00d1cd68c84a914913c4971a75003ad4ea90
2019-05-30 09:25:14 -07:00
Pavel Grafov
275f036189 Merge "Make work challenge pattern resizeable." into qt-dev am: caa3b34243
am: b49bfe3b02

Change-Id: I6a57b3b5a924568996a5ad1e0e092d98f83ea6ff
2019-05-30 09:16:37 -07:00
Pavel Grafov
12fc1492b0 Merge "Make work challenge pattern resizeable." into qt-dev am: caa3b34243
am: c690471080

Change-Id: Icb784ada8940dffc791fc7344575e11d6c0b5ac4
2019-05-30 09:13:09 -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
c690471080 Merge "Make work challenge pattern resizeable." into qt-dev
am: caa3b34243

Change-Id: I21c4d74ee6540fc47b477bc1113121f00304a472
2019-05-30 09:06:07 -07:00
Joel Galenson
1e7c172ad5 Remove Permissions Hub.
Bug: 132292477
Test: View all related screens.
Change-Id: Ic0e890e04f210f3be3eb80c95e398a40a8062001
2019-05-30 08:30:49 -07:00
Julia Reynolds
c0c4b3a111 Fix a11y readout of notification importance buttons
Test: manual with TB
Bug: 134047401
Change-Id: Idab3426a37ed3f25c2cde47e0747ac9a31850f62
2019-05-30 10:31:40 -04:00
Pavel Grafov
caa3b34243 Merge "Make work challenge pattern resizeable." into qt-dev 2019-05-30 13:38:22 +00:00
pastychang
c80453777c Fix overlapped text in lockscreen pattern setup
1. Remove unused button to resolve overlap
2. Enlarge the scrollview area

Bug: 62101742
Test: Manual
Change-Id: I15df29be01741df1fb508f89019c905ac3e24ca2
2019-05-30 19:52:57 +08:00
Raff Tsai
9980b98e93 Merge "Fix IllegalArgumentException in AudioHelper" into qt-dev am: fde0bee473 am: 7d0518bdfa
am: 8c4c8dd1c5

Change-Id: I2284d40ec24e06c8983c6fd7f49e6e54dc9c53e3
2019-05-30 03:10:08 -07:00
Raff Tsai
c30e3ae727 Merge "Fix IllegalArgumentException in AudioHelper" into qt-dev am: fde0bee473 am: ce6c934609
am: f19cab831a

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

Change-Id: I4b9dff799239656bfee6e383f9a89ab1be94e108
2019-05-30 03:03:45 -07:00
Raff Tsai
f19cab831a Merge "Fix IllegalArgumentException in AudioHelper" into qt-dev am: fde0bee473
am: ce6c934609

Change-Id: I30e96444b838eb3026245fafd09fcc9e45bac964
2019-05-30 03:01:05 -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
Raff Tsai
ce6c934609 Merge "Fix IllegalArgumentException in AudioHelper" into qt-dev
am: fde0bee473

Change-Id: Iafe2e30e1fb3bb80c17f2ef651b41d5e8b458a38
2019-05-30 02:56:45 -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
44540b3199 Merge "Merge "Fix the crash while tapping "app data usage" as second user" into qt-dev am: 3d16fc9519 am: 0135cde020" into qt-r1-dev-plus-aosp
am: 6b8a4a96b2

Change-Id: Ib059840e7b2bd76117027b0a37e2bd54afea1c72
2019-05-30 00:15:32 -07:00
Sunny Shao
33a45255d9 Merge "Fix the crash while tapping "app data usage" as second user" into qt-dev am: 3d16fc9519 am: 9c4fb7ea1d
am: 27f5a01cef

Change-Id: I4296880c339aecf93ddaa57cafeb04815b6e40e3
2019-05-30 00:08:59 -07:00
Lucas Dupin
d5d76a95ec Merge "Add setting to bypass lock screen" into qt-r1-dev am: 0783505433
am: a44a66f52a

Change-Id: I8164b1e3e6f32896710268d481b7fec593602fd3
2019-05-30 00:06:11 -07:00
Android Build Merger (Role)
6b8a4a96b2 Merge "Merge "Fix the crash while tapping "app data usage" as second user" into qt-dev am: 3d16fc9519 am: 0135cde020" into qt-r1-dev-plus-aosp 2019-05-30 07:05:35 +00:00
Sunny Shao
85816a0676 Merge "Fix the crash while tapping "app data usage" as second user" into qt-dev am: 3d16fc9519
am: 0135cde020

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

Change-Id: I2e74ff23833524c00f7fa5730199ce15bd662959
2019-05-30 00:05:20 -07:00
Sunny Shao
0135cde020 Merge "Fix the crash while tapping "app data usage" as second user" into qt-dev
am: 3d16fc9519

Change-Id: Id2aa3c501378686d1b3a1b352b8fa15132bc396f
2019-05-30 00:00:24 -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
a44a66f52a Merge "Add setting to bypass lock screen" into qt-r1-dev
am: 0783505433

Change-Id: I533383a4e7c9ecc068c24cd55647c55487dfd5a6
2019-05-30 00:00:13 -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
Sunny Shao
d843ee85de Fixed the IllegalStateException on removing account
According the log, I found that there are a lot of DeadObjectException and gms servervice restart.
The system became unstable during this period, so add try/catch to avoid the exception of the Settings.

Fixes: 133253227
Test: make RunSettingsRoboTests -j56 ROBOTEST_FILTER=com.android.settings.accounts
      make RunSettingsRoboTests -j56 ROBOTEST_FILTER=com.android.settings.core
      make RunSettingsRoboTests -j56 ROBOTEST_FILTER=com.android.settings.dashboard

Change-Id: I8534e8f7118234f6346607415698f9f91c3e5ffb
2019-05-30 11:24:49 +08:00
Mehdi Alizadeh
be98ea25ca Increase char limit to 60 for string translation
Bug: 133862422
Test: None
Change-Id: I3fa6705a6657c5aa65e496cba2ce470fb558a45f
2019-05-29 20:22:09 -07:00
Raff Tsai
f87cc26514 Merge "[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: 917200e90f -s ours
am skip reason: change_id Ib7b878a23b4a99171c58b5de992fb87feca8a28a with SHA1 c968eacbbf is in history

Change-Id: I55adb5089e12883192978c81c53e2c4b104ebe54
2019-05-29 19:01:53 -07:00
Raff Tsai
d9815a1bec [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: c3740704f3 -s ours
am: 487e7af0f8 -s ours
am skip reason: change_id Ib7b878a23b4a99171c58b5de992fb87feca8a28a with SHA1 fe86a2a51f is in history

Change-Id: Ife8a9baf723b6cfdcb8a962aaaa405114006d73f
2019-05-29 19:00:19 -07:00
Raff Tsai
0f3ce78b1f Merge "[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: 9d5dbaf4b6 -s ours
am skip reason: change_id Ib7b878a23b4a99171c58b5de992fb87feca8a28a with SHA1 fe86a2a51f is in history

Change-Id: I069d68bb493540a410fcecc93204fdff66e7c521
2019-05-29 18:55:37 -07:00
Android Build Merger (Role)
917200e90f Merge "[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" into qt-r1-dev-plus-aosp 2019-05-30 01:55:35 +00:00
Raff Tsai
3bc902adbc [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: Idbf2372cefe12b76aeb9569fd09f54f6d6655afd
2019-05-29 18:55:21 -07:00
Raff Tsai
487e7af0f8 [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: c3740704f3 -s ours
am skip reason: change_id Ib7b878a23b4a99171c58b5de992fb87feca8a28a with SHA1 fe86a2a51f is in history

Change-Id: I8d254e69b173955f2b4c2aeee5d59268bac817e3
2019-05-29 18:55:14 -07:00
Raff Tsai
d6a20918db [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: 3e6af30847 -s ours
am: 63d79583da -s ours
am skip reason: change_id Ib7b878a23b4a99171c58b5de992fb87feca8a28a with SHA1 fe86a2a51f is in history

Change-Id: I0d3154c39f5b7b3b91bb46c0c5da148cf1323d2b
2019-05-29 18:54:50 -07:00
Raff Tsai
c3740704f3 [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: If8f23bb912f13f355b807358e28f5d74c0bfa066
2019-05-29 18:50:30 -07:00