Commit Graph

19288 Commits

Author SHA1 Message Date
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
Automerger Merge Worker
25b03c9930 Merge "Set the CHAR_LIMIT to 110 in order to support more translations." into rvc-dev am: 117995aec4
Change-Id: I05cbeae87709b99b0fb5a2b7864bbef6071353d9
2020-03-13 16:34:26 +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
Automerger Merge Worker
7e427ab997 Merge "Fix tests" into rvc-dev am: 6d8e0fed61 am: f08d965b53 am: 648fe31181 am: 053b614f70
Change-Id: Ia20cbab27b29416dd55923bfb993e4d91dab8059
2020-03-13 10:19:57 +00:00
Automerger Merge Worker
f08d965b53 Merge "Fix tests" into rvc-dev am: 6d8e0fed61
Change-Id: I76a1639f3530aee4c47fcc3cac1e01bfbe02aea5
2020-03-13 09:38:45 +00:00
TreeHugger Robot
6d8e0fed61 Merge "Fix tests" into rvc-dev 2020-03-13 09:27:16 +00:00
Stanley Wang
77b9d29b3a Merge "Update Settings strings for R." 2020-03-13 06:38:35 +00:00
Automerger Merge Worker
5616591d2b Merge "Use values-night to control the dark mode background color" into rvc-dev am: 89a6fafa33 am: 3f6c723044 am: 2c3ee203bf am: f2755520a1
Change-Id: Ia42aae3bf00ba46dfac23c2172d4d5abbee3ef7d
2020-03-13 04:14:44 +00:00
Automerger Merge Worker
3f6c723044 Merge "Use values-night to control the dark mode background color" into rvc-dev am: 89a6fafa33
Change-Id: Iee7a93a3c65d7bdb432937bcc5b81d2f3dd7fa45
2020-03-13 03:27:02 +00:00
TreeHugger Robot
89a6fafa33 Merge "Use values-night to control the dark mode background color" into rvc-dev 2020-03-13 03:13:27 +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
02a18bce16 Merge "Remove nested scrolling" into rvc-dev am: 4a1f517585 am: ed92f8425d am: 411f8fc4f9 am: 6c090cbd38
Change-Id: I1b269fba73b19b54b4f3d1f2296664b119a50aff
2020-03-13 00:50:37 +00:00
Automerger Merge Worker
ed92f8425d Merge "Remove nested scrolling" into rvc-dev am: 4a1f517585
Change-Id: I391dd964c025de214e6f59bee1a26a6e426de0ac
2020-03-12 21:53:58 +00:00
Julia Reynolds
49f40ee77b Fix tests
Fixing one of them by removing an unneeded setting

Test: RunSettingsRoboTests2
Fixes: 151279674
Change-Id: If2b513ba7b4bf8ec5183e2a9457caab3d3e06dc4
2020-03-12 17:27:35 -04:00
Julia Reynolds
a7a44fe058 Remove nested scrolling
Test: manual
Fixes: 151334452
Change-Id: I4d2f5eb268cda1e1a19187e2812fa026f44484f9
2020-03-12 15:20:39 -04:00
hughchen
728d63c014 Use values-night to control the dark mode background color
Bug: 149974597
Test: make -j42 RunSettingsRoboTests
Change-Id: Ia10f7bab0ec7781db8b4b4dbdf359bb8a87672cc
2020-03-12 19:47:44 +08: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
Automerger Merge Worker
c1059b0f25 Merge "Hide the 5G opiton when 5G has been disallowed" into rvc-dev am: 59f5eb638e
Change-Id: Ibb0d255c96279db485f4190c98b5fc854826f8a7
2020-03-12 06:39:18 +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
Automerger Merge Worker
4c69bcab70 Merge "Update R acessibility assets and strings (2/n)" into rvc-dev am: 873b50a46a
Change-Id: I80f8b6a996ec4006a225f63d5471ae7f70a2bcb4
2020-03-12 06:03:46 +00:00
Automerger Merge Worker
9e15dc3582 Merge "Update R acessibility assets and strings (1/n)" into rvc-dev am: 3fd654becb
Change-Id: Ib6deaaca23af6c8636e2861a011ff02d982c507b
2020-03-12 06:03:40 +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
Menghan Li
3fd654becb Merge "Update R acessibility assets and strings (1/n)" into rvc-dev 2020-03-12 05:37:19 +00:00
Automerger Merge Worker
73b3a58636 Merge "Remove search result for hidden magnification." into rvc-dev am: cbd5ec24d7 am: 61eb0791a3 am: 2776dbfa08 am: fa134a16ee
Change-Id: Ib3238204bc319c40b8b852f487e831a04fc5ccd7
2020-03-12 01:29:09 +00:00
Automerger Merge Worker
61eb0791a3 Merge "Remove search result for hidden magnification." into rvc-dev am: cbd5ec24d7
Change-Id: I4094a00c4bf9b04300243a8ff11984e95ac793c1
2020-03-12 00:40:12 +00:00
TreeHugger Robot
cbd5ec24d7 Merge "Remove search result for hidden magnification." into rvc-dev 2020-03-12 00:25:03 +00: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
Automerger Merge Worker
279d4d9983 Merge "Update empty state for apps bypassing dnd" into rvc-dev am: 79336396df
Change-Id: I0f8e5ce1eb3dd6358222c81eefeb622cc5bb3ca4
2020-03-11 20:47:43 +00:00
TreeHugger Robot
79336396df Merge "Update empty state for apps bypassing dnd" into rvc-dev 2020-03-11 20:33:15 +00:00
Automerger Merge Worker
7152f018fa Merge "Align help resource usage in caption preferences." into rvc-dev am: 91e5ece7ab
Change-Id: I54762e5a403b6879fb3aaf4f93ac8621a1d6dfed
2020-03-11 20:10:36 +00:00
Automerger Merge Worker
07fb084ce7 Merge "Align help resource usage in caption preferences." into rvc-dev am: 91e5ece7ab
Change-Id: I457fe332b417e991fe7e2625fef8f8f3c176daac
2020-03-11 20:09:21 +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
jasonwshsu
27d06ff502 Remove search result for hidden magnification.
* Use searchable = "false" to suppress search indexes.

Bug: 146019459
Test: manual test
Change-Id: I1188f201ddc9ec8d59faf2bcb549839c054f73bd
2020-03-11 21:58:25 +08: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
Automerger Merge Worker
fd3293d1db Merge "Tweak strings for assist app" into rvc-dev am: 16a7ba81f4
Change-Id: I2193e15b508b9c2c5186afb2afa186d8d3f690fd
2020-03-11 12:57:15 +00:00
Automerger Merge Worker
aeb13d1dd9 Merge "Tweak strings for assist app" into rvc-dev am: 16a7ba81f4
Change-Id: I2fbe22e43e922b97f23ebd08f7927730e035c1fa
2020-03-11 12:57:05 +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
Automerger Merge Worker
489d671497 Merge "[Wi-Fi] Add STA+AP information in Hotspot & tethering footer" into rvc-dev am: b8fb854e98
Change-Id: I26425ff7fa3413bc5cb3458843f643bb346696e5
2020-03-11 04:20:28 +00:00
Automerger Merge Worker
cb9cfc19c3 Merge "[Wi-Fi] Add STA+AP information in Hotspot & tethering footer" into rvc-dev am: b8fb854e98
Change-Id: I0764e99d5970a34f7cf3a01665870123151a94f5
2020-03-11 04:20:12 +00:00
Arc Wang
b8fb854e98 Merge "[Wi-Fi] Add STA+AP information in Hotspot & tethering footer" into rvc-dev 2020-03-11 04:00:49 +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