Niclas Rokicki
90f0230b54
Merge "translate="false" -> translatable="false""
...
am: b333e79df9
2019-10-22 09:41:58 -07:00
Niclas Rokicki
af548beaea
translate="false" -> translatable="false"
...
Fixed a typo related to String translation
Bug: 142888682
Test: Manual
Change-Id: I86fd2d9a4c5b085679ed627c7ecb7578da168ced
2019-10-22 16:30:02 +08:00
Anamika Singh
251411674b
Merge "Move Emergency call button"
...
am: 2501f6e268
2019-10-18 01:49:54 -07:00
Treehugger Robot
2501f6e268
Merge "Move Emergency call button"
2019-10-18 08:37:39 +00:00
Raff Tsai
2bb6e54317
Merge "Make sure close button has proper color"
...
am: 0f9ad6d7f9
2019-10-15 03:32:29 -07:00
Raff Tsai
0f9ad6d7f9
Merge "Make sure close button has proper color"
2019-10-15 10:11:56 +00:00
SongFerng Wang
951e9b7742
Merge changes Ifaed6ca8,I4a78e2e7,I945d3c2f,Ia0d1333c,I5dfe4843
...
am: bc6a65ca32
2019-10-14 00:34:20 -07:00
SongFerngWang
8cd10f774d
RadioInfo network mode list and network mode string add 5G
...
am: dc5149efef
2019-10-14 00:33:54 -07:00
Anamika Singh
a6f03fd0db
Move Emergency call button
...
This is google issue because in Q DecorView (base of CryptKeeper view)
has added Navigation bar forcefully due to which Emergency call button
was hidden on CryptKeeper view.
Made changes to shift ECC button above navigation bar.
Hence it will show just below CryptKeeper password entry view pattern/pin/password).
Bug: 142626673
Test: Manual
Change-Id: If60fad3936bc67adcf26019bdf16975b5706be83
2019-10-14 07:20:15 +00:00
SongFerngWang
7fa128edcd
String "CDME" is wrong
...
Bug: 142376028
Test: build pass
Change-Id: Ifaed6ca8aba8f34ecb27abb863aeaf679132934f
Merged-In: Ifaed6ca8aba8f34ecb27abb863aeaf679132934f
2019-10-14 05:01:18 +00:00
SongFerngWang
dc5149efef
RadioInfo network mode list and network mode string add 5G
...
Bug: 131888757
Test: 1.build pass 2.RadioInfo set network mode work.
Change-Id: I945d3c2fd175f45151bbeee475e388ccc2d67642
Merged-In: I945d3c2fd175f45151bbeee475e388ccc2d67642
2019-10-14 05:01:01 +00:00
Luca Stefani
3aa74fe1d0
Make sure close button has proper color
...
Test: manual, change theme to dark
Change-Id: I9b1c159834c1afcc03a1df33e2ea3b28ce6fc6c0
2019-10-10 10:43:51 +02:00
Bill Yi
500e7b2b71
Import translations. DO NOT MERGE
...
Change-Id: I0f9786915ebc5c168487e7a5386d4f2060d27a12
Auto-generated-cl: translation import
2019-09-24 18:54:26 -07:00
Yi-Ling Chuang
8d8c3e19b5
Merge "Enable dismissal feature on legacy suggestions."
...
am: ee39335edc
2019-09-22 20:03:21 -07:00
Yi-Ling Chuang
83ac0efd81
Enable dismissal feature on legacy suggestions.
...
Add back the close button for legacy suggestions.
Fixes: 140786274
Test: robotest
Change-Id: Iaf0376bd482db4c4ff7d04a68131071c29c01ced
2019-09-20 18:03:10 -07:00
Xin Li
bd8030e8b2
DO NOT MERGE - Merge build QP1A.190711.019 into stage-aosp-master
...
Bug: 139893257
Change-Id: I54b340294458df6016b7893838e1b0f6e61daf11
2019-08-23 06:45:17 +00:00
Kevin Chyn
645480a4e4
Merge "Remove attention controller" into qt-r1-dev
...
am: 41aafab963
2019-08-19 19:57:37 -07:00
TreeHugger Robot
41aafab963
Merge "Remove attention controller" into qt-r1-dev
2019-08-20 02:37:20 +00:00
Bill Yi
0bb9d1e153
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Bug: 64712476
Change-Id: Ie3771d039d46900090a8a4f58f325b9a5eb29e0a
2019-08-17 01:35:46 -07:00
Kevin Chyn
ddd4fb660e
Merge "Update attention string" into qt-r1-dev
...
am: e218dc0517
2019-08-16 19:43:00 -07:00
Kevin Chyn
e218dc0517
Merge "Update attention string" into qt-r1-dev
2019-08-17 02:01:31 +00:00
Kevin Chyn
8e1d1ca3ab
Remove attention controller
...
Bug: 139484065
Test: manual
Change-Id: Ideed761c978ba0831b04ed2cc294e9655dddb01c
2019-08-16 16:34:09 -07:00
Kevin Chyn
821fbc83a1
Update attention string
...
Bug: 139484065
Test: manual
Change-Id: Ie4619fb51709ba2651866b7841dd4d6b51f165d1
2019-08-16 16:34:09 -07:00
Edgar Wang
3448917d8e
Merge "Add skip lock screen in Notification & security lock screen settings" into qt-r1-dev
...
am: 8e3b202070
2019-08-01 22:49:22 -07:00
Edgar Wang
8e3b202070
Merge "Add skip lock screen in Notification & security lock screen settings" into qt-r1-dev
2019-08-02 05:38:23 +00:00
Daniel Solomon
4c1fa1a5d1
Merge "Settings: change the color mode preview image" into qt-r1-dev
...
am: c5fbd7b669
2019-08-01 13:37:33 -07:00
TreeHugger Robot
c5fbd7b669
Merge "Settings: change the color mode preview image" into qt-r1-dev
2019-08-01 19:58:47 +00:00
Edgar Wang
58a5be4401
Add skip lock screen in Notification & security lock screen settings
...
Users may have trouble finding this setting in face auth.
Heard this from dogfood/executive feedback and customer support discussion.
So add Skip Lock Screen preference in
Display > Lock screen display > What to show >
and
App & Notifications > Notifications > Lock Screen >
Bug: 138458558
Test: robotest & manual
Change-Id: I10e420821423821743d65b00c8b7e6d4d1224e00
2019-08-01 11:17:05 +08:00
Antony Sargent
e744ee1295
Merge "Protect entry points to add an eSIM when admin restricted" into qt-r1-dev
...
am: 4685c785b9
2019-07-31 16:04:54 -07:00
TreeHugger Robot
4685c785b9
Merge "Protect entry points to add an eSIM when admin restricted" into qt-r1-dev
2019-07-31 22:39:22 +00:00
Antony Sargent
482415d37e
Protect entry points to add an eSIM when admin restricted
...
If the DISALLOW_CONFIG_MOBILE_NETWORKS admin policy is set, we were
accidentally still allowing access to the flow where you add an eSIM
subscription via the "plus" button on the Network & internet page. While
fixing this, I also noticed that the mobile networks list page (which
only becomes available if you have multiple subscriptions) has a link at
the bottom to start the flow as well, and that wasn't being protected.
The fix for the plus button on the Network & internet page was just to
make sure not to call setEnabled(true) if the preference was already
disabled by admin policy, since that has the effect of overriding the
admin-disabling.
The fix for the mobile networks list page just needed to add the
relevant tags in the layout XML, and then we get it for free.
Fixes: 137627845
Test: make RunSettingsRoboTests
Change-Id: I896ac248f50aaeecc157791938a0a0a98265aa07
2019-07-31 12:53:39 -07:00
Daniel Solomon
56574d5924
Settings: change the color mode preview image
...
Change the color mode preview image to better illustrate the difference
between Natural and Boosted color modes.
Bug: 138126243
Test: manual testing on Pixel
Change-Id: I367b383f9f2da9b2e2d5960e51c3ec7821d4915b
2019-07-31 12:48:23 -07:00
Bill Yi
5a690f3c4c
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Bug: 64712476
Change-Id: I3e51c61d9bdff182bc83a04242ccd6e1e4f9629d
2019-07-31 12:09:08 -07:00
Bill Yi
0501bbb97f
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Bug: 64712476
Change-Id: Id8561f757b8520ebbd976cc9b06fa833b68575d8
2019-07-30 11:55:38 -07:00
Jason Chiu
f7423fd7ac
Merge "Fix DISALLOW_AMBIENT_DISPLAY blocks access to all lock screen display settings" into qt-r1-dev
...
am: 04ad8c905a
2019-07-26 18:45:07 -07:00
TreeHugger Robot
04ad8c905a
Merge "Fix DISALLOW_AMBIENT_DISPLAY blocks access to all lock screen display settings" into qt-r1-dev
2019-07-27 01:29:55 +00:00
TreeHugger Robot
8b9c85f0cd
Merge "Import translations. DO NOT MERGE" into qt-r1-dev
2019-07-26 17:39:58 +00:00
Bill Yi
9dff9b9c52
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Bug: 64712476
Change-Id: I84fe706da2873676a567287114abc4e6a27c158c
2019-07-25 18:34:18 -07:00
Jason Chiu
32930dbe4e
Fix DISALLOW_AMBIENT_DISPLAY blocks access to all lock screen display settings
...
"Ambient display" was merged into "Lock screen display", and the entry
was also moved from security page to display page and leveraged the
original user restriction of "Ambient display".
The user restriction should just work on the switch of Ambient display
instead of the "Lock screen display" entry.
Bug: 138177691
Test: robotest, visual
Change-Id: I5db0eb68c3aa6f4f7d8ecd42db2cdc72255b12f7
2019-07-25 16:23:12 +08:00
Peiyong Lin
ac52d90a6c
Remove prerelease driver option from Settings UI.
...
BUG: 134881329
Test: Verified with Settings UI.
Change-Id: Id610cbaec9b9a5a8be201e7952cb7715d2fe2eb4
(cherry picked from commit c2dfba01ca
2019-07-25 04:12:17 +00:00
Peiyong Lin
70605be5b7
Remove prerelease driver option from Settings UI. am: c2dfba01ca
...
am: 7c5bb0ecda
2019-07-24 17:25:16 -07:00
Peiyong Lin
7c5bb0ecda
Remove prerelease driver option from Settings UI.
...
am: c2dfba01ca
2019-07-24 16:59:33 -07:00
Lucas Lin
e5cc01c3dc
Merge "Create a string for private DNS "On"" am: a64f8d9521 am: 903e8dac6c
...
am: c30cdecfba
2019-07-23 21:10:21 -07:00
Lucas Lin
903e8dac6c
Merge "Create a string for private DNS "On""
...
am: a64f8d9521
2019-07-23 20:45:49 -07:00
Peiyong Lin
c2dfba01ca
Remove prerelease driver option from Settings UI.
...
BUG: 134881329
Test: Verified with Settings UI.
Change-Id: Id610cbaec9b9a5a8be201e7952cb7715d2fe2eb4
2019-07-23 21:18:10 +00:00
Bill Yi
fe36dd6834
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Bug: 64712476
Change-Id: I81487d87626426a7b7a969314691a6ce1177df4b
2019-07-23 13:19:18 -07:00
lucaslin
be8701bca5
Create a string for private DNS "On"
...
The last private DNS settings screen landed in P after string
freeze, which led us to reuse R.string.switch_on_text for the
"on" text when private DNS is active. That string comes from
notifications. Private DNS should have its own string for this
instead.
Bug: 79122154
Test: 1. Build pass
2. make -j44 RunSettingsRoboTests \
ROBOTEST_FILTER=PrivateDnsPreferenceControllerTest
Change-Id: Ie013a858c8bc41e00a1b940d02efa2b605991685
2019-07-23 19:40:09 +08:00
Bill Yi
7d966975ad
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Bug: 64712476
Change-Id: I0369197f24082cadfbb6b3ac72d33243231090ac
2019-07-22 10:59:39 -07:00
Bill Yi
04a6245af9
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Bug: 64712476
Change-Id: If2b98e7c7fadad3c2fb18275ed458da76e9cc7ac
2019-07-22 10:37:18 -07:00
Bill Yi
efc7ac061c
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Bug: 64712476
Change-Id: I9ce6d671fe6587af26ea31b711da0d4594433ee6
2019-07-19 10:23:51 -07:00
