Android/packages_apps_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
61,895 Commits 1 Branch 0 Tags
436ca63246d56ae119042e3b0bfa02f3f1e057aa
Commit Graph

6313 Commits

Author SHA1 Message Date
TreeHugger Robot
b3729fb2be Merge "[5G settings UI] add String for the 5G limited VoLTE dialog" into rvc-dev am: 856079384a am: 8bc2aced91 am: 3d414fb9d4 am: dc5c1667a5 
Change-Id: I82e4fee9c04bac965cea99e8c0f5a61897258e9d
 2020-03-19 10:58:31 +00:00
TreeHugger Robot
856079384a Merge "[5G settings UI] add String for the 5G limited VoLTE dialog" into rvc-dev 2020-03-19 09:43:40 +00:00
TreeHugger Robot
1b03baa6e8 Merge "Tweak string for Display over other apps" into rvc-dev am: f210cf3c44 am: 4731f3c571 am: 33b978d2e7 am: 5d8e8ba402 
Change-Id: I1f36e941074a020c253793a3fc1b673c6216b9d9
 2020-03-19 08:50:41 +00:00
Tsung-Mao Fang
6f6e6810ae Tweak string for Display over other apps 
Fix: 144901996
Test: Visual
Change-Id: I5dacf8146130431624300d04421351a87ebd4d23
 2020-03-19 05:04:53 +00:00
Stanley Wang
3e56b9ddcc Update char limit of string "Notification dot on app icon" 
- The hightest needed character limit is at 48.
  Update char limit to 50.

Fixes: 151634666
Test: Rebuid Settings
Change-Id: I424cfe1519fbb2fef99a195428aa65bc7b5f8862
 2020-03-19 12:02:43 +08:00
SongFerngWang
4f0d7b3781 [5G settings UI] add String for the 5G limited VoLTE dialog 
while User disable VoLTE, UE show warning Dialog for 5G disable
add String for it.

Bug: 151313654
Test: build pass.
Change-Id: I2246664f1acbd2489dc3540486a7e1fa08d66656
 2020-03-19 11:17:45 +08:00
TreeHugger Robot
c114c5b59d Merge "Rename "Tap & pay" to "Contactless payments"" into rvc-dev 2020-03-19 02:36:55 +00:00
PETER LIANG
45c54d3dab Merge "Revise strings for tutorial improvement." into rvc-dev am: 76fb737beb am: 6acf430dfa am: bdf8412ec1 am: 829edadfaf 
Change-Id: I40954a198da22995bdefe2ff3fe1e3579e248b78
 2020-03-18 13:07:34 +00:00
PETER LIANG
76fb737beb Merge "Revise strings for tutorial improvement." into rvc-dev 2020-03-18 11:50:18 +00:00
robertluo
7f11d3f74a Rename "Tap & pay" to "Contactless payments" 
Fixes: 149270345
Test: manual and check if new string is applied
Change-Id: I412c5b5681a85d482541ae30faa13e904942b612
Merged-In: I412c5b5681a85d482541ae30faa13e904942b612
(cherry picked from commit 86a6cb8ead)
 2020-03-18 10:51:58 +00:00
Peter_Liang
8b411bfa55 Revise strings for tutorial improvement. 
Bug: 148989018
Test: manual test
Change-Id: I249c5ae896123b546b028c959cd1a5404008aec3
 2020-03-18 17:24:16 +08:00
robertluo
86a6cb8ead Rename "Tap & pay" to "Contactless payments" 
Fixes: 149270345
Test: manual and check if new string is applied
Change-Id: I412c5b5681a85d482541ae30faa13e904942b612
 2020-03-18 14:57:39 +08:00
Menghan Li
e3b6dffbc6 Merge "Update R accessibility assets and strings (5/n)" into rvc-dev am: a56e57eaa4 am: 1b14eb0eef am: 286d6ac7dc am: 23627fad2b 
Change-Id: I356f7ed0d558df34f9dd63299efd8372dcd980bc
 2020-03-18 01:45:59 +00:00
Menghan Li
a56e57eaa4 Merge "Update R accessibility assets and strings (5/n)" into rvc-dev 2020-03-18 00:50:43 +00:00
Automerger Merge Worker
1fc0e49ca0 Merge "Fix strings for certificate installation in Settings" into rvc-dev am: e61aaaab51 am: 2779662793 am: 71a49d8c8b am: c41ada31ec 
Change-Id: I6b5c079028efebfa1a82863209d41f4fcf4bde85
 2020-03-17 16:33:10 +00:00
Alex Johnston
e61aaaab51 Merge "Fix strings for certificate installation in Settings" into rvc-dev 2020-03-17 15:07:18 +00:00
menghanli
d1adcc61a2 Update R accessibility assets and strings (5/n) 
- Magnification rich content
- Color inversion rich content

Bug: 148837311
Test: Manual test
Change-Id: I4dc52aa00f22cba9cea0c91be3af0b9cb7093182
 2020-03-17 21:12:15 +08:00
Alex Johnston
79e66ffafe Fix strings for certificate installation in Settings 
Certificates privacy page
* Changed 'Your privacy is at risk' to
  'Your data won't be private'.
* Change 'information' to 'data'.
* Changed 'Install anyways' to
  'Install anyways'.

Can't install certificate dialog
* Changed 'Can't install certificates'
  to 'Can't use this file'.

Bug: 151303108
Test: Manual testing
Change-Id: Ia66ff7210ae77204fa2e59f3264f5c799cc47436
 2020-03-17 10:05:28 +00:00
Automerger Merge Worker
8c7425973d Merge "Update NLS/NAS warning text" into rvc-dev am: 6c9cad2caf am: 7486f6a010 am: 8965b8677b am: 3ef781bae5 
Change-Id: I7d767aff435a3a4ce2eec7c878d91a2272309c94
 2020-03-16 19:08:13 +00:00
TreeHugger Robot
6c9cad2caf Merge "Update NLS/NAS warning text" into rvc-dev 2020-03-16 18:10:09 +00:00
Automerger Merge Worker
6c037d9841 Merge "Update strings for Screen Attention suggestion." into rvc-dev am: b94605c378 am: a692d719cb am: 1019cb702d am: d55db3a65a 
Change-Id: I78669a2be27c35fe2c70a7b5855c45ea45fa07bf
 2020-03-16 14:33:27 +00:00
Julia Reynolds
68fad762ff Update NLS/NAS warning text 
Test: manual
Fixes: 145129456
Change-Id: Ie3e7ecb432445c596d888614ae71cff27873ac6b
 2020-03-16 09:30:10 -04:00
Yi-Ling Chuang
f288a4ec53 Update strings for Screen Attention suggestion. 
Bug: 144865404
Test: rebuild
Change-Id: Id5ab9a68a5f83c6fdc6451b96d8e7bfd831891d1
 2020-03-16 17:54:39 +08:00
Automerger Merge Worker
63067d9e40 Merge "Blur developer setting" into rvc-dev am: 59b3974433 am: 148b737ef2 am: 386b605c61 am: a5fd9a5a44 
Change-Id: If700d215220a17fb3c7d8617c680a080e485e732
 2020-03-16 00:38:51 +00:00
Lucas Dupin
59b3974433 Merge "Blur developer setting" into rvc-dev 2020-03-15 23:28:13 +00:00
Automerger Merge Worker
f0f8eb656a Merge "Set the CHAR_LIMIT to 110 in order to support more translations." into rvc-dev am: 117995aec4 am: 25b03c9930 am: d398a581d0 am: cd51d3d98c 
Change-Id: Ia1e43214da4aad148a62f71e6ae9a797efc541b1
 2020-03-13 17:12:45 +00:00
Brad Ebinger
117995aec4 Merge "Set the CHAR_LIMIT to 110 in order to support more translations." into rvc-dev 2020-03-13 16:23:10 +00:00
Stanley Wang
77b9d29b3a Merge "Update Settings strings for R." 2020-03-13 06:38:35 +00:00
Stanley Wang
8694c34e09 Update Settings strings for R. 
Bugs: 143267842
Test: Rebuilt rom and saw different screens.
Change-Id: Id2d89287fe36240d71de2092daac44a5da9be282
 2020-03-13 10:37:07 +08:00
Brad Ebinger
95aeac6790 Set the CHAR_LIMIT to 110 in order to support more translations. 
Increase the CHAR_LIMIT for contact_discovery_opt_in_summary.

Fixes: 150941009
Test: manual
Change-Id: Ia71c87b47ed8b5b738f6d5a9b2693e7943f6797c
 2020-03-12 18:15:54 -07:00
Automerger Merge Worker
816f3b693c Merge "Hide the 5G opiton when 5G has been disallowed" into rvc-dev am: 59f5eb638e am: c1059b0f25 am: 977a698823 am: ab91b6fc7d 
Change-Id: I7ce1b6483994e8571d50c77e45ff0bc60e3fe4e4
 2020-03-12 07:24:10 +00:00
Automerger Merge Worker
01233f2fc2 Merge "Update R acessibility assets and strings (2/n)" into rvc-dev am: 873b50a46a am: 4c69bcab70 am: 5ed8894807 am: e5be54a8f4 
Change-Id: I31126710d4b2085711992fcb3da0ffef6e804a23
 2020-03-12 06:43:06 +00:00
Automerger Merge Worker
e673cc176f Merge "Update R acessibility assets and strings (1/n)" into rvc-dev am: 3fd654becb am: 9e15dc3582 am: d137a12391 am: 81f18805dd 
Change-Id: I7aa20264dced48447aa8ee8466b4f5e03b69bda3
 2020-03-12 06:42:26 +00:00
Calvin Pan
59f5eb638e Merge "Hide the 5G opiton when 5G has been disallowed" into rvc-dev 2020-03-12 06:25:11 +00:00
Menghan Li
873b50a46a Merge "Update R acessibility assets and strings (2/n)" into rvc-dev 2020-03-12 05:37:32 +00:00
Lucas Dupin
249d80ec7b Blur developer setting 
New dev-option for enabling and disabling blurs, on devices that support
it.

Bug: 149792636
Test: manual
Test: atest EnableBlursPreferenceControllerTest
Change-Id: I26b4739a7b811c461557316a9247f6a9c397048a
 2020-03-11 18:17:46 -07:00
menghanli
a248e0e6d5 Update R acessibility assets and strings (1/n) 
- Color correction
- Color inversion
- Magnification
- Dwell
- Caption preferences
- Allow shortcut from lockscreen

Bug: 148837311
Test: Manual test
Change-Id: I1f5ff3bcbf53dab508311bcea3712ad2b30898eb
 2020-03-12 07:18:58 +08:00
Automerger Merge Worker
a8b0106e27 Merge "Update empty state for apps bypassing dnd" into rvc-dev am: 79336396df am: 279d4d9983 am: f0034eb4ed am: bbe24da6a1 
Change-Id: I86cb18b1a8b18fb0270807cdbf8a9884547853e6
 2020-03-11 21:22:05 +00:00
Automerger Merge Worker
5df2b2f142 Merge "Align help resource usage in caption preferences." into rvc-dev am: 91e5ece7ab am: 07fb084ce7 am: bfa63c5fbd am: 87b44ea9da 
Change-Id: I887ce0220886c085531c0e484373e2976865518a
 2020-03-11 20:49:45 +00:00
TreeHugger Robot
79336396df Merge "Update empty state for apps bypassing dnd" into rvc-dev 2020-03-11 20:33:15 +00:00
Julia Reynolds
44b5b7c575 Update empty state for apps bypassing dnd 
Test: atest
Fixes: 150346679
Change-Id: Iccc5f1fb3dd7ee2c114f8757a020833b3b41e91d
 2020-03-11 18:09:47 +00:00
Jason Hsu
91e5ece7ab Merge "Align help resource usage in caption preferences." into rvc-dev 2020-03-11 17:47:16 +00:00
Automerger Merge Worker
2a12dc8e4b Merge "Tweak strings for assist app" into rvc-dev am: 16a7ba81f4 am: aeb13d1dd9 am: 3b61fd3975 am: 6649dfb85e 
Change-Id: Iaa7aef6ecbdea77643bc29ae9493ac530a93ff0a
 2020-03-11 13:54:06 +00:00
Tsung-Mao Fang
a5da81db36 Tweak strings for assist app 
Follow up the new Assist app string updates.

Bug: 151193605
Test: build and see this page.
Change-Id: Ibbc51cd282c6ae0f9ef1722c33688f21e0c78da7
 2020-03-11 10:22:09 +00:00
menghanli
19cf6ddff8 Update R acessibility assets and strings (2/n) 
- Temporary-use template summary by shortcut state

Bug: 148837311
Test: Manual test
Change-Id: Ia720b8f3f317bb1874d6758ebc4fbf4145d0c217
 2020-03-11 17:21:27 +08:00
Automerger Merge Worker
bb1deeca73 Merge "[Wi-Fi] Add STA+AP information in Hotspot & tethering footer" into rvc-dev am: b8fb854e98 am: cb9cfc19c3 am: 570ec6a4a1 am: 99974b69db 
Change-Id: I4a70e6fb297ea12873dc7b71f4bb1de3bafb703d
 2020-03-11 05:08:29 +00:00
calvinpan
75867d8f63 Hide the 5G opiton when 5G has been disallowed 
1. Create PreferenceEntriesBuilder for 5G entry. In the past, the
preferred network type entries was based on CarrierConfigManger value
but 5G option is based on allowed netowork type and device access
family, so include 4G and 5G logic in PreferenceEntriesBuilder.

2. If user selected item not in preferred network option, settings will
auto selected on the first item. For example, if user selected on 5G and
device disallowed 5G(5G option will be hide), so settings will selected
on first item(4G).

Bug: 149721842
Test: EnabledNetworkModePreferenceControllerTest

Change-Id: Ic447a137f9db4cf1a0048a8e58487c29b402bb48
 2020-03-10 10:23:43 +00:00
Arc Wang
005fe6951c [Wi-Fi] Add STA+AP information in Hotspot & tethering footer 
Use WifiManager#isStaApConcurrencySupported() to check if a
device supports STA+AP and shows the footer information.

Bug: 121328949
Test: make RunSettingsRoboTests ROBOTEST_FILTER=TetherSettingsTest
      make RunSettingsRoboTests ROBOTEST_FILTER=WifiTetherFooterPreferenceControllerTest
Change-Id: I3446abb5cc9cdf76da8d17f5de31bd65715c165c
 2020-03-10 18:15:13 +08:00
Automerger Merge Worker
a2b813995e Merge "Add string for output switcher transferring state" into rvc-dev am: c241e434d5 am: 83fb76a7fd am: daf3235a45 am: 7f80142280 
Change-Id: Ib1e9c9f8ccf718a0f10800a69d89c420bebb6bd3
 2020-03-06 14:59:44 +00:00
Tim Peng
bd56ef94d2 Add string for output switcher transferring state 
Bug: 150903460
Test: manual
Change-Id: Iaebe013e891300f3275ff551e79e3298e55e21c4
 2020-03-06 13:14:07 +08:00