Commit Graph

17135 Commits

Author SHA1 Message Date
Julia Reynolds
1053e4a798 Merge "Redesign channel listing and channel page" into qt-dev
am: 9496bce441

Change-Id: I7616f9164b8178f31423e0c048700391a667f192
2019-04-18 15:05:37 -07:00
Julia Reynolds
9496bce441 Merge "Redesign channel listing and channel page" into qt-dev 2019-04-18 21:34:36 +00:00
Alex Salo
4eeacd5e14 Merge "Add correct animation" into qt-dev
am: 7ad8c7bc2f

Change-Id: I5560dce9ebcce1c853fdcea32922c7645bd789ea
2019-04-18 13:39:57 -07:00
TreeHugger Robot
7ad8c7bc2f Merge "Add correct animation" into qt-dev 2019-04-18 20:26:17 +00:00
Maurice Lam
b857e83e75 Merge "Make fingerprint illustrations single color" into qt-dev
am: f63bdb8b6b

Change-Id: I3c03d6fbfb71e815840729425c0f1946fdc9cb76
2019-04-18 13:16:52 -07:00
TreeHugger Robot
f63bdb8b6b Merge "Make fingerprint illustrations single color" into qt-dev 2019-04-18 19:38:34 +00:00
Alex Salo
fe0d647917 Merge "Finalize the adaptive sleep icon" into qt-dev
am: 8ca49b5764

Change-Id: Ic741170c9ddb56e1fdf21a89d7b3fb627be7b8ef
2019-04-18 12:23:50 -07:00
Julia Reynolds
5c097c6d3c Redesign channel listing and channel page
Test: atest
Bug: 127796543
Fixes: 129452112
Fixes: 129453207
Change-Id: I1d520c9e35860303235b7ffbb18a76cbc4f4b8bc
2019-04-18 18:51:23 +00:00
TreeHugger Robot
8ca49b5764 Merge "Finalize the adaptive sleep icon" into qt-dev 2019-04-18 18:42:46 +00:00
Sunny Shao
d1d9cc59b0 Merge "Let NGA item display above advanced item in the App & Notifications" into qt-dev
am: 57da877dde

Change-Id: I53ff246a5614c1dc57717b94c84261cdbcaf8f5a
2019-04-18 10:07:36 -07:00
Sunny Shao
2fea81c628 Merge "Remove the duplicated search item" into qt-dev
am: 1282390768

Change-Id: Ic855545cab08d8a27fd82ea753b5481cfb3f5dce
2019-04-18 10:06:41 -07:00
pastychang
19b6972384 Set description textview to fixed id
am: f8409db196

Change-Id: I5f67c31f13e6d2b9bc029905e90f02caf6043a4f
2019-04-18 10:03:42 -07:00
TreeHugger Robot
57da877dde Merge "Let NGA item display above advanced item in the App & Notifications" into qt-dev 2019-04-18 16:54:58 +00:00
TreeHugger Robot
1282390768 Merge "Remove the duplicated search item" into qt-dev 2019-04-18 16:51:56 +00:00
Sunny Shao
26bd5a9a8f Remove the duplicated search item
Disable the searchable of the "Adaptive battery" item in the smart_battery_detail.xml

Fixes: 130656532
Test: Manual View
Change-Id: I95beb97fc09ff6858f7b4e0e576a598c3520db86
2019-04-18 17:39:09 +08:00
pastychang
f8409db196 Set description textview to fixed id
Modify to fixed id for landscape Glif layout and non-glif layout

Test: Manual
Bug: 130707943
Change-Id: I6346817e582c2aac26753b3a985038cb0ca421bc
2019-04-18 07:43:30 +00:00
Sunny Shao
06da9c7df9 Let NGA item display above advanced item in the App & Notifications
Change the value of the initialExpandedChildrenCount to 4 and let NGA item to show.

Fixes: 130420794
Test: Manual View
Change-Id: Ic2453944a5eaea0b5fd65e0272bfac64ffbc1eec
2019-04-18 15:24:48 +08:00
Kevin Chyn
8abe1f7c7d Merge "Tweak enrollment intro layout" into qt-dev
am: 3683a688f7

Change-Id: Id76defc6138c9fdddeb3c90343e7b4bb12bf556a
2019-04-17 21:42:34 -07:00
Kevin Chyn
3683a688f7 Merge "Tweak enrollment intro layout" into qt-dev 2019-04-18 04:09:12 +00:00
cosmohsieh
bef62366a9 Merge "[PasspointV2] Set summary of saved networks preference" into qt-dev
am: bb00e4c028

Change-Id: I537acf599d704a1aa1a5ae21e5cbd4aba15728e4
2019-04-17 18:27:22 -07:00
Selim Cinek
db22260726 Merge "Updated strings for dynamic privacy" into qt-dev
am: 9f374307c5

Change-Id: I2de918bb6e5ea7e7c116014d9c4c07e6670d950b
2019-04-17 18:03:42 -07:00
TreeHugger Robot
bb00e4c028 Merge "[PasspointV2] Set summary of saved networks preference" into qt-dev 2019-04-18 00:58:22 +00:00
Fan Zhang
62b8d64bbc Merge "Remove on/off subtext from gesture preferencecontrollers" into qt-dev
am: f6f4ae6e1c

Change-Id: I3961ec0da3fb934d581e26c34ef4136d26b28417
2019-04-17 17:54:37 -07:00
Selim Cinek
9f374307c5 Merge "Updated strings for dynamic privacy" into qt-dev 2019-04-18 00:42:55 +00:00
TreeHugger Robot
f6f4ae6e1c Merge "Remove on/off subtext from gesture preferencecontrollers" into qt-dev 2019-04-18 00:29:33 +00:00
Alex Salo
18cc79af29 Finalize the adaptive sleep icon
Bug: 129352433
Test: manually

Change-Id: I00cf2e5e7e8a9ebd60d9aa4e9047c9cd04ec16c7
2019-04-17 17:16:00 -07:00
Fan Zhang
57f18af554 Remove on/off subtext from gesture preferencecontrollers
The toggle switch next to the subtitle already shows on/off clearly.

Fixes: 130652619
Fixes: 130652843
Fixes: 130653459
Fixes: 130653297
Test: robo
Change-Id: Ib2396575bbc69a7cca5e9c90e113c76ff6db00b5
2019-04-17 23:49:25 +00:00
joshmccloskey
9c5669b802 Merge "Updated ConfirmDeviceCredential strings" into qt-dev
am: f90c24d194

Change-Id: I37c1da95d23cb91127ccaf7e9f3b792737457124
2019-04-17 15:25:57 -07:00
TreeHugger Robot
ff7f14a966 Merge "Import translations. DO NOT MERGE" into qt-dev 2019-04-17 21:34:14 +00:00
TreeHugger Robot
f90c24d194 Merge "Updated ConfirmDeviceCredential strings" into qt-dev 2019-04-17 21:13:41 +00:00
Kevin Chyn
6deedd0bf3 Tweak enrollment intro layout
Bug: 130740447

Test: Builds
Change-Id: If3b4ad795588586dcd6fb848bee213df0ae1095e
2019-04-17 13:44:03 -07:00
Alex Salo
63c393c907 Add correct animation
Bug: 129352433
Test: manually
Change-Id: I381059203c477407297765936e48271519852f56
2019-04-17 12:29:33 -07:00
Selim Cinek
3561c3f2b8 Updated strings for dynamic privacy
In the new world redacted content is also
revealed with smart lock.

Bug: 130227087
Test: observe strings
Change-Id: I69ad8fab65dde5be405d47c4426bee52b0911383
2019-04-17 11:45:02 -07:00
Maurice Lam
2cc2b29b3e Merge "Update strings for the title of lock screen skip dialog" into qt-dev
am: 47bea2d483

Change-Id: Ib994b45088365d8304af4d78ee53c0dce4c643b1
2019-04-17 10:46:35 -07:00
Yanting Yang
fba33258a2 Merge "Update summary lines of half condition card" into qt-dev
am: 06ada5b1b1

Change-Id: I999f104cef24b2801e07c9379fdc1dd0e9e3fd63
2019-04-17 10:36:52 -07:00
Maurice Lam
47bea2d483 Merge "Update strings for the title of lock screen skip dialog" into qt-dev 2019-04-17 17:29:49 +00:00
Yanting Yang
14a3a117be Update summary lines of half condition card
To optimize the visual design for regular font size in summary field.

Fixes: 130588679
Test: visual

Change-Id: I89142f403646139b150f38b70b52b0d7b36fed9e
2019-04-17 19:55:43 +08:00
cosmohsieh
e6e4b4d78d [PasspointV2] Set summary of saved networks preference
Summary text of "saved networks" preference has number of both normal
networks and subscriptions

Bug: 130259573
Test: make RunSettingsRoboTests -j32 ROBOTEST_FILTER=com.android.settings.wifi.WifiSettingsTest
Change-Id: I8bdf41c1a85165298a2ccd9e688c30b0bd593bfa
2019-04-17 18:21:09 +08:00
Mill Chen
8350576f01 Merge "Add subtitle for Do not disturb" into qt-dev
am: cf9b3d2e87

Change-Id: I60ec7bc78b4cf6a429c6e0ccdb3b092431e0a72b
2019-04-17 02:16:51 -07:00
TreeHugger Robot
cf9b3d2e87 Merge "Add subtitle for Do not disturb" into qt-dev 2019-04-17 09:08:17 +00:00
Mill Chen
5d5a65ab5b Merge "Fix wrong color for rippleColor" into qt-dev
am: 7cc1469bb6

Change-Id: I62a21a22ddd5a3778607a012213bdc923e1fee72
2019-04-17 01:51:43 -07:00
TreeHugger Robot
7cc1469bb6 Merge "Fix wrong color for rippleColor" into qt-dev 2019-04-17 08:46:46 +00:00
Bill Yi
482e8d91f9 Import translations. DO NOT MERGE
Auto-generated-cl: translation import

Bug: 64712476
Change-Id: I83441773fc8063c0488fe90230b39ad0ff01f0d5
2019-04-16 22:49:49 -07:00
Kevin Chyn
1dd4eb81c6 Merge "Fix string comment" into qt-dev
am: f93ca46ea7

Change-Id: Ieaa2e8600b3272e733e7ba68ee1c109c7d9e63d1
2019-04-16 21:27:05 -07:00
Pasty Chang
ee38c9bc1c Update strings for the title of lock screen skip dialog
First letter should be lowercase

Bug: 129870122
Test: Manual
Change-Id: If6ed383cccf56007691ca24d02919b41f1c69281
2019-04-17 04:16:24 +00:00
Cyril Lee
e40d4097a0 Merge "The labels of button in Wi-Fi input and "skip screen lock" dialog doesn't apply GlifV3 style" into qt-dev
am: a60def7db7

Change-Id: I4fd7a6fd6c52fad63c9ddf1bfb5f6f57f047f510
2019-04-16 21:06:42 -07:00
TreeHugger Robot
f93ca46ea7 Merge "Fix string comment" into qt-dev 2019-04-17 03:36:26 +00:00
Cyril Lee
a60def7db7 Merge "The labels of button in Wi-Fi input and "skip screen lock" dialog doesn't apply GlifV3 style" into qt-dev 2019-04-17 03:20:29 +00:00
Kevin Chyn
bf121dd46b Fix string comment
Bug: 130642861

Test: Builds
Change-Id: Ib889b1a69b5225579ffad6f63b0d98ded9841614
2019-04-16 17:02:17 -07:00
joshmccloskey
a104d290de Updated ConfirmDeviceCredential strings
Test: Verified with BiometricPromptdemo that pin/pattern/pass
show up correctly.
Fixes: 129797243
Change-Id: Ib075d6742f7e2ad03e491132ae9506dce67558fc
2019-04-16 14:19:29 -07:00