Commit Graph

19346 Commits

Author SHA1 Message Date
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
Edgar Wang
71099e7a54 Remove duplicated index search data
Bug: 143055215
Test: manual & robotest
Change-Id: I82583efe37c44014b8949a40d7a695461a7382a9
2020-03-10 19:47:40 +08: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
70ce4b94b8 Merge "Change sticky card UI back to homepage card style" into rvc-dev am: e5110e9388 am: f6a24c2596 am: fa923a5e37 am: 0f2e2a664c
Change-Id: Ia1f4e16be17426e968503011d0a52ad8ff5aeab6
2020-03-10 09:14:34 +00:00
Automerger Merge Worker
f6a24c2596 Merge "Change sticky card UI back to homepage card style" into rvc-dev am: e5110e9388
Change-Id: I55dc5ee5c67bbb270278fb7f66a70121e46d21a0
2020-03-10 08:30:41 +00:00
Automerger Merge Worker
cbc146d3f4 Merge "Change sticky card UI back to homepage card style" into rvc-dev am: e5110e9388
Change-Id: I8c47d8c3dea5b3f816facdc4775d8653fc0c01d6
2020-03-10 08:26:07 +00:00
Automerger Merge Worker
03a454ade9 Merge "Adjust layout for Slice InputRange" into rvc-dev am: af4d55e7dd am: 84fb219cb0 am: 06982417ce am: 23d71554e5
Change-Id: I703002438e51a00acfd1a7f384fb7dd6d6d7262e
2020-03-10 04:19:16 +00:00
Automerger Merge Worker
a6b501c926 Merge "Adjust layout for Slice InputRange" into rvc-dev am: af4d55e7dd
Change-Id: I54caf734aa1e1e43ac5d85c5bdcc736cbcc75aff
2020-03-10 03:21:11 +00:00
Automerger Merge Worker
84fb219cb0 Merge "Adjust layout for Slice InputRange" into rvc-dev am: af4d55e7dd
Change-Id: I7bf33f1505ca0ec580b557313b72f934b1f484c5
2020-03-10 03:20:57 +00:00
Jason Chiu
b85cfc812b Change sticky card UI back to homepage card style
Fixes: 149371123
Test: visual
Change-Id: Ie1c2bc7b806b818000e9a2e88753f9904a3f30f4
2020-03-10 11:17:28 +08:00
tim peng
af4d55e7dd Merge "Adjust layout for Slice InputRange" into rvc-dev 2020-03-10 03:04:26 +00:00
TreeHugger Robot
ea0486eef9 Merge "Import translations. DO NOT MERGE" into rvc-dev 2020-03-09 23:08:03 +00:00
Bill Yi
71f3db68d3 Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Change-Id: I32bc5208c091da730f40937649dfacb4e91b0eed
2020-03-09 13:47:15 -07:00
Tim Peng
db7d61d0a2 Adjust layout for Slice InputRange
-Make title to slider aligned
-Add test cases

Bug: 147462114
Test: make -j50 RunSettingsRoboTests
Change-Id: Ib1d076f77eae75e4f861a80873117b6254729fe5
2020-03-09 21:50:58 +08:00
Automerger Merge Worker
6c96993e25 Merge "ShortcutPreference Toggle design (2/n)" into rvc-dev am: 42dcad9b2b am: 888ebb0dbb am: 6a6d437ffb am: 538ab8c28b
Change-Id: I16eb36a8ef7d74b8015fec7221f8047e1db51011
2020-03-09 08:46:54 +00:00
Automerger Merge Worker
0571803b3e Merge "ShortcutPreference Toggle design (2/n)" into rvc-dev am: 42dcad9b2b
Change-Id: I1aee655c4001e52f3af2ffe8b22c3edb615acee0
2020-03-09 08:20:59 +00:00
Automerger Merge Worker
888ebb0dbb Merge "ShortcutPreference Toggle design (2/n)" into rvc-dev am: 42dcad9b2b
Change-Id: I2e0c16d8c8e0d593737f52afa97b65a9d474c1d1
2020-03-09 08:20:23 +00:00
Menghan Li
42dcad9b2b Merge "ShortcutPreference Toggle design (2/n)" into rvc-dev 2020-03-09 08:01:56 +00:00
Bill Yi
9ce0e0ca55 Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Change-Id: I7966ad0beaa4bde063f8fc3ec17ce152b9acb3ac
2020-03-07 22:06:24 -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
Automerger Merge Worker
ba597a6f39 Merge "Add string for output switcher transferring state" into rvc-dev am: c241e434d5
Change-Id: I6c363e7a541aa37d77897466fac1e188be9283cc
2020-03-06 14:23:13 +00:00
Automerger Merge Worker
83fb76a7fd Merge "Add string for output switcher transferring state" into rvc-dev am: c241e434d5
Change-Id: I02c0925b503b7adb1d68c553eccb8c1f07a4d5e5
2020-03-06 14:17:42 +00:00
tim peng
c241e434d5 Merge "Add string for output switcher transferring state" into rvc-dev 2020-03-06 14:08:28 +00:00
Automerger Merge Worker
abbb4ee257 Merge "Update edit shortcut dialog measurements and assets." into rvc-dev am: b6ab224ddb
Change-Id: I71aa23a4d507d3266e096cec04c22a706ba2eb0a
2020-03-06 10:24:09 +00:00
menghanli
5d7083a103 ShortcutPreference Toggle design (2/n)
- Removes edit shortcut disable condition.
- Shows "off" if user removes all items in edit dialog.
- Restores last time what user chosen options when show edit dialog.

Bug: 148989269
Test: Manually test
Change-Id: I105abda782999d38c92e3de9811e2fd378869e73
2020-03-06 18:02:53 +08:00
Automerger Merge Worker
512cc0fc8d Merge "Update edit shortcut dialog measurements and assets." into rvc-dev am: b6ab224ddb am: 696d25adf0 am: 5b97ecf287 am: 223199e10c
Change-Id: I0050be30c56fb5218d474f307d44545b452a49a6
2020-03-06 09:11:03 +00:00
Automerger Merge Worker
696d25adf0 Merge "Update edit shortcut dialog measurements and assets." into rvc-dev am: b6ab224ddb
Change-Id: Ib3566a792f6d8671e4b4e84f64ed67f4c27eed86
2020-03-06 08:23:30 +00:00
Menghan Li
b6ab224ddb Merge "Update edit shortcut dialog measurements and assets." into rvc-dev 2020-03-06 08:01:59 +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
menghanli
fd5143751e Update edit shortcut dialog measurements and assets.
Bug: 148837311
Test: Manual test
Change-Id: I0c018f3f39e43657cbbd45734846213c9964a268
2020-03-05 22:32:33 +08:00
jasonwshsu
0259f84c5f Align help resource usage in caption preferences.
* Add string to get the help page intent

Bug: 149887377
Test: manual test
Change-Id: I15b9c4edd260153aa929d68845faed0af16a4ffa
2020-03-05 21:02:47 +08:00
Automerger Merge Worker
4d2845f3c4 String change on Storage page am: b7a3c9a8c6 am: f3adfad699 am: 5fcf5bae8d am: ae768eeeb9
Change-Id: I460ec46e1de5617af5952367880515f459d61506
2020-03-05 12:30:20 +00:00
Automerger Merge Worker
b7fedbde23 String change on Storage page am: b7a3c9a8c6
Change-Id: Ib41098cad76e8f35cb96c1297a44286ec206683c
2020-03-05 11:45:30 +00:00
Automerger Merge Worker
f3adfad699 String change on Storage page am: b7a3c9a8c6
Change-Id: Iab4ceef706eb5f2ce9271d5cb188a70d89eeb3ef
2020-03-05 11:45:21 +00:00
Tsung-Mao Fang
b7a3c9a8c6 String change on Storage page
The string of the CTA under "Settings > Storage" from "Free up space" to
"Manage storage" to match the new ux flow.

Test: visual
Fix: 150782402
Change-Id: Ic636d73b92f11f6f332475d591ff92633083bc85
2020-03-05 08:45:03 +00:00
TreeHugger Robot
b79218f56d Merge "Import translations. DO NOT MERGE" into rvc-dev 2020-03-04 20:59:22 +00:00
TreeHugger Robot
5c7c573a83 Merge "Import translations. DO NOT MERGE" 2020-03-04 20:32:39 +00:00
Automerger Merge Worker
4a92db602c Merge "Add new DialogFragment and Controller for capability discovery opt-in" into rvc-dev am: 6bdf1393f8 am: fe6755ec7f am: 57e5809c32 am: cf282bf658
Change-Id: I22a2016e153fabe5696b6517baeca84018fdbfee
2020-03-04 19:28:58 +00:00
Brad Ebinger
6bdf1393f8 Merge "Add new DialogFragment and Controller for capability discovery opt-in" into rvc-dev 2020-03-04 18:05:25 +00:00
Automerger Merge Worker
191371fdc8 Merge "Fix double scroller of App info page" into rvc-dev am: 0ab87cce3d am: 85b274b6c9 am: c480a5a219 am: 0c601ed9ca
Change-Id: I967e431deaa99ba0a57bbd679f0cea89deafbaaa
2020-03-04 07:56:29 +00:00
Yanting Yang
0ab87cce3d Merge "Fix double scroller of App info page" into rvc-dev 2020-03-04 06:51:19 +00:00
Brad Ebinger
66c709844a Add new DialogFragment and Controller for capability discovery opt-in
Adds a new controller to monitor the capability discovery opt-in
setting as well as a new DialogFragment, which displays a dialog
providing the user with more information before they enable the
setting.

Also removes multiple updateSubscriptions() happening when the
activity is first created from onStart() and onChanged() callbacks.

Bug: 111305845
Test: manual
Change-Id: I70821964bc618c3c389c9039cd7f5028e34c7ebb
2020-03-03 19:39:27 -08:00
Bill Yi
65ad469136 Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Change-Id: I78654f59453a732ad46a34331b96d38e9dc809a0
2020-03-03 18:14:07 -08:00
Automerger Merge Worker
7d1749cb78 Merge "Add string for output switcher transferring error" into rvc-dev am: 8c07f06cd5 am: 9aebc16b6a am: 0d7209e303 am: 8ae78e19a9
Change-Id: I5da69404be6bda5c9c462b10d8e7e8ad5019edb0
2020-03-04 01:56:34 +00:00
tim peng
8c07f06cd5 Merge "Add string for output switcher transferring error" into rvc-dev 2020-03-04 00:55:01 +00:00
Bill Yi
c9c26bbf16 Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Change-Id: I56b916035bb380b13205e3b2d9319257ccbf8c42
2020-03-03 16:18:08 -08:00