Bill Yi
494ad6ca52
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Ic336cf7344a62933fa3757d8404847b67ee9ba23
2020-10-27 11:03:27 +00:00
Jeremy Goldman
1d068385c6
Mock SystemProperties in CDMA JUnit test
...
Bug: 170608563
Test: atest -c CdmaSubscriptionPreferenceControllerTest
Change-Id: Ibeca5e508d8277a9b84e26829e085c43ce7c26cc
2020-10-27 09:50:42 +00:00
LuK1337
c6b9c9fa86
Settings: Set preference controller for all VideoPreference widget usages
...
Fixes blank VideoPreference for settings with missing media.
Test: manual, open quickly open camera or other affected prefs
Change-Id: I5d4ffbcaa9fa1a344bb66abe53cc01e7be5e07b2
2020-10-26 23:10:11 +00:00
TreeHugger Robot
e168d39df5
Merge "Rename panic button in framework settings." am: 167362d0ca
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12908857
Change-Id: Ibbf612960174c11c43783806142ae939fe6b67a1
2020-10-26 20:48:28 +00:00
TreeHugger Robot
167362d0ca
Merge "Rename panic button in framework settings."
2020-10-26 20:27:50 +00:00
TreeHugger Robot
e55d1878c5
Merge "Update related UI if battery is not present" am: 76c9a32dbb
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12886669
Change-Id: I21cddfd51c1966d6819cc729ac9e1cc6111e34de
2020-10-26 05:05:58 +00:00
TreeHugger Robot
76c9a32dbb
Merge "Update related UI if battery is not present"
2020-10-26 04:53:49 +00:00
Jeremy Goldman
deb34e0161
Merge "Only display options to save and cancel edits to the displayed APN if the APN is editable." am: ad045f62ca
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12907677
Change-Id: I7bea4b2671d69a9a6f38da4d8a0e5b8222d19763
2020-10-26 02:26:09 +00:00
Jeremy Goldman
ad045f62ca
Merge "Only display options to save and cancel edits to the displayed APN if the APN is editable."
2020-10-26 02:06:16 +00:00
TreeHugger Robot
c73709873e
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 1d048597fe
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12913884
Change-Id: I9b7a11e4c3a35b16aaab9a358b5abfb2ee9080e9
2020-10-25 02:03:39 +00:00
TreeHugger Robot
1d048597fe
Merge "Import translations. DO NOT MERGE ANYWHERE"
2020-10-25 01:48:51 +00:00
TreeHugger Robot
96f5dc2e57
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: c37cdc29e8
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12914786
Change-Id: I7588d28294c71076f6147d72014ca41dc6d1bee1
2020-10-25 00:10:19 +00:00
TreeHugger Robot
c37cdc29e8
Merge "Import translations. DO NOT MERGE ANYWHERE"
2020-10-24 23:58:37 +00:00
Jeff Sharkey
e2a7017aaf
Merge "Enable Error Prone to detect obscure bugs." am: 8ddf5592ef
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12908856
Change-Id: I0065493e34b41a5467a122f84ce91e21f24e6b2d
2020-10-24 17:30:53 +00:00
Jeff Sharkey
8ddf5592ef
Merge "Enable Error Prone to detect obscure bugs."
2020-10-24 17:06:46 +00:00
Bill Yi
7ffd978b1c
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Ia190e6f489145b99e18570f8cd35f37e7ef2a97a
2020-10-24 05:12:48 -07:00
Bill Yi
5e62660196
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I74a8b110de5179ea897f40fb858fb105824e5458
2020-10-24 04:25:26 -07:00
Fan Zhang
6fef72aae4
Rename panic button in framework settings.
...
Renamed panic to "emergency" or "emergency gesture" to
avoid speculation once source code is accessible to
parties without full context.
The settings string and file names still use the word "panic". This
will be updated in a follow-up CL
Bug: 169946710
Test: rebuild
Change-Id: Ic1a3181145ca2b64ab6ef2a2989224395fa9a6f8
2020-10-23 22:51:01 +00:00
Jeff Sharkey
a375faa4a1
Enable Error Prone to detect obscure bugs.
...
We've been writing many new framework-specific Error Prone checkers
to help detect obscure platform bugs, and this change starts enabling
those checkers for more packages across the platform.
Bug: 155703208
Test: manual
Exempt-From-Owner-Approval: trivial blueprint changes
Change-Id: I9090b677a90d475b77b3d1127bb4e6c4e1201764
2020-10-23 14:38:58 -06:00
Mill Chen
ad99e2ef38
Update related UI if battery is not present
...
This change is to update the related UI in the battery page if the
battery is not present. This includes the following updates:
1. Update the summary of battery tile in the Settings homepage
2. Replace the battery level with "Unknown"
3. Replace the summary with help message in the battery page
4. Remove the battery meter icon
Bug: 171368508
Test: verify on an issue device
Change-Id: I892e0d137143160a0bce0c11ce9265120ebb8fd4
2020-10-23 23:35:15 +08:00
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