Pasty Chang
2e78fd7115
Merge "Change the color accent in setup AlertDialog for dark mode"
2020-12-28 03:43:49 +00:00
Jason Chiu
2133856853
Merge "Support contextual suggestion"
2020-12-28 02:44:22 +00:00
TreeHugger Robot
e40069772c
Merge "[Provider Model] Remove “Advanced” section"
2020-12-28 02:13:51 +00:00
Jason Chiu
bd854ccd10
Support contextual suggestion
...
- add a suggestion layout
- add an interface to get fragment in suggestion feature provider
- remove the first preference category of homepage IA to align its top
with the bottom of the search box
Bug: 173768418
Test: robotest
Change-Id: I784e3eef29ca474c4c89f07b916c6500fabbf7d4
2020-12-27 01:37:30 +08:00
TreeHugger Robot
45a8b37d3e
Merge "Import translations. DO NOT MERGE ANYWHERE"
2020-12-26 15:57:13 +00:00
Bill Yi
c57979a018
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I870bf29286f74794a5a7c73e5d7d2f905e0d6f64
2020-12-25 20:26:27 -08:00
Yanting Yang
3932b07365
Move Styles & wallpapers to the homepage group
...
- Add Styles & wallpapers to the homepage group.
- Create a new display settings xml for the silky home.
- Remove Styles & wallpapers from new display settings xml.
- Apply the RestrictedTopLevelPreference to remove the restricted icon.
Bug: 168166015
Bug: 174964139
Test: robotest & visual with turning on/off silky home
Change-Id: Ib495b39bc62413242247f7e767c0e44bacc6e937
2020-12-25 09:04:12 +00:00
Weng Su
eaa85b0b6c
[Provider Model] Remove “Advanced” section
...
- Screenshot:
https://screenshot.googleplex.com/bHB4RwhN9PBfWAF
Bug: 172788645
Test:
- manual test
- make RunSettingsRoboTests ROBOTEST_FILTER=ConfigureWifiSettingsTest
Change-Id: Id4c73911905830779004e407be9b01f4faac5268
2020-12-25 08:13:36 +00:00
pastychang
37e832873b
Change the color accent in setup AlertDialog for dark mode
...
It should set a dark color when enabling dark mode.
Bug: 176275212
Test: atest & manual
Change-Id: I2d860c52171299140ebcb77b08f7196d4a513d6b
2020-12-24 19:37:43 +08:00
TreeHugger Robot
d3c7666770
Merge "Remove the flaky Conditionals test."
2020-12-24 10:52:03 +00:00
TreeHugger Robot
9e42672a7a
Merge "Fix broken test"
2020-12-24 10:41:18 +00:00
Tsung-Mao Fang
0e0b1ce05c
Fix broken test
...
Test: Run robo test and pass
Fix: 176275647
Change-Id: Ia6809f9c3cf90b8f549770cfaee34918aa0769f8
2020-12-24 17:27:04 +08:00
Yi-Ling Chuang
54d84c56b5
Remove the flaky Conditionals test.
...
This test seems to be flaky for quite a while. The method tested runs
the check using a FutureTask which may sometimes hit the timeout issue,
so it seems not that suitable to do the test.
Fixes: 176274700
Test: robotest
Change-Id: I1bf979f4a792d76da01bfa82355ccf8f659dc6f8
2020-12-24 17:11:22 +08:00
Chloris Kuo
e30363463f
Merge "Feedback UI DeviceConfig"
2020-12-24 07:45:12 +00:00
SongFerng Wang
a12003a9ac
Merge changes from topic "Slice of Provider Model"
...
* changes:
Slice of Provider Model: add slice structure
The helper for slice of carrier and non-Carrier, used by ProviderModelSlice.
2020-12-23 18:47:15 +00:00
SongFerngWang
8cad0197bd
Slice of Provider Model: add slice structure
...
Implement a slice which can show/update carrier networks.
Before and after: go/b173971144screenshot
Bug: 173971144
Test: atest NetworkProviderWorkerTest (PASS)
atest ProviderModelSliceTest (PASS)
Change-Id: I3f0dab364c88723ef3185a2ff040b1fbd1b099f4
2020-12-23 17:47:45 +08:00
Chloris Kuo
43007847cf
Feedback UI DeviceConfig
...
Use ENABLE_NAS_FEEDBACK flag to decide if showing feedback UI setting
Bug: 175363481
Test: make RunSettingsRoboTests7
Change-Id: I969f9ca0b5d681345c022816e104926953f855dc
2020-12-22 22:09:28 -08:00
timhypeng
d41cb031c9
Remove intent filter of Output panel
...
-remove com.android.settings.panel.action.MEDIA_OUTPUT
-remove com.android.settings.panel.action.MEDIA_OUTPUT_GROUP
Bug: 170558292
Test: build pass
Change-Id: Ifb4f0a492e9ed7a5848035577cbc044d010bf5dc
2020-12-23 02:24:41 +00:00
Remi NGUYEN VAN
af1fbb77e3
Merge "Replace isWeaklyValidatedHostname with guava" am: 5cadac06b9
am: 1a57bfefb2
am: 82b5aac768
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1512667
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I4ad565433a6a167d658cb92b3977e5700dac840b
2020-12-23 02:22:35 +00:00
Remi NGUYEN VAN
82b5aac768
Merge "Replace isWeaklyValidatedHostname with guava" am: 5cadac06b9
am: 1a57bfefb2
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1512667
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I0d47ad22bfa3c226a6a61cb953aac104dabf4ccf
2020-12-23 02:07:04 +00:00
Remi NGUYEN VAN
1a57bfefb2
Merge "Replace isWeaklyValidatedHostname with guava" am: 5cadac06b9
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1512667
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I4fcb69612607a4375695664062f0bd891fc927ce
2020-12-23 01:37:12 +00:00
Remi NGUYEN VAN
5cadac06b9
Merge "Replace isWeaklyValidatedHostname with guava"
2020-12-23 01:19:27 +00:00
TreeHugger Robot
e29951ac56
Merge "Import translations. DO NOT MERGE ANYWHERE"
2020-12-22 20:33:46 +00:00
Bill Yi
dbfd4e959a
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 0c1be5d54b
-s ours am: 94db77cc3a
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13258199
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I8652a9eac3dda8bb225baf47ad76f50d7bd56e25
2020-12-22 19:42:09 +00:00
Bill Yi
94db77cc3a
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 0c1be5d54b
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13258199
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I7d03bf1c97923feb3f150dbfdcdd92d36f61ece3
2020-12-22 19:09:02 +00:00
Bill Yi
10e7b48ad2
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Ib84f2c025996d3ca8b6838b53549bac8cc22c2c7
2020-12-22 10:23:36 -08:00
Bill Yi
0c1be5d54b
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I85cdb72acedfc12b1536df9210643999e043a096
2020-12-22 08:48:39 -08:00
SongFerngWang
a97b4faa67
The helper for slice of carrier and non-Carrier, used by ProviderModelSlice.
...
create a helper file.
create a res/drawable/ic_signal_strength_zero_bar_no_internet.xml
create string at res/values/strings.xml
Bug: 173971144
Test: atest ProviderModelSliceHelperTest
Change-Id: I7f63a6b04784325989e776cb140017314ebde4ce
2020-12-22 21:50:40 +08:00
TreeHugger Robot
f63874f2b0
Merge "Update String"
2020-12-22 07:29:24 +00:00
Allen Su
fc41649147
Merge "Change carrier config" am: ba38382627
am: 3d9ede1815
am: 034b2236dd
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1512649
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I88fcda205e510641bc718d25b7f580e1c2d18648
2020-12-22 07:16:06 +00:00
tim peng
271384174f
Merge "Remove panel_slice_slider_row_large_icon.xml"
2020-12-22 06:32:48 +00:00
Hugh Chen
3354e9dc12
Update String
...
Remove brackets.
Bug: 176106404
Bug: 167403112
Test: build pass
Change-Id: Ib9a3c4fa3c6ea1ca54244d672bdc3e12d51a719f
2020-12-22 14:26:44 +08:00
timhypeng
e11b1e6ede
Remove panel_slice_slider_row_large_icon.xml
...
-unused resource
Bug: 175850711
Test: build pass
Change-Id: Ibf344d2c1e54f4aaaa945afbca46e278089e9e01
2020-12-22 04:41:44 +00:00
Jeremy Goldman
619a157b1d
Merge "Log added once Network Factory Reset is complete"
2020-12-22 03:12:18 +00:00
Allen Su
034b2236dd
Merge "Change carrier config" am: ba38382627
am: 3d9ede1815
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1512649
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I521b6e79f50ac9b7a6b5ecb72a6e4d8ad0a580dc
2020-12-22 01:35:07 +00:00
Allen Su
3d9ede1815
Merge "Change carrier config" am: ba38382627
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1512649
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I4ffdb49ee1dde44fd272632086c75963dffaed27
2020-12-22 01:04:35 +00:00
Jeremy Goldman
398a500ea7
Log added once Network Factory Reset is complete
...
Test: N/A log message
Change-Id: I1372b2b535c50a79a1253555975d85cd2ca2be31
2020-12-22 00:40:01 +00:00
Jeremy Goldman
6625f03eca
DeviceNamePreferenceControllerTest converted to JUnit
...
Rather than mocking the PreferenceScreen's getPreference function,
a PreferenceManager has been created, which instantiates the Screen.
The desired Preference is added to the Screen with the testing key.
Rather than using a shadow XML, contexts' resources are mocked.
A mock WifiManager is used instead of a shadow
Duplicate test case removed, and test which succeeds locally but
not on cuttlefish marked as ignored for now.
Bug: 175389659
Test: atest -c DeviceNamePreferenceControllerTest
Change-Id: I643b22993a1d102614fed1883af7f4925947be20
2020-12-22 00:38:33 +00:00
Allen Su
ba38382627
Merge "Change carrier config"
2020-12-22 00:26:52 +00:00
Jeremy Goldman
04eeb1e5e3
Merge "ModuleLicenseProviderTest converted to JUnit"
2020-12-21 07:38:51 +00:00
Jeremy Goldman
7d5483f6d7
Merge "Enhanced4gLteSliceHelper specifies immutable intent"
2020-12-21 07:25:30 +00:00
TreeHugger Robot
fd6645be76
Merge "[Provider Model] Add “Airplane-safe networks” icon"
2020-12-21 06:28:42 +00:00
Jeremy Goldman
8320f7459b
Merge "DataUsageSummaryPreferenceTest converted to JUnit"
2020-12-21 06:21:22 +00:00
tim peng
10ee127203
Merge changes Iecf987cc,Ibbbb9e78
...
* changes:
Remove unused variable
Remove MediaOutputPanel and MediaOutputSlice
2020-12-21 06:12:08 +00:00
Jeremy Goldman
50dd14d111
Enhanced4gLteSliceHelper specifies immutable intent
...
Bug: 172812686
Fixes: 172207848
Test: atest -c Enhanced4gLteSliceHelperTest
Change-Id: I1bfac82e3ce5c66639465befb0517839fb55415e
2020-12-21 05:41:01 +00:00
Jeremy Goldman
e068542f53
SimStatusDialogControllerTest converted to JUnit
...
Bug: 175389659
Test: atest -c SimStatusDialogControllerTest
Change-Id: Id2cfb01714f1756f9251b2319d83a1609488b0f6
2020-12-21 04:45:13 +00:00
Jeremy Goldman
ae03dd39da
DataUsageSummaryPreferenceTest converted to JUnit
...
There are couple of newly explored concepts in this CL, which will
hopefully be useful for migrating other tests in the future as well. In
broad strokes, the changes to this file cover:
Android build file species the preferences library, in order to access
PreferenceViewHolder.createInstanceForTests.
Resource ids in JUnit tests differ from the Settings apk. This is true
not only of strings but also views and layouts. Helper functions added
to main class to access the layouts needed by the test.
Shadow activities are not needed to view layouts, the context can be
used.
Context startActivity can be mocked and verified in order to capture and
examine the intent created by the library under test.
Bug: 175389659
Test: atest -c DataUsageSummaryPreferenceTest
Change-Id: Ib8cb87f0299c47a32c3f5d3af7edb20592b727ec
2020-12-21 12:39:02 +08:00
timhypeng
7c86980bf3
Remove unused variable
...
-remove VIEW_TYPE_SLIDER_LARGE_ICON
-remove MEDIA_OUTPUT_GROUP_SLICE_URI
-remove MEDIA_OUTPUT_SLICE_URI
Bug: 175850711
Test: build pass
Change-Id: Iecf987cc91934a7598762523814f5f575302dde2
2020-12-21 03:23:32 +00:00
Treehugger Robot
8fca3deb38
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 3d0be7ca05
-s ours am: 892c868c32
-s ours am: d957a89de0
-s ours
...
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1534258
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I7e58993eeb4229ec7ddf088778f37418584c9155
2020-12-20 19:52:59 +00:00
Treehugger Robot
061e34868a
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 5ae81b2084
-s ours am: b5a0cf9253
-s ours am: bfdcddcf09
-s ours
...
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1534238
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ie6c16a99aa5bd83a769a69973ca76b83279f12ed
2020-12-20 19:52:32 +00:00