Commit Graph

7401 Commits

Author SHA1 Message Date
Xiangyu/Malcolm Chen
b55caa7afc Merge "Triggering notifications when dual CDMA SIM combinations are detected" into qt-dev am: 13cbb2eea2
am: 226715e54e

Change-Id: I64ef08b8d8b5215a20017e70f36678d4f2d8c510
2019-06-05 11:35:09 -07:00
Xiangyu/Malcolm Chen
226715e54e Merge "Triggering notifications when dual CDMA SIM combinations are detected" into qt-dev
am: 13cbb2eea2

Change-Id: I8ba31e7278d911bf6cef19e46d06ed964ae9e36f
2019-06-05 11:21:33 -07:00
Xiangyu/Malcolm Chen
13cbb2eea2 Merge "Triggering notifications when dual CDMA SIM combinations are detected" into qt-dev 2019-06-05 18:03:17 +00:00
Edgar Wang
1d9a0ec5f4 Merge "New strings for "Automatically lock"" into qt-r1-dev
am: 19eaefb17e

Change-Id: I83d75e232242340a20d006ccfa2697ef4d6301a1
2019-06-05 08:40:30 -07:00
Edgar Wang
e1a000f94f New strings for "Automatically lock"
Bug: 132106803
Test: manual
Change-Id: If6fe328ef6570cd96906435eb635576b324269c0
2019-06-05 17:19:48 +08:00
Malcolm Chen
57badc2a82 Triggering notifications when dual CDMA SIM combinations are detected
In Settings, catch the intent from Telephony about SIM combination
warning and show a notification about it.

Bug: 132631355
Test: manual - have two cdma capable subscriptions active, make sure
the notification is sent, and tapping on it leads to the helper page.

Change-Id: Ifd0e13781e4afc3bfd82415b3e51fd10176d9f9d
2019-06-04 17:11:09 -07:00
Alan Stokes
c912a02f50 Merge "Cleanup background activity starts for release." into qt-dev am: c53f5ecb3d
am: dd1545b098

Change-Id: Iffc9d8bfa0469af6895496c4be8a4c45535c71f5
2019-06-04 07:43:00 -07:00
Alan Stokes
5b09f510e2 Merge "Cleanup background activity starts for release." into qt-dev
am: c53f5ecb3d

Change-Id: Icdfe52632085ea7add4ffa594fddb2d79b412e3b
2019-06-04 07:38:04 -07:00
Alan Stokes
dd1545b098 Merge "Cleanup background activity starts for release." into qt-dev
am: c53f5ecb3d

Change-Id: I4a8c3e569bfc717802e45abfea0ad6b811c33c96
2019-06-04 07:38:00 -07:00
Alan Stokes
c53f5ecb3d Merge "Cleanup background activity starts for release." into qt-dev 2019-06-04 14:26:29 +00:00
Kevin Chang
487a0c2a57 Merge "Update the string of both magnification settings and gesture navigation tutorial dialog" into qt-dev am: 68aa4e4919
am: d2fa1e6baa

Change-Id: Id64aadc20751d107c93b32a420d679aa2cc9a72b
2019-06-03 18:48:20 -07:00
Kevin Chang
267321cd81 Merge "Update the string of both magnification settings and gesture navigation tutorial dialog" into qt-dev
am: 68aa4e4919

Change-Id: I7db65e3ef0ed83e91a666a479cdbe8020aee763c
2019-06-03 18:42:10 -07:00
Kevin Chang
d2fa1e6baa Merge "Update the string of both magnification settings and gesture navigation tutorial dialog" into qt-dev
am: 68aa4e4919

Change-Id: I183707f6b18a8755eefb2cbcceaa7627b0228a9c
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

Change-Id: I18b0e68a7a0a7842e07f3c4cf067906ec1dc4763
2019-06-03 16:04:59 -07:00
TreeHugger Robot
a448cb9d07 Merge "Longer character limit" into qt-r1-dev 2019-06-03 22:45:08 +00: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
Salvador Martinez
1825608cde Merge "Change switch text color to black in dark mode" into qt-dev am: ccbdd834ff
am: 154c485209

Change-Id: Id704c498feb80d8c66c472b08505dd492cbd708d
2019-05-31 09:32:26 -07:00
Salvador Martinez
ab5e939b72 Merge "Change switch text color to black in dark mode" into qt-dev
am: ccbdd834ff

Change-Id: I933e00d2d75fbfe1c1d370f61df5b004bb99ec91
2019-05-31 09:16:12 -07:00
Salvador Martinez
154c485209 Merge "Change switch text color to black in dark mode" into qt-dev
am: ccbdd834ff

Change-Id: Ia64d44b5fd36823c1750ed8afc998f7619155824
2019-05-31 09:15:12 -07:00
TreeHugger Robot
ccbdd834ff Merge "Change switch text color to black in dark mode" into qt-dev 2019-05-31 15:59:42 +00:00
Joshua Mccloskey
9b79a4c902 Merge "String update." into qt-r1-dev
am: b471e2439c

Change-Id: I63a30632336f2df104440ed4e51c3d76d4f2aa9f
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

Change-Id: Ie61452dd21b1d3d6183edab66c01b51d39c008da
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

Change-Id: Ib4f85a72db8e8d36e5016c90857c532195632904
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

Change-Id: I8369dc9dc525652253f4d5a8945725b09268470c
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

Change-Id: Ia7882da10d3f323234267cbec3ea1136214fd974
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
Salvador Martinez
a2e7357535 Change switch text color to black in dark mode
It seems that the attribute values that are used to text color
in the switch bar are selectors which leads to problems because
they include an alpha value when the switch is "off". This would
cause the contrast between the text and the background to be too
low for GAR. This CL simply makes it so that in dark mode the text
for the switch bar is just true black since adjusting the
attributes would have wide scale implications for all UIs using
device default themes.

Test: visual inspection
Bug: 132755745
Change-Id: I309db82e9bf020fb654e0b93f6ec84380ae092f7
2019-05-30 14:16:52 -07:00
Christine Franks
3ccc01ca18 Merge "Add SIM color picker" into qt-dev am: b747c5c270
am: c1c4a0858d

Change-Id: I0c4ac5abe7be3eeb2df324b41f13284ed25dea95
2019-05-30 13:35:49 -07:00
Christine Franks
02c4e123b7 Merge "Add SIM color picker" into qt-dev
am: b747c5c270

Change-Id: Ib5f272280d1d23c70412c3112bfcfc432af181ed
2019-05-30 13:26:55 -07:00
Christine Franks
c1c4a0858d Merge "Add SIM color picker" into qt-dev
am: b747c5c270

Change-Id: Ia234bd596017cf98dd5a76202c6fe7af486562f4
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

Change-Id: I533383a4e7c9ecc068c24cd55647c55487dfd5a6
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

Change-Id: I7f70d5cc3b1d824671cb6e1263363a1af0b7222b
2019-05-29 12:44:16 -07:00
Evan Laird
03acd2962e Merge "Change title to "Alerting"" into qt-dev
am: c64d41fd98

Change-Id: I2305841504e8146481bfd6128d1194d1741e1ba2
2019-05-29 12:40:16 -07:00
Evan Laird
f7ad71aab2 Merge "Change title to "Alerting"" into qt-dev
am: c64d41fd98

Change-Id: I9b45e08a54097a5e04f58439a87443902f1c28bf
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

Change-Id: If4f5777f87dda64edd2b947fe08be88fdae0c4db
2019-05-29 10:24:19 -07:00
Julia Reynolds
77d0d162a2 Merge "Add snooze notification setting" into qt-dev am: b8f7db90ce
am: 75034e5c20

Change-Id: I3a6d2e7618d152d94d996e43e28dfbe2d55b6e79
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

Change-Id: I2059c7ac5ae2922bba2c3d22413b21ed0ee60979
2019-05-29 10:15:46 -07:00