Commit Graph

52752 Commits

Author SHA1 Message Date
Raff Tsai
a76897a0dd Merge "Fix failed test case" into qt-dev am: fb28f92f71
am: 08b3d016f4

Change-Id: I15f5a98a98b8bccf77b74c10c75d33f0e6c49dc3
2019-05-27 09:52:34 -07:00
Android Build Merger (Role)
37584afeb8 Merge "Fix icon color in dark mode am: e30f61f739 am: 73cda7c700" into qt-r1-dev-plus-aosp 2019-05-27 16:52:23 +00:00
Raff Tsai
7e67b5f930 Fix icon color in dark mode am: e30f61f739
am: 73cda7c700

Change-Id: Ia12de63332def93baa46cfad311167db28c3d2fa
2019-05-27 09:52:12 -07:00
Raff Tsai
2f01133abf Fix icon color in dark mode am: e30f61f739
am: ab5e959adb

Change-Id: I11a9b71a452f8d6611bb9c9a48427d1437612239
2019-05-27 09:52:10 -07:00
Raff Tsai
08b3d016f4 Merge "Fix failed test case" into qt-dev
am: fb28f92f71

Change-Id: I4649655d6a97e6a7e4d4641154319628905498ae
2019-05-27 09:47:32 -07:00
Raff Tsai
73cda7c700 Fix icon color in dark mode
am: e30f61f739

Change-Id: I04179fd328a393e8bd5ff891bd86665a8f37cbbb
2019-05-27 09:47:10 -07:00
Raff Tsai
ab5e959adb Fix icon color in dark mode
am: e30f61f739

Change-Id: I04b540f4ed116601ea72a82dbd79559575e23752
2019-05-27 09:47:10 -07:00
TreeHugger Robot
fb28f92f71 Merge "Fix failed test case" into qt-dev 2019-05-27 16:41:13 +00:00
Raff Tsai
e30f61f739 Fix icon color in dark mode
Fixes: 133651524
Test: visual
Change-Id: Ic6f05dc491ad1d49b5cc81e294bf91271420d8e2
2019-05-27 18:32:35 +08:00
Android Build Merger (Role)
6478744a58 Merge "Merge "Set media router group id to sync cast status" into qt-dev am: 9d33198dc2 am: e6484aba66" into qt-r1-dev-plus-aosp 2019-05-27 02:54:37 +00:00
Kyunglyul Hyun
5e226d8afb Merge "Set media router group id to sync cast status" into qt-dev am: 9d33198dc2
am: 19d3dcadb9

Change-Id: Id11441df44da989eeb93d21d0eda3640ebe9f380
2019-05-26 19:54:23 -07:00
Kyunglyul Hyun
aa2e76a3af Merge "Set media router group id to sync cast status" into qt-dev am: 9d33198dc2
am: e6484aba66

Change-Id: Id0879aa9d5239b6348ad1c805646ba78ef6fcaef
2019-05-26 19:54:23 -07:00
Kyunglyul Hyun
e6484aba66 Merge "Set media router group id to sync cast status" into qt-dev
am: 9d33198dc2

Change-Id: Ic6457eec89200dc5dfdde5d3e3edba5c307f77e2
2019-05-26 19:49:29 -07:00
Kyunglyul Hyun
19d3dcadb9 Merge "Set media router group id to sync cast status" into qt-dev
am: 9d33198dc2

Change-Id: Ia4802bde8e253c542d4aa3b7c59b9771935fc460
2019-05-26 19:49:23 -07:00
Kyunglyul Hyun
9d33198dc2 Merge "Set media router group id to sync cast status" into qt-dev 2019-05-27 02:35:27 +00:00
Raff Tsai
83df51ebf3 Fix failed test case
Fixes: 133629032
Test: make RunSettingsRoboTests ROBOTEST_FILTER="com.android.settings.core"
Change-Id: I4baf0582a528e3601ca132c15e5078bc0159a352
2019-05-27 09:33:02 +08:00
Kyunglyul Hyun
be3b50a8f1 Set media router group id to sync cast status
Using media router group id, Settings can sync cast status with
Settings.
If Settings begins/stops cast (mirrorring), CastTile can know that and
Settings also knows when CastTile begins cast.

Please refer ag/7669852 to how router group id can be used to
synchronize cast status.

Bug: 112826114
Bug: 131385091
Bug: 130345243

Test: Manually tested after applying ag/7704172 and this.
Change-Id: I78c3c6163e1352b3a8d0801890064369a861fb8a
2019-05-26 23:05:35 +09:00
Bill Yi
2a2c2dd9e9 [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: 0cf1a84f81 -s ours
am: 3a87453b4b -s ours
am skip reason: subject contains skip directive

Change-Id: Ic86fa0b3e71419f3d1a035635450642540f2a458
2019-05-24 21:32:15 -07:00
Yi Jiang
db3457ea42 Merge "Fix unexpected grey-out in Screen attention Fix preference controller searchable issue." into qt-dev am: 79abf23f4d
am: 43f82bd3c4

Change-Id: Ifdecffdb5d3a4dcddc3675c18f316ddf0ebb0503
2019-05-24 21:22:23 -07:00
Bill Yi
60b0ca2c2a [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: 0cf1a84f81 -s ours
am: 793e99ff96 -s ours
am skip reason: subject contains skip directive

Change-Id: I8d283321c5f7f119d5b99d3658929d80fc327e01
2019-05-24 21:15:08 -07:00
Yi Jiang
648ded3601 Merge "Fix unexpected grey-out in Screen attention Fix preference controller searchable issue." into qt-dev am: 79abf23f4d
am: a4b9203139

Change-Id: I012fb4827d7fa6b4ed25ec76a520fddb58b8b5ee
2019-05-24 21:11:17 -07:00
Bill Yi
3a87453b4b [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev
am: 0cf1a84f81 -s ours
am skip reason: subject contains skip directive

Change-Id: Ibf83f1c2380b30459ca32db80d051e10bc14c2ec
2019-05-24 20:06:51 -07:00
Bill Yi
793e99ff96 [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev
am: 0cf1a84f81 -s ours
am skip reason: subject contains skip directive

Change-Id: If4c1028ee512d03e28a556dc70dba02d41543c1c
2019-05-24 20:06:19 -07:00
Yi Jiang
43f82bd3c4 Merge "Fix unexpected grey-out in Screen attention Fix preference controller searchable issue." into qt-dev
am: 79abf23f4d

Change-Id: I86d9e64d6d7afeb56e588c70068d1192bd52a1e2
2019-05-24 20:04:30 -07:00
Yi Jiang
a4b9203139 Merge "Fix unexpected grey-out in Screen attention Fix preference controller searchable issue." into qt-dev
am: 79abf23f4d

Change-Id: Iee258b27bed5dc6a7338ae64d52567e9bf759b0b
2019-05-24 20:04:23 -07:00
TreeHugger Robot
0cf1a84f81 Merge "Import translations. DO NOT MERGE" into qt-dev 2019-05-25 02:39:20 +00:00
Yi Jiang
79abf23f4d Merge "Fix unexpected grey-out in Screen attention Fix preference controller searchable issue." into qt-dev 2019-05-25 01:20:28 +00:00
Yi Jiang
6da0447068 Fix unexpected grey-out in Screen attention
Fix preference controller searchable issue.

Bug: 132821023
Bug: 133255690
Test: atest AdaptiveSleepPreferenceControllerTest
Change-Id: I686ed827fbe572c9d8bcde2d8a8e00f2dcb5a6a8
2019-05-24 16:50:18 -07:00
Julia Reynolds
9b6dd07073 Merge "Allow the default SMS app to be blocked" into qt-dev am: aaecede217
am: f6578fc088

Change-Id: I9cae221ff76a5e41d0bbd1843ebd474793069e37
2019-05-24 16:25:26 -07:00
Bill Yi
5100cabd86 Import translations. DO NOT MERGE
Auto-generated-cl: translation import

Bug: 64712476
Change-Id: I85ca3c33f3b5db38609634d9a711db9612584567
2019-05-24 14:40:18 -07:00
Julia Reynolds
c0b1bf6abb Merge "Allow the default SMS app to be blocked" into qt-dev am: aaecede217
am: c70cdc69b5

Change-Id: I119e6b4b56cdbd8b9cd15cc970f103bf20a6e930
2019-05-24 11:50:29 -07:00
Evan Laird
e04352c32e Merge "Simplify channel importance settings screen" into qt-dev am: 4321e038ff
am: 1e3eb21b0d

Change-Id: Ie3ecd4a9675d009efe86f9f282eb4fe05f3c8717
2019-05-24 11:28:07 -07:00
Evan Laird
22a6050035 Merge "Simplify channel importance settings screen" into qt-dev am: 4321e038ff
am: a433064df4

Change-Id: I547d4346aea58b8a2fa1e9a3470ac4877f73ed68
2019-05-24 11:23:24 -07:00
Julia Reynolds
f6578fc088 Merge "Allow the default SMS app to be blocked" into qt-dev
am: aaecede217

Change-Id: I0d29112d331f9bb4fb59ad40931c77701982e915
2019-05-24 10:16:01 -07:00
Julia Reynolds
c70cdc69b5 Merge "Allow the default SMS app to be blocked" into qt-dev
am: aaecede217

Change-Id: I0169d6fece78c05431a691d6b94033ed1da97978
2019-05-24 10:13:57 -07:00
Evan Laird
a433064df4 Merge "Simplify channel importance settings screen" into qt-dev
am: 4321e038ff

Change-Id: I9346139116adef62b83e1e85030c8371fa936375
2019-05-24 10:13:47 -07:00
Evan Laird
1e3eb21b0d Merge "Simplify channel importance settings screen" into qt-dev
am: 4321e038ff

Change-Id: I016269c4608af821497f262223cd7f0f62f8c5f5
2019-05-24 10:11:04 -07:00
Julia Reynolds
aaecede217 Merge "Allow the default SMS app to be blocked" into qt-dev 2019-05-24 17:00:12 +00:00
TreeHugger Robot
4321e038ff Merge "Simplify channel importance settings screen" into qt-dev 2019-05-24 16:36:49 +00:00
Arc Wang
d7ece7edc9 Merge "Fix Wi-Fi QR scanner crash problem" into qt-dev am: 7d7353c3b5
am: 96a7bcafb6

Change-Id: I082c8b8197adb02f7fa857df06ebf35ba38b97cc
2019-05-24 08:04:36 -07:00
Arc Wang
edd3b8dbaa Merge "Fix Wi-Fi QR scanner crash problem" into qt-dev am: 7d7353c3b5
am: f7db4e4cc6

Change-Id: I639d27195b04d2ac4cf97f338d8802b24a45b474
2019-05-24 07:57:32 -07:00
Arc Wang
96a7bcafb6 Merge "Fix Wi-Fi QR scanner crash problem" into qt-dev
am: 7d7353c3b5

Change-Id: Ia366acf4c94763fa4836fe2d98c7b4e0abc86ac8
2019-05-24 07:52:31 -07:00
Arc Wang
f7db4e4cc6 Merge "Fix Wi-Fi QR scanner crash problem" into qt-dev
am: 7d7353c3b5

Change-Id: Ib254eb2406ed0e90fc5a278755f9c087bfdde493
2019-05-24 07:52:08 -07:00
Arc Wang
7d7353c3b5 Merge "Fix Wi-Fi QR scanner crash problem" into qt-dev 2019-05-24 14:36:44 +00:00
Evan Laird
472e19eae4 Simplify channel importance settings screen
Back to bell icons, and removed the flavor text

Test: visual
Bug: 132971502
Change-Id: I55ce6dd07404aed2ceb5423796b733a70c3bfa13
2019-05-24 09:08:14 -04:00
tmfang
3f0d6ece74 Merge "Fix no apps shown on app info screen" into qt-dev am: 11e4847d61
am: 81c7772d3d

Change-Id: Ifa561bf7f344e6c42f441222b49ed05213626123
2019-05-24 03:25:45 -07:00
Bill Yi
5e371d6051 [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: 505a46f7ff -s ours
am: 704789a5d5 -s ours
am skip reason: subject contains skip directive

Change-Id: I04af1fa805919d6b97c47feb49f0ba8e356e01ae
2019-05-24 02:50:54 -07:00
Pasty Chang
8638c5f02b Merge "Fix fingerprint enrolling in settings show heavy theme" into qt-dev am: 57ac23b2e5
am: 20cd84ebe6

Change-Id: I9568ec5483e9b5ffe4f6f9b7c64c13c164ca2247
2019-05-24 02:13:54 -07:00
tmfang
ee4ca732ef Merge "Fix no apps shown on app info screen" into qt-dev am: 11e4847d61
am: 848ead645b

Change-Id: If3b73c2f521282f83f6e9aa53fcf671bb9bedadb
2019-05-24 01:17:19 -07:00
tmfang
81c7772d3d Merge "Fix no apps shown on app info screen" into qt-dev
am: 11e4847d61

Change-Id: I736f60c5bd62114ab9a4bdbf5ff7a041a046940f
2019-05-24 01:11:13 -07:00