Commit Graph

18119 Commits

Author SHA1 Message Date
Bill Yi
23e86df342 Import translations. DO NOT MERGE
Auto-generated-cl: translation import

Bug: 64712476
Change-Id: Iac730b3d5c81a72cd072a25c203e67035fae3cf6
2019-06-18 06:25:01 -07:00
Andrew Sapperstein
5022730330 Merge "Add string for module license." into qt-dev am: 05ee8ba830
am: 935eac5c7f

Change-Id: I4366da3dc3205c78eae265ae24354a8a07e019bf
2019-06-17 19:59:31 -07:00
Andrew Sapperstein
e6f8d61135 Merge "Add string for module license." into qt-dev
am: 05ee8ba830

Change-Id: I92e73c1774cc32bfc9cfbb3f6ce9470e9410871a
2019-06-17 19:45:27 -07:00
Andrew Sapperstein
935eac5c7f Merge "Add string for module license." into qt-dev
am: 05ee8ba830

Change-Id: I186442a7015dc0fa60a9eadbb9a40b8c4dfdfb83
2019-06-17 19:45:26 -07:00
TreeHugger Robot
05ee8ba830 Merge "Add string for module license." into qt-dev 2019-06-18 02:27:09 +00:00
tmfang
dcfde9c65d Merge "Get rid of "Assistant" from apps summary" into qt-dev am: a0ed4291dc
am: aa36567d4a

Change-Id: I9131887e90314e41bb7f431dd05675eee513486e
2019-06-17 16:47:32 -07:00
tmfang
aa36567d4a Merge "Get rid of "Assistant" from apps summary" into qt-dev
am: a0ed4291dc

Change-Id: Ia0f9ef06ff90d8b355cceeb6302763119d8d29f0
2019-06-17 16:35:20 -07:00
TreeHugger Robot
99808b4824 Merge "Import translations. DO NOT MERGE" into qt-dev 2019-06-17 23:35:01 +00:00
tmfang
d13fb40c4c Merge "Get rid of "Assistant" from apps summary" into qt-dev
am: a0ed4291dc

Change-Id: I35bbd8e9f3000160c077f630511993198ab4b321
2019-06-17 16:34:20 -07:00
Andrew Sapperstein
25efb623eb Add string for module license.
Bug: 135183006
Test: is string addition
Change-Id: I6764331d4ef33242b0bef913f32a62799df173c3
2019-06-17 16:28:21 -07:00
TreeHugger Robot
a0ed4291dc Merge "Get rid of "Assistant" from apps summary" into qt-dev 2019-06-17 23:05:51 +00:00
Bill Yi
cbd3b1121b Import translations. DO NOT MERGE
Auto-generated-cl: translation import

Bug: 135215049
Change-Id: I48aaceea6d191bf7af302ad0365505fe96c2e186
2019-06-17 22:15:58 +00:00
Ivan Podogov
aa813f5618 Merge "Add "Your work policy info" entry in Privacy settings" into qt-dev am: 9a1c75c57a
am: 8573d27d31

Change-Id: Id273f48d67715e3dfdea60873a20c5ae7a7adefc
2019-06-17 05:56:12 -07:00
Ivan Podogov
8573d27d31 Merge "Add "Your work policy info" entry in Privacy settings" into qt-dev
am: 9a1c75c57a

Change-Id: Ib61dae6c30e90500aaec381a6eb5f7f7a82bc610
2019-06-17 05:49:13 -07:00
Ivan Podogov
72bb3cc1f6 Merge "Add "Your work policy info" entry in Privacy settings" into qt-dev
am: 9a1c75c57a

Change-Id: Idf96f32733b5a3aedab325cbeba4b67c1d20ce24
2019-06-17 05:49:13 -07:00
Ivan Podogov
9a1c75c57a Merge "Add "Your work policy info" entry in Privacy settings" into qt-dev 2019-06-17 12:39:10 +00:00
tmfang
720e92f62e Get rid of "Assistant" from apps summary
Since "Notification Assistant" is no longer in Q,
we should remove the relevant name in summary.

Test: Rebuild
Fixes: 134180282
Change-Id: I0f41955769ec020d2dd7fbbc8424c95f1b5a32d9
2019-06-17 18:10:06 +08:00
Kevin Chyn
031affb92b Merge "Update string for work profile face unlock" into qt-r1-dev
am: 5d8cd009fa

Change-Id: I5f5cd08614bccf299ae153cf199bb9f466c4673b
2019-06-14 18:13:03 -07:00
Kevin Chyn
5d8cd009fa Merge "Update string for work profile face unlock" into qt-r1-dev 2019-06-15 00:49:36 +00:00
Mehdi Alizadeh
d8220f8a46 Show a dialog with a slider to set the back gesture's sensitivity am: 7d43125964
am: 2fbd41a326

Change-Id: Iafbfb63497ff9b207bae3695ef1f660292e89804
2019-06-14 17:20:45 -07:00
Mehdi Alizadeh
2fbd41a326 Show a dialog with a slider to set the back gesture's sensitivity
am: 7d43125964

Change-Id: I64cf3b8725efb8f8377e4f9dac545743066b2cbb
2019-06-14 17:11:54 -07:00
Mehdi Alizadeh
d8818a5a21 Show a dialog with a slider to set the back gesture's sensitivity
am: 7d43125964

Change-Id: I8db63be340f8cf465599ad76ea52f8b2453de3c0
2019-06-14 17:09:54 -07:00
Mehdi Alizadeh
7d43125964 Show a dialog with a slider to set the back gesture's sensitivity
Bug: 131447780
Test: Manual test on device
Test: make RunSettingsRoboTests ROBOTEST_FILTER=RadioButtonPreferenceWithExtraWidgetTest
Test: make RunSettingsRoboTests ROBOTEST_FILTER=SystemNavigationGestureSettingsTest

Change-Id: I9fcd1a50c77689118857326de0cf8082e835b491
2019-06-14 23:40:11 +00:00
Yi Jiang
7810fcc70c Merge "Move the permission warning message to corresponding layout file." into qt-r1-dev
am: 575bdfcaad

Change-Id: I2955a9368fc769c6778f5773ef5d802287c34688
2019-06-14 15:36:12 -07:00
Yi Jiang
575bdfcaad Merge "Move the permission warning message to corresponding layout file." into qt-r1-dev 2019-06-14 22:14:13 +00:00
Kevin Chyn
2d586f18f8 Update string for work profile face unlock
Fixes: 134053456

Test: With work profile and fully managed device, strings are correct
Change-Id: I358b94acfa0626083fdc422b6333765dcc2bc158
2019-06-14 12:56:59 -07:00
Yi Jiang
336b0c23c5 Move the permission warning message to corresponding layout file.
Bug: 129284701
Test: Manually verified
Test: atest AdaptiveSleepPermissionPreferenceController

Change-Id: Ic31bdb37f751288ae6dcd1253d56806c767e2e47
2019-06-14 12:11:49 -07:00
Ivan Podogov
75a10d1fd2 Add "Your work policy info" entry in Privacy settings
Bug: 132904820
Test: manual
Change-Id: Id706d450c3ad6a6a8c1e402d39d18e048cdb6519
2019-06-14 13:07:21 +01:00
Yiwei Zhang
b269177089 Merge "Game Driver: Allow user to apply prerelease driver for all apps" into qt-dev am: 4af74dd86d
am: 16eef18cb8

Change-Id: Ie04066c4156f8a45c01f7be2784fde725d50cf56
2019-06-13 18:20:34 -07:00
Yiwei Zhang
8bde8b44f5 Merge "Game Driver: Allow user to apply prerelease driver for all apps" into qt-dev
am: 4af74dd86d

Change-Id: Ifef443ad30d40b6f5e2f06025da85f9d572d358d
2019-06-13 18:16:44 -07:00
Yiwei Zhang
16eef18cb8 Merge "Game Driver: Allow user to apply prerelease driver for all apps" into qt-dev
am: 4af74dd86d

Change-Id: I02f895a2c7b5a66dc71db0a60356d854c9123a82
2019-06-13 16:50:38 -07:00
TreeHugger Robot
4af74dd86d Merge "Game Driver: Allow user to apply prerelease driver for all apps" into qt-dev 2019-06-13 23:44:36 +00:00
Yiwei Zhang
687906f2f9 Game Driver: Allow user to apply prerelease driver for all apps
Currently the global opt-in is only available to Game Driver. This change has
added an option to let developers to opt-in all apps to use prerelease driver.
GameDriverEnableForAllAppsPreferenceController is then refactored from
SwitchPreference to ListPreference to support this change.

Bug: 134881329
Test: make RunSettingsRoboTests ROBOTEST_FILTER=GameDriver
Change-Id: I6dcb3a22a4033a576605d42aa80b09db088d4aa2
2019-06-13 12:21:49 -07:00
Yiwei Zhang
9dd8ac1751 Merge "Game Driver: Add UI support for prerelease Game Driver" into qt-dev am: 0de0d5be39
am: a05cb731e7

Change-Id: Ie602e1f6913968c1e9213166cf9b69021699b5f7
2019-06-13 08:52:43 -07:00
Yiwei Zhang
3b8681d8c6 Merge "Game Driver: Add UI support for prerelease Game Driver" into qt-dev
am: 0de0d5be39

Change-Id: Ib806945a955125febf2d7eb8c37e735c9e2ade0d
2019-06-13 08:46:47 -07:00
Yiwei Zhang
a05cb731e7 Merge "Game Driver: Add UI support for prerelease Game Driver" into qt-dev
am: 0de0d5be39

Change-Id: I16a67e516ff20ec1aa38aa83d11c433e82299597
2019-06-13 08:45:42 -07:00
TreeHugger Robot
0de0d5be39 Merge "Game Driver: Add UI support for prerelease Game Driver" into qt-dev 2019-06-13 15:38:54 +00:00
Kevin Yao
96a8cd4ef6 Merge "Fix typo for Accessibility permission dialog" into qt-dev am: e78e4dc6f2
am: e6ae9219ce

Change-Id: I7cca7c8fb1970861726c9fa9d0dc7db5fef8edc6
2019-06-12 21:52:03 -07:00
Kevin Yao
e6ae9219ce Merge "Fix typo for Accessibility permission dialog" into qt-dev
am: e78e4dc6f2

Change-Id: Ia3292d11926a24e9e907c71b5d85bf97a062a066
2019-06-12 21:47:04 -07:00
Kevin Yao
2bff53a21e Merge "Fix typo for Accessibility permission dialog" into qt-dev
am: e78e4dc6f2

Change-Id: I154f5f038a2944f9c1376b4baba8a4cd85b49adb
2019-06-12 21:47:04 -07:00
TreeHugger Robot
e78e4dc6f2 Merge "Fix typo for Accessibility permission dialog" into qt-dev 2019-06-13 04:30:26 +00:00
Yiwei Zhang
240760c570 Game Driver: Add UI support for prerelease Game Driver
Bug: 134881329
Test: make RunSettingsRoboTests ROBOTEST_FILTER=GameDriver
Change-Id: I9c710a5e6adff9b01c656d576f53f9b4b3360207
2019-06-12 18:09:36 -07:00
Kevin Chyn
db00ff2165 Merge changes from topic "face-bypass-move" into qt-r1-dev
am: ffcc25ba92

Change-Id: I787f5858cefad29869bcae364a0b1f1a4aa9cc4c
2019-06-12 15:04:46 -07:00
Kevin Chyn
ffcc25ba92 Merge changes from topic "face-bypass-move" into qt-r1-dev
* changes:
  Make bypass controller consistent with rest of face unlock settings
  Move lockscreen bypass setting to Settings > Security > Face unlock
2019-06-12 21:51:42 +00:00
Michael Groover
edef325b20 Merge "Remove developer option to disable device ID access restrictions" into qt-dev am: ad85d6b942
am: 628d311d0c

Change-Id: I1679817363e1f9e7d5541c8bd575194d24605edd
2019-06-12 14:33:33 -07:00
Michael Groover
628d311d0c Merge "Remove developer option to disable device ID access restrictions" into qt-dev
am: ad85d6b942

Change-Id: Ie49e2845fe5c3389b9a44803e293789971ecb485
2019-06-12 14:20:33 -07:00
Michael Groover
b31b522513 Merge "Remove developer option to disable device ID access restrictions" into qt-dev
am: ad85d6b942

Change-Id: I8884f4b01a3980bfc00e9a57ea1b8c43c27578d3
2019-06-12 14:17:03 -07:00
Michael Groover
ad85d6b942 Merge "Remove developer option to disable device ID access restrictions" into qt-dev 2019-06-12 20:31:16 +00:00
Kevin Chyn
6a4a0e7396 Move lockscreen bypass setting to Settings > Security > Face unlock
Fixes: 134700640

Test: atest FaceSettingsLockscreenBypassPreferenceControllerTest
Test: enabling/disabling setting through Settings > Security > Face unlock
      works as expected
Test: preference controller no longer seen in Settings > Display > Lock screen display

Change-Id: I54807ad92fac62398a2b9dab93dd638775a09c8d
2019-06-12 13:27:18 -07:00
Fan Zhang
2bbb1bf2e0 Merge "Update mainline module versions string." into qt-dev am: 2aa94b97c7
am: 2c9bd6707d

Change-Id: Id9bb6359eaf6ddd60237c929522418ea291412d5
2019-06-11 14:42:45 -07:00