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
Steve Elliott
491869e75e
Merge "Add entry point to global actions panel settings" into qt-dev am: 4b5d31fe67 am: 3a1573b19d
...
am: 2d54a75e9a
2019-05-24 16:52:14 -07:00
Bill Yi
6ae893f436
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: 505a46f7ff -s ours am: 3c1ce4f32d -s ours
...
am: 8ca592e6cc
2019-05-24 16:51:54 -07:00
Pasty Chang
24abada3b1
Merge "Fix fingerprint enrolling in settings show heavy theme" into qt-dev am: 57ac23b2e5 am: a9d7d4fa9a
...
am: 10c14115fc
2019-05-24 16:51:42 -07:00
Arc Wang
cc75d0e2d9
Merge "Fix Wi-Fi QR code decode fail" into qt-dev am: 27d09aeb0c am: 3e39f94880
...
am: 842b421420
2019-05-24 16:51:24 -07:00
Yiwen Chen
7ef0b0e68c
Merge "Keep consistency between sound and accessibility settings." into qt-dev am: 6843e0247a am: 7176ddc247
...
am: 2dd7a569bb
2019-05-24 16:51:09 -07:00
Beverly
289ae65a27
Merge "Add ability to adjust height of VideoPreference" into qt-dev am: d5daa47be8 am: 3f5d795953
...
am: 6cc9f36ba9
2019-05-24 16:50:57 -07: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
Steve Elliott
edf253fef6
Merge "Add entry point to global actions panel settings" into qt-dev am: 4b5d31fe67 am: d5c5c8ab9f
...
am: b136e0a5ce
2019-05-24 16:50:16 -07:00
Joshua Mccloskey
3c4c3a4783
Merge "Added different button for non SUW enrollment" into qt-r1-dev am: d9db8cb608
...
am: a26dd34be7
2019-05-24 16:43:10 -07:00
Lei Yu
5e7306963c
Merge "Hide network select in some situations" into qt-dev am: 2bdf358cd1 am: a444fd99be
...
am: d0dbb6cb07
2019-05-24 16:42:54 -07:00
Varun Shah
ad1fa75f8a
Merge "Update design for Family Link supervision enrollment dialog." into qt-dev am: 4e27d29e6d am: 8fa5f72067
...
am: f62fe1e817
2019-05-24 16:42:38 -07:00
Lei Yu
73039e0cbc
Merge "Hide network select in some situations" into qt-dev am: 2bdf358cd1 am: 52c51fd26f
...
am: b46410688f
2019-05-24 16:42:23 -07:00
Varun Shah
783985296f
Merge "Update design for Family Link supervision enrollment dialog." into qt-dev am: 4e27d29e6d am: dfdac2d9e0
...
am: b4432823ee
2019-05-24 16:42:10 -07:00
Evan Laird
a0017cc2f3
Merge "Remove gentle/alerting icons from channel settings" into qt-dev am: 535f0489c9 am: 81141a5918
...
am: 7bb5801f29
2019-05-24 16:41:53 -07:00
Evan Laird
cf0aed22e3
Merge "Remove gentle/alerting icons from channel settings" into qt-dev am: 535f0489c9 am: 2915d75658
...
am: f1c7caf747
2019-05-24 16:41:37 -07:00
Joshua Mccloskey
f5857f907f
Merge "Reduced time to 3 seconds." into qt-r1-dev am: da74cc8cc7
...
am: 0e568fbb1a
2019-05-24 16:41:23 -07:00
Joshua Mccloskey
087858b75c
Merge "Fixed accessibility size" into qt-r1-dev am: 3c58799231
...
am: 906f81dc68
2019-05-24 16:41:06 -07:00
Steve Elliott
c4a10afc91
Merge "Remove info footer in global actions panel settings" into qt-dev am: b731f4d5b9 am: 61d2a1ae90
...
am: ff20c817a1
2019-05-24 16:40:31 -07:00
Mady Mellor
e35007a7d3
Merge "App Bubble control page should always be available, even if off globally" into qt-dev am: f7f1dd37c2 am: f4845105b9
...
am: 84312783c8
2019-05-24 16:40:14 -07:00
Mady Mellor
69a9940a0b
Merge "Make sure the fragment manager is passed to BubblePreferenceController" into qt-dev am: 0b37ea8b6d am: 179e585d36
...
am: e61cba9679
2019-05-24 16:39:55 -07:00
tmfang
2de8bf3cd3
Merge "Fix overlapping problem on wifi detail screen" into qt-dev am: f59844570e am: b50bdf2c13
...
am: 7b38f84b34
2019-05-24 16:39:36 -07:00
