tmfang
c0b3856dbe
Merge "Merge "Get rid of "Assistant" from apps summary" into qt-dev am: a0ed4291dc am: d13fb40c4c" into qt-r1-dev-plus-aosp
...
am: 50bb07c812
2019-06-17 17:20:45 -07:00
tmfang
da9a5fefb4
Merge "Get rid of "Assistant" from apps summary" into qt-dev am: a0ed4291dc am: aa36567d4a
...
am: dcfde9c65d
2019-06-17 16:55:53 -07:00
Android Build Merger (Role)
50bb07c812
Merge "Merge "Get rid of "Assistant" from apps summary" into qt-dev am: a0ed4291dc am: d13fb40c4c" into qt-r1-dev-plus-aosp
2019-06-17 23:48:22 +00:00
tmfang
dcfde9c65d
Merge "Get rid of "Assistant" from apps summary" into qt-dev am: a0ed4291dc
...
am: aa36567d4a
2019-06-17 16:47:32 -07:00
tmfang
3cc51bc280
Merge "Get rid of "Assistant" from apps summary" into qt-dev am: a0ed4291dc
...
am: d13fb40c4c
2019-06-17 16:47:32 -07:00
tmfang
aa36567d4a
Merge "Get rid of "Assistant" from apps summary" into qt-dev
...
am: a0ed4291dc
2019-06-17 16:35:20 -07:00
tmfang
d13fb40c4c
Merge "Get rid of "Assistant" from apps summary" into qt-dev
...
am: a0ed4291dc
2019-06-17 16:34:20 -07:00
TreeHugger Robot
a0ed4291dc
Merge "Get rid of "Assistant" from apps summary" into qt-dev
2019-06-17 23:05:51 +00:00
Ivan Podogov
f81813006e
Merge "Merge "Add "Your work policy info" entry in Privacy settings" into qt-dev am: 9a1c75c57a am: 72bb3cc1f6" into qt-r1-dev-plus-aosp
...
am: ada83062de
2019-06-17 06:04:04 -07:00
Ivan Podogov
e142b7ee3f
Merge "Add "Your work policy info" entry in Privacy settings" into qt-dev am: 9a1c75c57a am: 8573d27d31
...
am: aa813f5618
2019-06-17 06:03:09 -07:00
Android Build Merger (Role)
ada83062de
Merge "Merge "Add "Your work policy info" entry in Privacy settings" into qt-dev am: 9a1c75c57a am: 72bb3cc1f6" into qt-r1-dev-plus-aosp
2019-06-17 12:56:46 +00:00
Ivan Podogov
aa813f5618
Merge "Add "Your work policy info" entry in Privacy settings" into qt-dev am: 9a1c75c57a
...
am: 8573d27d31
2019-06-17 05:56:12 -07:00
Ivan Podogov
c30147fbeb
Merge "Add "Your work policy info" entry in Privacy settings" into qt-dev am: 9a1c75c57a
...
am: 72bb3cc1f6
2019-06-17 05:56:10 -07:00
Ivan Podogov
8573d27d31
Merge "Add "Your work policy info" entry in Privacy settings" into qt-dev
...
am: 9a1c75c57a
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
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
ad363b091f
Merge "Update string for work profile face unlock" into qt-r1-dev am: 5d8cd009fa
...
am: 031affb92b
2019-06-14 18:36:41 -07:00
Kevin Chyn
031affb92b
Merge "Update string for work profile face unlock" into qt-r1-dev
...
am: 5d8cd009fa
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
1213ce063f
Show a dialog with a slider to set the back gesture's sensitivity am: 7d43125964 am: d8818a5a21
...
am: 123325c668
2019-06-14 17:37:20 -07:00
Mehdi Alizadeh
896b2c6e0e
Show a dialog with a slider to set the back gesture's sensitivity am: 7d43125964 am: 2fbd41a326
...
am: d8220f8a46
2019-06-14 17:35:34 -07:00
Mehdi Alizadeh
123325c668
Show a dialog with a slider to set the back gesture's sensitivity am: 7d43125964
...
am: d8818a5a21
2019-06-14 17:23:12 -07:00
Mehdi Alizadeh
d8220f8a46
Show a dialog with a slider to set the back gesture's sensitivity am: 7d43125964
...
am: 2fbd41a326
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
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
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
Lei Yu
97aed32c29
Merge "Handle null intent in WifiCallingPreferenceController" into qt-dev am: b4d94a8ccc am: 192367bef2
...
am: feee521179
2019-06-14 16:22:58 -07:00
Lei Yu
3d1f180b1c
Merge "Handle null intent in WifiCallingPreferenceController" into qt-dev am: b4d94a8ccc am: ab2a2b3d3f
...
am: daed3366ef
2019-06-14 16:17:37 -07:00
Lei Yu
feee521179
Merge "Handle null intent in WifiCallingPreferenceController" into qt-dev am: b4d94a8ccc
...
am: 192367bef2
2019-06-14 16:06:52 -07:00
Lei Yu
daed3366ef
Merge "Handle null intent in WifiCallingPreferenceController" into qt-dev am: b4d94a8ccc
...
am: ab2a2b3d3f
2019-06-14 16:06:03 -07:00
Yi Jiang
5bb10c46d2
Merge "Move the permission warning message to corresponding layout file." into qt-r1-dev am: 575bdfcaad
...
am: 7810fcc70c
2019-06-14 16:03:20 -07:00
Lei Yu
ab2a2b3d3f
Merge "Handle null intent in WifiCallingPreferenceController" into qt-dev
...
am: b4d94a8ccc
2019-06-14 15:59:10 -07:00
Lei Yu
192367bef2
Merge "Handle null intent in WifiCallingPreferenceController" into qt-dev
...
am: b4d94a8ccc
2019-06-14 15:56:10 -07:00
Lei Yu
b4d94a8ccc
Merge "Handle null intent in WifiCallingPreferenceController" into qt-dev
2019-06-14 22:38:59 +00:00
Yi Jiang
7810fcc70c
Merge "Move the permission warning message to corresponding layout file." into qt-r1-dev
...
am: 575bdfcaad
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
TreeHugger Robot
fe1a2476b3
Merge "Use Activity Context in RemoveAccountPreferenceControllerTest."
2019-06-14 19:01:39 +00:00
TreeHugger Robot
72b5b4a4c1
Merge "Refactor MyDeviceInfoFragmentTest"
2019-06-14 15:35:28 +00:00
TreeHugger Robot
940373e976
Merge "Fix bulleted list 2nd align issue in reset dialog"
2019-06-14 12:49:24 +00:00
tmfang
ed728b8ae8
Refactor MyDeviceInfoFragmentTest
...
We shadow Fragment as workaround to prevent some errors
in onCreate for fixing b/135086559.
This CL tried to not mock everything for fragment.
We need to use correct way to create fragment lifecycle,
so it can avoid some errors likes b/135086559.
Test: atest MyDeviceInfoFragmentTest
Fixes: 135086559
Change-Id: I0d650bc700f570114861081d537f83a3ba14147b
2019-06-14 20:35:48 +08: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
Yanting Yang
3a0e5742a9
Fix bulleted list 2nd align issue in reset dialog
...
Bullet <li> was impacted by the spaces and newlines from string.
Tweak multi-lines to one line to correct the 2nd lines alignment.
Fixes: 132335156
Test: visual
Change-Id: I5af32cf373c7702d5fc8891a06c2cdffc6a01e0a
2019-06-14 19:43:04 +08:00
Jonathan Scott
2b0d9a5778
Use Activity Context in RemoveAccountPreferenceControllerTest.
...
Test: make -j56 RunSettingsRoboTests
Bug: 117487838
Change-Id: I2647bf98018e72af24053a336c8246d1f7e5fd4b
2019-06-14 11:09:11 +01:00
Kevin Chang
f0fbff62bc
Merge "Remove redundant style in accessibility permission dialog"
2019-06-14 09:47:14 +00:00
TreeHugger Robot
5eb2c963c0
Merge "Use FooterPreference in xml explicitly"
2019-06-14 03:50:37 +00:00
TreeHugger Robot
78241bc06b
Merge "Update testcases which failed due to the SupportLibrary changed"
2019-06-14 03:11:33 +00:00
Yiwei Zhang
785d836283
Merge "Game Driver: Allow user to apply prerelease driver for all apps" into qt-dev am: 4af74dd86d am: 8bde8b44f5
...
am: e119076d2c
2019-06-13 19:53:37 -07:00
