Kyunglyul Hyun
ea95cd39ae
Merge "Set media router group id to sync cast status" into qt-dev am: 9d33198dc2 am: 19d3dcadb9
...
am: 5e226d8afb
2019-05-27 10:46:02 -07:00
Android Build Merger (Role)
e0c0e6bc34
Merge "Merge "Fix failed test case" into qt-dev am: fb28f92f71 am: 08b3d016f4" into qt-r1-dev-plus-aosp
2019-05-27 16:52:49 +00:00
Raff Tsai
a76897a0dd
Merge "Fix failed test case" into qt-dev am: fb28f92f71
...
am: 08b3d016f4
2019-05-27 09:52:34 -07:00
Raff Tsai
fe0f6e3908
Merge "Fix failed test case" into qt-dev am: fb28f92f71
...
am: a611241c64
2019-05-27 09:52:29 -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
2019-05-27 09:52:12 -07:00
Raff Tsai
2f01133abf
Fix icon color in dark mode am: e30f61f739
...
am: ab5e959adb
2019-05-27 09:52:10 -07:00
Raff Tsai
08b3d016f4
Merge "Fix failed test case" into qt-dev
...
am: fb28f92f71
2019-05-27 09:47:32 -07:00
Raff Tsai
a611241c64
Merge "Fix failed test case" into qt-dev
...
am: fb28f92f71
2019-05-27 09:47:31 -07:00
Raff Tsai
73cda7c700
Fix icon color in dark mode
...
am: e30f61f739
2019-05-27 09:47:10 -07:00
Raff Tsai
ab5e959adb
Fix icon color in dark mode
...
am: e30f61f739
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
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
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
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
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
Arc Wang
82eee0632b
Merge changes from topic "refine ConfigureWifiSettings"
...
* changes:
Refactor NotifyOpenNetworksPreferenceControllerTest into TogglePreferenceController
Refactor UseOpenWifiPreferenceController into TogglePreferenceController
Refactor WifiWakeupPreferenceController into TogglePreferenceController
2019-05-25 14:04:35 +00:00
Bill Yi
899449e5f6
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: 0cf1a84f81 -s ours am: 3a87453b4b -s ours
...
am: 2a2c2dd9e9
2019-05-24 22:57:49 -07:00
Yi Jiang
e609ebb312
Merge "Fix unexpected grey-out in Screen attention Fix preference controller searchable issue." into qt-dev am: 79abf23f4d am: 43f82bd3c4
...
am: db3457ea42
2019-05-24 22:06:56 -07:00
Bill Yi
4c77af6314
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: 0cf1a84f81 -s ours am: 793e99ff96 -s ours
...
am: 60b0ca2c2a
2019-05-24 22:01:51 -07:00
Yi Jiang
c99e853a1b
Merge "Fix unexpected grey-out in Screen attention Fix preference controller searchable issue." into qt-dev am: 79abf23f4d am: a4b9203139
...
am: 648ded3601
2019-05-24 21:47:12 -07:00
Bill Yi
2a2c2dd9e9
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: 0cf1a84f81 -s ours
...
am: 3a87453b4b
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
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
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
2019-05-24 21:11:17 -07:00
Bill Yi
3a87453b4b
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev
...
am: 0cf1a84f81
2019-05-24 20:06:51 -07:00
Bill Yi
793e99ff96
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev
...
am: 0cf1a84f81
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
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
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
Julia Reynolds
dc753187fd
Merge "Allow the default SMS app to be blocked" into qt-dev am: aaecede217 am: f6578fc088
...
am: 9b6dd07073
2019-05-24 19:12:50 -07:00
Julia Reynolds
eff5d75249
Merge "Allow the default SMS app to be blocked" into qt-dev am: aaecede217 am: c70cdc69b5
...
am: c0b1bf6abb
2019-05-24 19:03:51 -07:00
Evan Laird
d6e5b5eef3
Merge "Simplify channel importance settings screen" into qt-dev am: 4321e038ff am: 1e3eb21b0d
...
am: e04352c32e
2019-05-24 19:03:28 -07:00
Evan Laird
623cc03e11
Merge "Simplify channel importance settings screen" into qt-dev am: 4321e038ff am: a433064df4
...
am: 22a6050035
2019-05-24 19:02:25 -07:00
Arc Wang
de950854e4
Merge "Fix Wi-Fi QR scanner crash problem" into qt-dev am: 7d7353c3b5 am: 96a7bcafb6
...
am: d7ece7edc9
2019-05-24 19:02:04 -07:00
Arc Wang
605d827ecc
Merge "Fix Wi-Fi QR scanner crash problem" into qt-dev am: 7d7353c3b5 am: f7db4e4cc6
...
am: edd3b8dbaa
2019-05-24 19:01:45 -07:00
tmfang
9323cfda2a
Merge "Fix no apps shown on app info screen" into qt-dev am: 11e4847d61 am: 81c7772d3d
...
am: 3f0d6ece74
2019-05-24 19:01:26 -07:00
Bill Yi
9790aacfde
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: 505a46f7ff -s ours am: 704789a5d5 -s ours
...
am: 5e371d6051
2019-05-24 19:01:08 -07:00
Pasty Chang
c162d94f8b
Merge "Fix fingerprint enrolling in settings show heavy theme" into qt-dev am: 57ac23b2e5 am: 20cd84ebe6
...
am: 8638c5f02b
2019-05-24 19:00:51 -07:00
tmfang
1bcf8873df
Merge "Fix no apps shown on app info screen" into qt-dev am: 11e4847d61 am: 848ead645b
...
am: ee4ca732ef
2019-05-24 19:00:28 -07:00
Arc Wang
9a349a7538
Merge "Fix Wi-Fi QR code decode fail" into qt-dev am: 27d09aeb0c am: 55f4c5eb65
...
am: f322c2a108
2019-05-24 18:59:48 -07:00
Yiwen Chen
0c36855e46
Merge "Keep consistency between sound and accessibility settings." into qt-dev am: 6843e0247a am: b11ec2c1a3
...
am: 8456a0c868
2019-05-24 18:59:28 -07:00
Beverly
3a99004085
Merge "Add ability to adjust height of VideoPreference" into qt-dev am: d5daa47be8 am: 9d80859f78
...
am: 3524aedca3
2019-05-24 18:58:43 -07:00
Mehdi Alizadeh
195b5903db
Adds string resources for gesture not supported dialog
...
Bug: 129532605
Test: Manual test to verity the strings are shown correctly
Change-Id: Ibc451170e936e7b8e1bf1c0be07be33e2ddca6a4
2019-05-24 18:38:01 -07: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
