Commit Graph

78282 Commits

Author SHA1 Message Date
Weng Su
3667fff3d7 [automerger skipped] Fix the Wi-Fi detailed settings un-editable issue. am: f914e34d28 am: 8f8348dc7b -s ours am: 68805fd1c6 -s ours
am skip reason: Change-Id I567b2b80163631a01d165c0ac5c0aba392e014ef with SHA-1 3a45d054eb is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12894947

Change-Id: I82ae92fd7132041cf799b56122a9cd4620a732fa
2020-10-23 14:52:24 +00:00
Julia Reynolds
cd08db8684 Merge "Add 'Recent Conversations' to the conversation page" am: 5ff16e18e2
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12886794

Change-Id: I27b7a2262c905cc4eef1e6c1a3565f153442cfe2
2020-10-23 14:41:59 +00:00
Weng Su
68805fd1c6 [automerger skipped] Fix the Wi-Fi detailed settings un-editable issue. am: f914e34d28 am: 8f8348dc7b -s ours
am skip reason: Change-Id I567b2b80163631a01d165c0ac5c0aba392e014ef with SHA-1 3a45d054eb is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12894947

Change-Id: I2f8617e190a6fe7281ff189e72c569a2dc4790e6
2020-10-23 14:36:54 +00:00
Julia Reynolds
5ff16e18e2 Merge "Add 'Recent Conversations' to the conversation page" 2020-10-23 14:35:46 +00:00
Weng Su
8f8348dc7b Fix the Wi-Fi detailed settings un-editable issue. am: f914e34d28
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12894947

Change-Id: I60460fb5f945eab4d70e28d47868d611b9c564da
2020-10-23 14:25:53 +00:00
Jeremy Goldman
77f5ae6dc7 Only display options to save and cancel edits to the displayed APN if the APN is editable.
Test: mp settingsg and look at the UI. This class does not yet have
tests.

Current design:
 - https://screenshot.googleplex.com/BgrLPsz3ebxBnMa
 - https://screenshot.googleplex.com/AeRQe6Rh8SxjjMw

Updated design: https://screenshot.googleplex.com/3bhmWwMjhEXh2Eu

Change-Id: Ic9794ca14534adde92a641560a00b1bd876d52cb
2020-10-23 13:04:18 +00:00
Tsung-Mao Fang
623347bd65 Tweak the margin and corner of search bar
Bug: 171278055
Test: See the screen(https://screenshot.googleplex.com/6sz5wftU9A7qysd)
Change-Id: Ib9ab5a68ff375b3e68a8a10151155f55b3b56a11
2020-10-23 18:15:55 +08:00
Neil Fuller
a022188434 Merge "Changes to location settings for geotz" am: c91bcbd0d5
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12792958

Change-Id: I1e103535c8f70c3f8050059c3827240f9d2fadd5
2020-10-23 09:45:43 +00:00
Neil Fuller
c91bcbd0d5 Merge "Changes to location settings for geotz" 2020-10-23 09:40:45 +00:00
Neil Fuller
42b9adf508 Merge changes I868d1912,Id483ca41 am: f418b7a968
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12901360

Change-Id: Ibf6c37c61dd1fb0fc4930ffb2d33e7e986275ebf
2020-10-23 09:38:21 +00:00
Neil Fuller
f418b7a968 Merge changes I868d1912,Id483ca41
* changes:
  Fix search test using location_settings
  Revert "Stop search tests using location_settings"
2020-10-23 09:24:43 +00:00
Automerger Merge Worker
a604fa0a45 [automerger skipped] Merge "Merge "Replace TelephonyManager methods for mobile data" am: c2a4d3ec70" into stage-aosp-master am: bab12d1aa2 -s ours am: 08d2eab4e5 -s ours am: 84e3413f34 -s ours am: 8bc72db829 -s ours
am skip reason: Change-Id I7ebae37373d53fb2c59b6b546232dbddf77398d4 with SHA-1 d67a1c3d8e is in history

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1470180

Change-Id: I382a97e89a8a953d1152e13c395c2bdd13287d5b
2020-10-22 23:04:15 +00:00
Hall Liu
b2410235a6 [automerger skipped] Merge "Replace TelephonyManager methods for mobile data" am: c2a4d3ec70 am: 4af7d6a7d2 am: d51ee68578 am: 9146943bb5 -s ours am: 585f89487a -s ours
am skip reason: Change-Id I7ebae37373d53fb2c59b6b546232dbddf77398d4 with SHA-1 d67a1c3d8e is in history

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1470180

Change-Id: I9939ed3ecdd6994f6c5ccc74d70e7d0c54227ef2
2020-10-22 23:02:12 +00:00
Automerger Merge Worker
8bc72db829 [automerger skipped] Merge "Merge "Replace TelephonyManager methods for mobile data" am: c2a4d3ec70" into stage-aosp-master am: bab12d1aa2 -s ours am: 08d2eab4e5 -s ours am: 84e3413f34 -s ours
am skip reason: Change-Id I7ebae37373d53fb2c59b6b546232dbddf77398d4 with SHA-1 d67a1c3d8e is in history

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1470180

Change-Id: I5673b4a940d42a836411de30161d9cb0bf37b01e
2020-10-22 22:49:22 +00:00
Hall Liu
585f89487a [automerger skipped] Merge "Replace TelephonyManager methods for mobile data" am: c2a4d3ec70 am: 4af7d6a7d2 am: d51ee68578 am: 9146943bb5 -s ours
am skip reason: Change-Id I7ebae37373d53fb2c59b6b546232dbddf77398d4 with SHA-1 d67a1c3d8e is in history

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1470180

Change-Id: If14ba0fec1643ab4538f7d008e030ccb53453a44
2020-10-22 22:46:27 +00:00
Automerger Merge Worker
84e3413f34 [automerger skipped] Merge "Merge "Replace TelephonyManager methods for mobile data" am: c2a4d3ec70" into stage-aosp-master am: bab12d1aa2 -s ours am: 08d2eab4e5 -s ours
am skip reason: Change-Id I7ebae37373d53fb2c59b6b546232dbddf77398d4 with SHA-1 17ba8166a3 is in history

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1470180

Change-Id: Idb369344a998f57035a5e49ffdbab5e0bb000cd3
2020-10-22 22:24:27 +00:00
Hall Liu
9146943bb5 Merge "Replace TelephonyManager methods for mobile data" am: c2a4d3ec70 am: 4af7d6a7d2 am: d51ee68578
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1470180

Change-Id: I9c1496152155d3db0bd4c29502e7d43f6335ee86
2020-10-22 22:22:47 +00:00
Automerger Merge Worker
08d2eab4e5 [automerger skipped] Merge "Merge "Replace TelephonyManager methods for mobile data" am: c2a4d3ec70" into stage-aosp-master am: bab12d1aa2 -s ours
am skip reason: Change-Id I7ebae37373d53fb2c59b6b546232dbddf77398d4 with SHA-1 17ba8166a3 is in history

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1470180

Change-Id: I6803f4fbde2b7ae9f6635ce4040f4d085900b56f
2020-10-22 21:51:48 +00:00
Hall Liu
d51ee68578 Merge "Replace TelephonyManager methods for mobile data" am: c2a4d3ec70 am: 4af7d6a7d2
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1470180

Change-Id: I6ad3c840463bcb070769e9d91b2671d09f359369
2020-10-22 21:49:15 +00:00
Automerger Merge Worker
bab12d1aa2 Merge "Merge "Replace TelephonyManager methods for mobile data" am: c2a4d3ec70" into stage-aosp-master 2020-10-22 21:35:15 +00:00
Hall Liu
5a5e0e021d Merge "Replace TelephonyManager methods for mobile data" am: c2a4d3ec70
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1470180

Change-Id: I31b5513de4f5f9985f44ce124e4f0eea83ec107f
2020-10-22 21:19:11 +00:00
Hall Liu
4af7d6a7d2 Merge "Replace TelephonyManager methods for mobile data" am: c2a4d3ec70
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1470180

Change-Id: I02440f0bc76eea3d66526e7c1d02343893603cab
2020-10-22 21:14:05 +00:00
Sally Yuen
f44168d8b9 Merge changes from topic "a11y_rbc" am: 4bca97c3cc
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12865322

Change-Id: I3c5c00d9086d6b07df22309341f23b190f652834
2020-10-22 19:04:21 +00:00
Sally Yuen
4bca97c3cc Merge changes from topic "a11y_rbc"
* changes:
  Add activity for directly navigating to Reduce Bright Colors setting page
  Add a setting page for Reduce Bright Colors under A11y
2020-10-22 18:20:25 +00:00
Hall Liu
c2a4d3ec70 Merge "Replace TelephonyManager methods for mobile data" 2020-10-22 17:27:59 +00:00
TreeHugger Robot
1fa81393c1 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 190a1a47d7 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12901035

Change-Id: Ib0b9d6cc3912595bbfecc2141c3be29850bf0340
2020-10-22 15:59:48 +00:00
TreeHugger Robot
d1d1103c75 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: a42e2f1c35 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12900091

Change-Id: Id28c20f97f5efeb2aa5aed85ea993b02a130e2f7
2020-10-22 15:59:40 +00:00
TreeHugger Robot
190a1a47d7 Merge "Import translations. DO NOT MERGE ANYWHERE" 2020-10-22 15:48:49 +00:00
TreeHugger Robot
a42e2f1c35 Merge "Import translations. DO NOT MERGE ANYWHERE" 2020-10-22 15:30:37 +00:00
Neil Fuller
4a6663c10a Changes to location settings for geotz
This change adds a new entry for geolocation-based time zone detection
(shorthand: "geotz") to the location settings.

The UI code uses information retrieved via the TimeManager API to keep
the conditional logic in one place, i.e. to avoid the UI needing to know
too much about the various conditions that affect the availability /
applicability of the toggle.

Screen variations / conditions / other info:

Location settings screen:

1) The entry only shows up on a device at all if geotz detection is
enabled for the device (currently a compile time setting, off by
default).
2) The new entry is hidden on the screen when the user first opens it.
To see it, the user has to expand "Advanced". The setting is in the
shared (non-GMS) section of the screen.
3) When visible, the entry has a summary that shows the current status:
either a reason why the setting is not applicable, or the user's current
setting value.
4) Selecting the entry opens a sub-screen.

The code included here distinguishes between different cases with the
summary message (i.e. the text underneath the entry). See strings.xml
for the placeholder text. Some strings will not show up currently, but
are included in case the rules change as they are valid possibilities
from the TimeManager API.

The same changes have been made for the "personal" tab when a work
profile is enabled.

Location Time Zone Detection settings screen:

1) The toggle is always enabled and always shows the user's current
configuration setting.

All manual tests run with the geotz feature enabled with:

adb shell setprop \
    persist.sys.location_time_zone_detection_feature_enabled 1

Bug: 152746236
Test: Manual: build / boot / toggle switch in SettingsUI / inspect output of adb shell dumpsys time_zone_detector
Test: Manual: build / boot / install TestDPC / toggle switch in work profile in SettingsUI / inspect output of adb shell dumpsys time_zone_detector
Test: m -j30 RunSettingsRoboTests ROBOTEST_FILTER="com.android.settings.location.TimeZoneDetectionPreferenceControllerTest"
Test: m -j30 RunSettingsRoboTests ROBOTEST_FILTER="com.android.settings.location.LocationTimeZoneDetectionPreferenceControllerTest"
Test: m -j30 RunSettingsRoboTests ROBOTEST_FILTER="com.android.settings.location.TimeZoneDetectionSettingsTest"
Change-Id: Ia853d30bc54a113000b30f48776418f262d98358
2020-10-22 15:48:55 +01:00
Neil Fuller
94a64d6139 Fix search test using location_settings
Second attempt to proactively fix a search test.

SearchIndexableResourcesTest uses the FakeIndexProvider, which
implicitly assumes that the
robotests/res/xml-mcc999/location_settings.xml xml is in use. Without
it, the test is accessing the real location_settings.xml / real
preference controllers. This  was working until now, but by luck and
probably not intent.

There is an upcoming change which will break the test, so this fixes the
test ahead of time.

This change updates the test to use the "mcc999" config, and improves
the docs around FakeIndexProvider to try to make the requirements for
use clearer.

Bug: 171371424
Test: m RunSettingsRoboTests
Change-Id: I868d191281a2030fa49134893bcd6720f757ea91
2020-10-22 15:46:39 +01:00
Neil Fuller
d11f93babe Revert "Stop search tests using location_settings"
This reverts commit b71f7af512b506ee74f75f92a1cc254018c3c924.

Bug: 171371424
Test: m -j30 RunSettingsRoboTests
Change-Id: Id483ca41d3aced0893f0eff370270b5010eb8a7a
2020-10-22 15:38:23 +01:00
Tsung-Mao Fang
757e756896 Refine search ui and avatar based on spec am: ebc3a3e881
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12898361

Change-Id: I4fb8835f9b4964332bca7fc0a9cdac346a88bbd7
2020-10-22 14:12:22 +00:00
Bill Yi
b0cb20f643 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I44ced221aa06d7e94415837f7ebeb9cc188113e0
2020-10-22 10:18:58 +00:00
Tsung-Mao Fang
ebc3a3e881 Refine search ui and avatar based on spec
This is the first version, we will keep tweaking
the details later.

Bug: 171278055
Test: Screenshot - https://screenshot.googleplex.com/ApRgDZknkvX9PWo
Change-Id: Ie99cf9e187aa2440486cc2eae90e04287daf0a1d
2020-10-22 18:07:20 +08:00
Bill Yi
eeaa6e4eaf Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: If13f8df62726ec63be5165fa8c8ee55d24c958c4
2020-10-22 09:38:52 +00:00
Hall Liu
17ba8166a3 Replace TelephonyManager methods for mobile data
TelephonyManager had a minor refactor of some of the methods revolving
around mobile data. Change code in Settings to use the new ones instead.

Exempt-From-Owner-Approval: Cherry-picked from internal
Bug: 169367013
Test: existing unit tests, manual
Change-Id: I7ebae37373d53fb2c59b6b546232dbddf77398d4
Merged-In: I7ebae37373d53fb2c59b6b546232dbddf77398d4
2020-10-21 23:38:20 +00:00
Sally
9fe91b9ac8 Add activity for directly navigating to Reduce Bright Colors setting
page

This will be used by the QS tile

Test: builds
Bug: b/128465252
Change-Id: Icdc5d96f4f931b825fa0dd33a0ec20936d9ce4ea
2020-10-21 23:09:03 +00:00
Sally
b9ff672a31 Add a setting page for Reduce Bright Colors under A11y
This is essentially a copy page of ToggleDaltonizerPreferenceFragment.
We extend ToggleFeaturePreferenceFragment to maintain consistency with
other shortcut assignable a11y feature.

UI is a draft

This CL:
1) allows users to enabled/disable RBC with the a11y shortcut (button,
gestures, volume keys), if assigned
2) adds a slider and persist switch to the template
ToggleFeaturePreferenceFragment page (which already contains a feature
switch, shortcut preference, and footer description)
3) enables/disables the intensity slider when RBC is on/off
4) sets placeholders for calling into ColorDisplayService in
controllers and tests
5) follows convention set by other color transformations settings and
places feature under Experimental section in A11y settings page if
transformations can't be efficiently performed by hardware

Test: A11y setting and page appears, tested activation with shortcut,
preference controller tests
Bug: b/128465252

Change-Id: I291bb86ce3d855ce052ca70dc7a941a888e2c723
2020-10-21 23:08:53 +00:00
Julia Reynolds
0aef57d67e Add 'Recent Conversations' to the conversation page
Test: atest
Bug: 171191376
Change-Id: Id7208312dff0cc022c2f16b3872fae1a9dc09ed7
2020-10-21 16:39:04 -04:00
Weng Su
f914e34d28 Fix the Wi-Fi detailed settings un-editable issue.
- The WifiEntry info might not be ready in early stage. (ex:
WifiEntry#canSetPrivacy())

- The Wi-Fi detailed setting listens to the WifiEntry callback to
refresh the preferences, it should first update the preference status to
be editable or not, and then display preferences to the UI.

- The privicy preference should be able to set back to selectable when
WifiEntry#canSetPrivicy() change from false to true.

Bug: 170148009
Test:
make RunSettingsRoboTests
ROBOTEST_FILTER=WifiNetworkDetailsFragment2Test
make RunSettingsRoboTests
ROBOTEST_FILTER=WifiPrivacyPreferenceController2Test

Change-Id: I48ca060e6b468232f19c82e9de0ce4fce39cba7f
Merged-In: I567b2b80163631a01d165c0ac5c0aba392e014ef
2020-10-21 16:39:58 +00:00
Neil Fuller
bf8f57e53c Merge "Stop search tests using location_settings" am: c79680cbae
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12884935

Change-Id: Ia41d2bff5aa5e239bd21fba69057427629099abf
2020-10-21 11:30:13 +00:00
Neil Fuller
c79680cbae Merge "Stop search tests using location_settings" 2020-10-21 11:21:29 +00:00
Neil Fuller
c970f4d79c Stop search tests using location_settings
Stop robolectric search tests using location_settings, use
sound_settings instead.

The choice of location_settings.xml seems arbitrary, and there's a
commit coming which means one of the controllers doesn't just use
settings to check availability. When the unconfigured mock returns null
from a method, that causes the test to fail in a non-obvious way.

Bug: 171371424
Test: m RunSettingsRoboTests
Change-Id: I4d3386e3c62fb4151e4a4e27625edccec89316d9
2020-10-21 09:25:57 +00:00
Bonian Chen
702e099f64 Merge "[Settings] Only display 1 SIM UI when multiple with same group UUID" am: d682b2cc57
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12886476

Change-Id: I38cc482ef22287d245f2a899ec1ecbf67feba4f4
2020-10-21 09:01:50 +00:00
SongFerng Wang
1882643152 Merge "To fix bug, summary is wrong if nr_enabled_bool=false" into rvc-qpr-dev am: 3e5defe561 am: 9493731935 am: c023d49669
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12875667

Change-Id: Ib134155bba21109b38c997e4af5c15132498849c
2020-10-21 09:01:38 +00:00
Bonian Chen
d682b2cc57 Merge "[Settings] Only display 1 SIM UI when multiple with same group UUID" 2020-10-21 08:37:37 +00:00
SongFerng Wang
c023d49669 Merge "To fix bug, summary is wrong if nr_enabled_bool=false" into rvc-qpr-dev am: 3e5defe561 am: 9493731935
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12875667

Change-Id: I3b06b785b0ae6d907f7cd6f09d7830c5b8cdb0c3
2020-10-21 08:36:22 +00:00
SongFerng Wang
9493731935 Merge "To fix bug, summary is wrong if nr_enabled_bool=false" into rvc-qpr-dev am: 3e5defe561
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12875667

Change-Id: I2b69a34d035e70cbc1bea9a2482be876eeabda66
2020-10-21 08:19:13 +00:00
SongFerng Wang
3e5defe561 Merge "To fix bug, summary is wrong if nr_enabled_bool=false" into rvc-qpr-dev 2020-10-21 08:05:48 +00:00