Yi Jiang
6985649b7e
Merge "use different description strings for screen attention settings and contextual card" into qt-r1-dev am: d81e2c36f6
...
am: b7098b181f
2019-06-05 20:40:29 -07:00
Yi Jiang
b7098b181f
Merge "use different description strings for screen attention settings and contextual card" into qt-r1-dev
...
am: d81e2c36f6
2019-06-05 17:10:30 -07:00
Yi Jiang
d81e2c36f6
Merge "use different description strings for screen attention settings and contextual card" into qt-r1-dev
2019-06-05 23:35:51 +00:00
Yi Jiang
9df180a008
use different description strings for screen attention settings and contextual card
...
1. Revert the screen attention description string to the old approved
string.
2. Create a new summary string for 'Screen Attention' contextual slice.
3. Fix some character issues.
Bug: 134457354
Bug: 134585794
Test: make RunSettingsRoboTests -j 32
Change-Id: I401fc6707203790e51aed8738b4658c6a30f512e
2019-06-05 13:22:19 -07:00
Xiangyu/Malcolm Chen
d9d9a79d31
Merge "Triggering notifications when dual CDMA SIM combinations are detected" into qt-dev am: 13cbb2eea2 am: 226715e54e
...
am: b55caa7afc
2019-06-05 11:49:35 -07:00
Xiangyu/Malcolm Chen
b55caa7afc
Merge "Triggering notifications when dual CDMA SIM combinations are detected" into qt-dev am: 13cbb2eea2
...
am: 226715e54e
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
2019-06-05 11:21:33 -07:00
Xiangyu/Malcolm Chen
f6ae3fa64a
Merge "Triggering notifications when dual CDMA SIM combinations are detected" into qt-dev
...
am: 13cbb2eea2
2019-06-05 11:21:32 -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
e3ee5e32c3
Merge "New strings for "Automatically lock"" into qt-r1-dev am: 19eaefb17e
...
am: 1d9a0ec5f4
2019-06-05 08:46:33 -07:00
Edgar Wang
1d9a0ec5f4
Merge "New strings for "Automatically lock"" into qt-r1-dev
...
am: 19eaefb17e
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
7b707bb204
Merge "Cleanup background activity starts for release." into qt-dev am: c53f5ecb3d am: dd1545b098
...
am: c912a02f50
2019-06-04 07:53:23 -07:00
Alan Stokes
c912a02f50
Merge "Cleanup background activity starts for release." into qt-dev am: c53f5ecb3d
...
am: dd1545b098
2019-06-04 07:43:00 -07:00
Alan Stokes
5b09f510e2
Merge "Cleanup background activity starts for release." into qt-dev
...
am: c53f5ecb3d
2019-06-04 07:38:04 -07:00
Alan Stokes
dd1545b098
Merge "Cleanup background activity starts for release." into qt-dev
...
am: c53f5ecb3d
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
99735a39f7
Merge "Update the string of both magnification settings and gesture navigation tutorial dialog" into qt-dev am: 68aa4e4919 am: d2fa1e6baa
...
am: 487a0c2a57
2019-06-03 19:01:29 -07:00
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
267321cd81
Merge "Update the string of both magnification settings and gesture navigation tutorial dialog" into qt-dev
...
am: 68aa4e4919
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
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
a1e19f1349
Merge "Longer character limit" into qt-r1-dev am: a448cb9d07
...
am: 64dad09e02
2019-06-03 16:12:24 -07:00
Lucas Dupin
64dad09e02
Merge "Longer character limit" into qt-r1-dev
...
am: a448cb9d07
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
412815e2b7
Merge "Change switch text color to black in dark mode" into qt-dev am: ccbdd834ff am: 154c485209
...
am: 1825608cde
2019-05-31 09:54:28 -07:00
Salvador Martinez
1825608cde
Merge "Change switch text color to black in dark mode" into qt-dev am: ccbdd834ff
...
am: 154c485209
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
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
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
be79914c4f
Merge "String update." into qt-r1-dev am: b471e2439c
...
am: 9b79a4c902
2019-05-30 16:48:58 -07:00
Joshua Mccloskey
9b79a4c902
Merge "String update." into qt-r1-dev
...
am: b471e2439c
2019-05-30 16:32:47 -07:00
Alex Salo
88e3adce68
Merge "Adds contextual cards for screen attention in Settings Homepage" into qt-r1-dev am: fa127bd6f7
...
am: ac7851e1ce
2019-05-30 16:31:17 -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
e1ad225a51
Merge "Increase char limit to 60 for string translation" into qt-dev am: 178d4a7f8f am: 4937d4ca1f
...
am: 97f5ab6fac
2019-05-30 15:37:57 -07: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
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
2adf1f213d
Merge "Add SIM color picker" into qt-dev am: b747c5c270 am: c1c4a0858d
...
am: 3ccc01ca18
2019-05-30 14:09:41 -07: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
