Kevin Chang
487a0c2a57
Merge "Update the string of both magnification settings and gesture navigation tutorial dialog" into qt-dev am: 68aa4e4919
...
am: d2fa1e6baa
2019-06-03 18:48:20 -07:00
Kevin Chang
d2fa1e6baa
Merge "Update the string of both magnification settings and gesture navigation tutorial dialog" into qt-dev
...
am: 68aa4e4919
2019-06-03 18:41:08 -07:00
Kevin Chang
68aa4e4919
Merge "Update the string of both magnification settings and gesture navigation tutorial dialog" into qt-dev
2019-06-04 01:29:21 +00:00
Lucas Dupin
64dad09e02
Merge "Longer character limit" into qt-r1-dev
...
am: a448cb9d07
2019-06-03 16:04:59 -07:00
Lucas Dupin
4e7dd01d0e
Longer character limit
...
Fixes: 134370077
Fixes: 134162233
Test: make
Change-Id: I3f697a093752faca37c4dc165857c97a6b1e410c
2019-06-03 11:33:50 -07:00
Kevin Chang
ba2bdbc93a
Update the string of both magnification settings and gesture navigation tutorial dialog
...
Referenced link for the details:
https://docs.google.com/document/d/1eB2wukextG5UFECTwde5zcmXXTQCvgnqJJjnd1Chu9Q
https://docs.google.com/document/d/14iwCag7FBD4e9bR03HjbC0D2s_u-Fpr3K8vl_XMjkD0
Bug: 133336814
Bug: 133650388
Test: Visual
Change-Id: I4893183b55f609bfee3d1dfe80aa02cce624e857
2019-06-03 21:55:42 +08:00
Joshua Mccloskey
9b79a4c902
Merge "String update." into qt-r1-dev
...
am: b471e2439c
2019-05-30 16:32:47 -07:00
Joshua Mccloskey
b471e2439c
Merge "String update." into qt-r1-dev
2019-05-30 23:12:53 +00:00
Alex Salo
ac7851e1ce
Merge "Adds contextual cards for screen attention in Settings Homepage" into qt-r1-dev
...
am: fa127bd6f7
2019-05-30 16:12:36 -07:00
Alex Salo
fa127bd6f7
Merge "Adds contextual cards for screen attention in Settings Homepage" into qt-r1-dev
2019-05-30 22:59:12 +00:00
Mehdi Alizadeh
97f5ab6fac
Merge "Increase char limit to 60 for string translation" into qt-dev am: 178d4a7f8f
...
am: 4937d4ca1f
2019-05-30 15:19:22 -07:00
Mehdi Alizadeh
4937d4ca1f
Merge "Increase char limit to 60 for string translation" into qt-dev
...
am: 178d4a7f8f
2019-05-30 15:16:16 -07:00
Mehdi Alizadeh
5d77656d5d
Merge "Increase char limit to 60 for string translation" into qt-dev
...
am: 178d4a7f8f
2019-05-30 15:14:15 -07:00
TreeHugger Robot
178d4a7f8f
Merge "Increase char limit to 60 for string translation" into qt-dev
2019-05-30 22:04:47 +00:00
Christine Franks
3ccc01ca18
Merge "Add SIM color picker" into qt-dev am: b747c5c270
...
am: c1c4a0858d
2019-05-30 13:35:49 -07:00
Christine Franks
02c4e123b7
Merge "Add SIM color picker" into qt-dev
...
am: b747c5c270
2019-05-30 13:26:55 -07:00
Christine Franks
c1c4a0858d
Merge "Add SIM color picker" into qt-dev
...
am: b747c5c270
2019-05-30 13:20:46 -07:00
Christine Franks
b747c5c270
Merge "Add SIM color picker" into qt-dev
2019-05-30 20:01:48 +00:00
joshmccloskey
5ef0a1d11d
String update.
...
Test: Manual.
Bug: 133783098
Change-Id: If8ea2b6c9372a3da02b93b815f76e3143cc54dea
2019-05-30 10:51:34 -07:00
Lucas Dupin
a44a66f52a
Merge "Add setting to bypass lock screen" into qt-r1-dev
...
am: 0783505433
2019-05-30 00:00:13 -07:00
Lucas Dupin
0783505433
Merge "Add setting to bypass lock screen" into qt-r1-dev
2019-05-30 06:50:17 +00:00
Mehdi Alizadeh
be98ea25ca
Increase char limit to 60 for string translation
...
Bug: 133862422
Test: None
Change-Id: I3fa6705a6657c5aa65e496cba2ce470fb558a45f
2019-05-29 20:22:09 -07:00
Christine Franks
8869db9555
Add SIM color picker
...
Bug: 133193155
Test: make ROBOTEST_FILTER="(RenameMobileNetwork*)" RunSettingsRoboTests -j48
Change-Id: Ifae8b77bc5b4ba1039ede70889468a018f57d78f
2019-05-29 17:03:31 -07:00
Lucas Dupin
b2aaa26f38
Add setting to bypass lock screen
...
Test: manual
Test: make RunSettingsRoboTests ROBOTEST_FILTER=LockscreenBypassPreferenceControllerTest
Bug: 130327302
Change-Id: I324c6e384480fa8576ba58d0bf73c1ef20484ee0
2019-05-29 15:57:32 -07:00
Evan Laird
6dd09d09ea
Merge "Change title to "Alerting"" into qt-dev am: c64d41fd98
...
am: f7ad71aab2
2019-05-29 12:44:16 -07:00
Evan Laird
03acd2962e
Merge "Change title to "Alerting"" into qt-dev
...
am: c64d41fd98
2019-05-29 12:40:16 -07:00
Evan Laird
f7ad71aab2
Merge "Change title to "Alerting"" into qt-dev
...
am: c64d41fd98
2019-05-29 12:39:14 -07:00
TreeHugger Robot
c64d41fd98
Merge "Change title to "Alerting"" into qt-dev
2019-05-29 19:19:59 +00:00
Yi Jiang
7605494cc5
Adds contextual cards for screen attention in Settings Homepage
...
Bug: 128527964
Test: atest ContextualAdaptiveSleepSliceTest, maually verified.
Change-Id: Ifaea7d8d4391e91cf6cbde38a2506728f55913d8
2019-05-29 10:37:11 -07:00
Julia Reynolds
75d207c364
Merge "Add snooze notification setting" into qt-dev
...
am: b8f7db90ce
2019-05-29 10:24:19 -07:00
Julia Reynolds
77d0d162a2
Merge "Add snooze notification setting" into qt-dev am: b8f7db90ce
...
am: 75034e5c20
2019-05-29 10:23:59 -07:00
Evan Laird
b18ec1958a
Change title to "Alerting"
...
Test: visual
Fixes: 133825282
Change-Id: I08c58328eafdc37ba993d5189c8830e2c00115e6
2019-05-29 13:19:37 -04:00
Julia Reynolds
75034e5c20
Merge "Add snooze notification setting" into qt-dev
...
am: b8f7db90ce
2019-05-29 10:15:46 -07:00
Mill Chen
c301af9e32
Merge "Add EID as a synonym to SIM status" into qt-dev am: 994d7d63d3
...
am: 9ebf7e8ece
2019-05-29 10:09:20 -07:00
Mill Chen
9ebf7e8ece
Merge "Add EID as a synonym to SIM status" into qt-dev
...
am: 994d7d63d3
2019-05-29 10:04:32 -07:00
Mill Chen
7d5050f252
Merge "Add EID as a synonym to SIM status" into qt-dev
...
am: 994d7d63d3
2019-05-29 10:04:24 -07:00
TreeHugger Robot
b8f7db90ce
Merge "Add snooze notification setting" into qt-dev
2019-05-29 17:03:32 +00:00
Tsung-Mao Fang
103ac2d568
Revert "Tweak title for "App content"" am: 685d247730
...
am: 8456765698
2019-05-29 09:57:04 -07:00
Tsung-Mao Fang
6705e45ca6
Revert "Tweak title for "App content""
...
am: 685d247730
2019-05-29 09:48:52 -07:00
TreeHugger Robot
994d7d63d3
Merge "Add EID as a synonym to SIM status" into qt-dev
2019-05-29 16:48:23 +00:00
Tsung-Mao Fang
8456765698
Revert "Tweak title for "App content""
...
am: 685d247730
2019-05-29 09:45:30 -07:00
Tsung-Mao Fang
685d247730
Revert "Tweak title for "App content""
...
This reverts commit a00e725b0a
2019-05-29 17:19:36 +08:00
Mill Chen
a5bbb26dfe
Add EID as a synonym to SIM status
...
We can't use EID as keyword to search for it because EID info is located
in the SIM status dialog in which it's not searchable. EID is added as a
synonym of SIM status to support its search result.
Fixes: 133801685
Test: Settings > Search settings > type "eid"
then will show "SIM status" search result
Change-Id: I03b49bf6f2951c468440f635d7b211266bb00d83
2019-05-29 07:36:38 +00:00
Amin Shaikh
44d3605deb
Merge "Remove theming developer settings." into qt-r1-dev
...
am: aa3ae7291a
2019-05-28 16:24:07 -07:00
TreeHugger Robot
aa3ae7291a
Merge "Remove theming developer settings." into qt-r1-dev
2019-05-28 23:20:22 +00:00
tmfang
b91b94bfb5
Merge "Tweak title for "App content"" into qt-dev am: e40b0f7b8a
...
am: 21d1cab50d
2019-05-28 13:54:17 -07:00
tmfang
f3327de8af
Merge "Tweak title for "App content"" into qt-dev
...
am: e40b0f7b8a
2019-05-28 13:48:29 -07:00
tmfang
21d1cab50d
Merge "Tweak title for "App content"" into qt-dev
...
am: e40b0f7b8a
2019-05-28 13:48:28 -07:00
TreeHugger Robot
e40b0f7b8a
Merge "Tweak title for "App content"" into qt-dev
2019-05-28 20:31:51 +00:00
Mehdi Alizadeh
b907a39a36
Merge "Adds string resources for gesture not supported dialog" into qt-dev am: 7009b21d74
...
am: 5409188e03
2019-05-28 11:44:27 -07:00
