Commit Graph

78371 Commits

Author SHA1 Message Date
George Chang
7e65d7f6fc Merge "Support RTL mode in payment option" 2020-10-28 12:42:11 +00:00
Neil Fuller
dcdf15592b Merge "Fix review comments location_time_zone_detection" am: be3b9ffeaa
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12918184

Change-Id: Ide3d7b6f7ab5a265d0a004563a911e435649d013
2020-10-28 10:01:31 +00:00
Neil Fuller
be3b9ffeaa Merge "Fix review comments location_time_zone_detection" 2020-10-28 09:38:33 +00:00
Jeremy Goldman
f78b41a855 Merge "Fix flaky JUnit test" am: a14d7504bb
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12928115

Change-Id: I80e191897a6bbdf6ccf1bfc194fb2fd15b8235fa
2020-10-28 09:03:06 +00:00
Jeremy Goldman
a14d7504bb Merge "Fix flaky JUnit test" 2020-10-28 08:34:51 +00:00
Treehugger Robot
6d9cbb112b Merge "Settings: Set preference controller for all VideoPreference widget usages" am: 4e04e32679 am: b50fba15b3 am: 15c5be7deb am: 548a4201a8 am: f07862473b
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1475616

Change-Id: I8bea679bf18e10c1305273350fd8b21c66bad95c
2020-10-28 08:02:17 +00:00
Treehugger Robot
f07862473b Merge "Settings: Set preference controller for all VideoPreference widget usages" am: 4e04e32679 am: b50fba15b3 am: 15c5be7deb am: 548a4201a8
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1475616

Change-Id: Ie81fd135de3208b673aef4deaea93b7e983768e3
2020-10-28 07:48:59 +00:00
Treehugger Robot
548a4201a8 Merge "Settings: Set preference controller for all VideoPreference widget usages" am: 4e04e32679 am: b50fba15b3 am: 15c5be7deb
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1475616

Change-Id: I85c050785babcdc196539007d3d678b0b9fca3cc
2020-10-28 07:18:07 +00:00
Treehugger Robot
15c5be7deb Merge "Settings: Set preference controller for all VideoPreference widget usages" am: 4e04e32679 am: b50fba15b3
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1475616

Change-Id: Iccc07e5d144297f5999f0ed324c0f2b0844e4c02
2020-10-28 07:00:24 +00:00
Treehugger Robot
b50fba15b3 Merge "Settings: Set preference controller for all VideoPreference widget usages" am: 4e04e32679
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1475616

Change-Id: Ief5693cd34838cec35e7e5c650752c3b4cdb9d02
2020-10-28 06:28:27 +00:00
Treehugger Robot
4e04e32679 Merge "Settings: Set preference controller for all VideoPreference widget usages" 2020-10-28 06:05:41 +00:00
Jeremy Goldman
125301d590 Fix flaky JUnit test
This test sometimes fails in PostSubmits because the background
thread which calls the verified class does not have time to execute
before the class is verified.

This creates a helper function to monitor background thread completion.

Test: atest -c AutoSelectPreferenceControllerTest
Change-Id: I6c320abd70fcb5fe823ec122fb0dac67174ecb4a
2020-10-28 05:15:52 +00:00
Jeremy Goldman
fb098a2883 Merge "Mock SystemProperties in CDMA JUnit test" am: 1915699ddd
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12922400

Change-Id: Ic553654016de56d5c1cbcf4b606c0f83b2ae420c
2020-10-28 02:44:41 +00:00
Jeremy Goldman
1915699ddd Merge "Mock SystemProperties in CDMA JUnit test" 2020-10-28 01:53:04 +00:00
Julia Reynolds
992ca635c8 Method name update
Test: make
Bug: 170705349
Change-Id: I83037d8eddaf62b542c79f1283f477d59f0dc6a8
2020-10-27 20:02:07 -04:00
Neil Fuller
1affbfff83 Fix review comments location_time_zone_detection
Fix review comments for location_time_zone_detection.xml and associated
classes from http://ag/12792958.

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: I641f312cd63359f45664a93e009e5a975dbd6485
2020-10-27 20:34:15 +00:00
Fan Zhang
f797a48af6 Rename panic gesture to emergency gesture in Settings
Bug: 171589858
Test: rebuild
Change-Id: I23847db82a397bdcd61501758e3ef66a4f088e22
2020-10-27 12:46:41 -07:00
Bill Yi
1750434f9b [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 494ad6ca52 -s ours
am skip reason: subject contains skip directive

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

Change-Id: If1389cfdeeb98890ba7504ef38484777c5de4365
2020-10-27 15:46:49 +00:00
George Chang
13f1c1249d Support RTL mode in payment option
Bug: 156770848
Test: right-aligned under RTL mode
Change-Id: I01879056bbac08da0856f35012c8c8456328071c
2020-10-27 11:49:33 +00:00
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