Hai Zhang
30a04be5be
Merge "Remove SmsDefaultDialog which has been replaced by role." into qt-dev am: 98ba2a6b8b am: c46403a34e
...
am: e99117aa25
2019-05-21 21:22:31 -07:00
Alex Kershaw
5e8053e4fe
Merge "Don't display footer text when calling app is DPC." into qt-dev am: 993446a68e am: e19ede22a2
...
am: 0f9426a8b5
2019-05-21 21:21:32 -07:00
Fan Zhang
05eb89591a
Merge "Fix view overlap in landscape wifi dpp enrollment." into qt-dev am: fa5aaf9212 am: 88779708f1
...
am: fe49e63c9d
2019-05-21 18:15:49 -07:00
Badhri Jagan Sridharan
e800cbb57c
Merge "Help URI for USB contaminant dialog" into qt-dev am: 83c4ce4a48 am: f4cc1b5e79
...
am: 1ad087218e
2019-05-21 13:51:14 -07:00
Badhri Jagan Sridharan
0f058e362e
Merge "Help URI for USB contaminant dialog" into qt-dev am: 83c4ce4a48 am: 50ad7da280
...
am: b6962d022d
2019-05-21 12:43:41 -07:00
Hai Zhang
e99117aa25
Merge "Remove SmsDefaultDialog which has been replaced by role." into qt-dev am: 98ba2a6b8b
...
am: c46403a34e
2019-05-21 12:20:50 -07:00
Alex Kershaw
0f9426a8b5
Merge "Don't display footer text when calling app is DPC." into qt-dev am: 993446a68e
...
am: e19ede22a2
2019-05-21 12:20:01 -07:00
Fan Zhang
fe49e63c9d
Merge "Fix view overlap in landscape wifi dpp enrollment." into qt-dev am: fa5aaf9212
...
am: 88779708f1
2019-05-21 12:18:51 -07:00
Kevin Chyn
b907ffa7ed
Merge "Update strings" into qt-r1-dev am: 9f17f84a10
...
am: b03f2e5183
2019-05-21 11:19:00 -07:00
Badhri Jagan Sridharan
1ad087218e
Merge "Help URI for USB contaminant dialog" into qt-dev am: 83c4ce4a48
...
am: f4cc1b5e79
2019-05-21 10:58:24 -07:00
Badhri Jagan Sridharan
b6962d022d
Merge "Help URI for USB contaminant dialog" into qt-dev am: 83c4ce4a48
...
am: 50ad7da280
2019-05-21 10:21:19 -07:00
TreeHugger Robot
75867441a1
Merge "Update string"
2019-05-21 17:14:24 +00:00
Badhri Jagan Sridharan
f4cc1b5e79
Merge "Help URI for USB contaminant dialog" into qt-dev
...
am: 83c4ce4a48
2019-05-21 09:48:53 -07:00
Kevin Chyn
b03f2e5183
Merge "Update strings" into qt-r1-dev
...
am: 9f17f84a10
2019-05-21 09:35:46 -07:00
TreeHugger Robot
546a06af3d
Merge "[Wi-Fi DPP] Refine Wi-Fi DPP UI layouts with SUW library"
2019-05-21 09:56:05 +00:00
Salvador Martinez
c5df8f0cb4
Merge "Merge "Break infinite refresh loop in battery estimates" into qt-dev am: e418874921 am: a7fba3efe2" into qt-r1-dev-plus-aosp
...
am: 5465e927e3
2019-05-21 02:41:16 -07:00
Salvador Martinez
d3f0b756e5
Merge "Break infinite refresh loop in battery estimates" into qt-dev am: e418874921 am: 9822f6ed92
...
am: 768e021974
2019-05-21 01:32:19 -07:00
timhypeng
c82962b432
Update string
...
- merge title into body text
Bug: 131914743
Test: make -j50 RunSettingsRoboTests
Change-Id: I5298dbcc28f8ecb97f714c948cda12e040bfd391
2019-05-21 07:10:19 +00:00
Hai Zhang
c46403a34e
Merge "Remove SmsDefaultDialog which has been replaced by role." into qt-dev
...
am: 98ba2a6b8b
2019-05-20 23:30:49 -07:00
TreeHugger Robot
98ba2a6b8b
Merge "Remove SmsDefaultDialog which has been replaced by role." into qt-dev
2019-05-21 06:05:31 +00:00
Arc Wang
8e3c49123d
[Wi-Fi DPP] Refine Wi-Fi DPP UI layouts with SUW library
...
1. Use GlifLayout in all fragments
2. Fragments use 32dp icon instead of 48 dp
3. Replace ScrollView & ProgressBar & Header & Footer of original layout with GlifLayout design
4. Remove ActionBar (no more back button on screen top)
Bug: 129021867
Test: manual
Change-Id: I2fda48cb7f7819b2c8dd85c10d39e1f187463bd8
2019-05-21 13:59:39 +08:00
Alex Kershaw
e19ede22a2
Merge "Don't display footer text when calling app is DPC." into qt-dev
...
am: 993446a68e
2019-05-20 20:13:23 -07:00
Fan Zhang
88779708f1
Merge "Fix view overlap in landscape wifi dpp enrollment." into qt-dev
...
am: fa5aaf9212
2019-05-20 20:09:51 -07:00
Badhri Jagan Sridharan
50ad7da280
Merge "Help URI for USB contaminant dialog" into qt-dev
...
am: 83c4ce4a48
2019-05-20 19:51:58 -07:00
Kevin Chyn
9f17f84a10
Merge "Update strings" into qt-r1-dev
2019-05-21 02:20:56 +00:00
TreeHugger Robot
993446a68e
Merge "Don't display footer text when calling app is DPC." into qt-dev
2019-05-21 01:24:19 +00:00
Android Build Merger (Role)
5465e927e3
Merge "Merge "Break infinite refresh loop in battery estimates" into qt-dev am: e418874921 am: a7fba3efe2" into qt-r1-dev-plus-aosp
2019-05-21 00:58:50 +00:00
Fan Zhang
fa5aaf9212
Merge "Fix view overlap in landscape wifi dpp enrollment." into qt-dev
2019-05-21 00:34:54 +00:00
Badhri Jagan Sridharan
83c4ce4a48
Merge "Help URI for USB contaminant dialog" into qt-dev
2019-05-21 00:31:45 +00:00
Salvador Martinez
768e021974
Merge "Break infinite refresh loop in battery estimates" into qt-dev am: e418874921
...
am: 9822f6ed92
2019-05-20 17:21:03 -07:00
Salvador Martinez
9f969189e5
Merge "Break infinite refresh loop in battery estimates" into qt-dev am: e418874921
...
am: a7fba3efe2
2019-05-20 17:18:23 -07:00
Salvador Martinez
a7fba3efe2
Merge "Break infinite refresh loop in battery estimates" into qt-dev
...
am: e418874921
2019-05-20 16:05:21 -07:00
Hai Zhang
4feab60a30
Remove SmsDefaultDialog which has been replaced by role.
...
Bug: 131204827
Test: presubmit
Change-Id: If436d4f0777838dc490fa45901005008bb57315b
2019-05-20 15:23:05 -07:00
Salvador Martinez
9822f6ed92
Merge "Break infinite refresh loop in battery estimates" into qt-dev
...
am: e418874921
2019-05-20 15:21:12 -07:00
Kevin Chyn
26306c7498
Update strings
...
Bug: 132787143
Test: Builds
Change-Id: I382c84fbeb6ca2c151d6a4fa2f7a3d29d7c72505
2019-05-20 14:54:42 -07:00
Salvador Martinez
e418874921
Merge "Break infinite refresh loop in battery estimates" into qt-dev
2019-05-20 21:22:23 +00:00
Narayan Kamath
0d1dc2bd59
Merge "Merge "Hide AppButtonsPreferenceController for system modules." into qt-dev am: 76cf0dbddd am: 4f6e6c0849" into qt-r1-dev-plus-aosp
...
am: 2ce63571d9
2019-05-20 10:48:27 -07:00
Narayan Kamath
6abd1e82d2
Merge "Hide AppButtonsPreferenceController for system modules." into qt-dev am: 76cf0dbddd am: c756190b9c
...
am: 35870d6e5b
2019-05-20 08:24:12 -07:00
Android Build Merger (Role)
2ce63571d9
Merge "Merge "Hide AppButtonsPreferenceController for system modules." into qt-dev am: 76cf0dbddd am: 4f6e6c0849" into qt-r1-dev-plus-aosp
2019-05-20 14:16:31 +00:00
Narayan Kamath
cb3df9aaa5
Merge "Hide AppButtonsPreferenceController for system modules." into qt-dev am: 76cf0dbddd
...
am: 4f6e6c0849
2019-05-20 05:53:46 -07:00
Narayan Kamath
35870d6e5b
Merge "Hide AppButtonsPreferenceController for system modules." into qt-dev am: 76cf0dbddd
...
am: c756190b9c
2019-05-20 05:52:08 -07:00
Alex Kershaw
29d2bff7e1
Don't display footer text when calling app is DPC.
...
If the calling app has admin rights (DA/DO/PO), don't display footer
text that the calling app is 'recommending' that a password is set.
Fixes: 131888973
Test: atest com.android.settings.password.SetNewPasswordActivityTest --verbose
Test: atest com.android.settings.password.ChooseLockGenericTest --verbose
Test: manual
Change-Id: I32785d33e6425416fc1dbba24540ece8917b58f3
2019-05-20 12:19:22 +00:00
Narayan Kamath
c756190b9c
Merge "Hide AppButtonsPreferenceController for system modules." into qt-dev
...
am: 76cf0dbddd
2019-05-20 05:14:33 -07:00
Narayan Kamath
4f6e6c0849
Merge "Hide AppButtonsPreferenceController for system modules." into qt-dev
...
am: 76cf0dbddd
2019-05-20 01:12:27 -07:00
Narayan Kamath
76cf0dbddd
Merge "Hide AppButtonsPreferenceController for system modules." into qt-dev
2019-05-20 07:42:53 +00:00
Arc Wang
386318dbea
Fix view overlap in landscape wifi dpp enrollment.
...
Bug: 132813855
Test: manual
Change-Id: I961dcc88e044dc1ba6dc3d87d9820a2ced5196ee
2019-05-20 13:17:14 +08:00
Bill Yi
186a81b5b3
[automerger skipped] Import translations. DO NOT MERGE am: d6d1ac5e87 -s ours am: 089d85f315 -s ours am: d109c07b0d -s ours
...
am: 4e27bd6e44
2019-05-18 15:30:53 -07:00
Bill Yi
352226d549
[automerger skipped] Import translations. DO NOT MERGE am: d6d1ac5e87 -s ours am: 089d85f315 -s ours am: 68951dc3c4 -s ours
...
am: a97bd72607
2019-05-18 15:30:19 -07:00
Bill Yi
4e27bd6e44
[automerger skipped] Import translations. DO NOT MERGE am: d6d1ac5e87 -s ours am: 089d85f315 -s ours
...
am: d109c07b0d
2019-05-18 15:25:33 -07:00
Bill Yi
a97bd72607
[automerger skipped] Import translations. DO NOT MERGE am: d6d1ac5e87 -s ours am: 089d85f315 -s ours
...
am: 68951dc3c4
2019-05-18 15:25:17 -07:00
