OSDN Git Service
Doris Ling [Wed, 28 Mar 2018 23:21:31 +0000 (23:21 +0000)]
Merge "Move IMS registration state to SIM status screen" into pi-dev
am:
6fa3b89033
Change-Id: Ib4a76ca53a04cf9a9f6ab62312bbf3c9b685528c
Victor Chang [Wed, 28 Mar 2018 22:53:29 +0000 (22:53 +0000)]
Merge "Fix incorrect GMT offset in display" into pi-dev
am:
caf72cf3ff
Change-Id: Id8ccf9caa54e655f810d77baf19c7d6df55a9087
TreeHugger Robot [Wed, 28 Mar 2018 22:24:30 +0000 (22:24 +0000)]
Merge "Move IMS registration state to SIM status screen" into pi-dev
Kousuke Kitahara [Wed, 28 Mar 2018 21:13:08 +0000 (21:13 +0000)]
[automerger skipped] Merge "DO NOT MERGE Move IMS registration state to SIM status screen" am:
e8b70d7422 -s ours
am:
7d906895e8 -s ours
Change-Id: Ia1ae6679a2e3c5c2372bee1280ef8577efa3ef84
TreeHugger Robot [Wed, 28 Mar 2018 21:05:15 +0000 (21:05 +0000)]
Merge "Fix incorrect GMT offset in display" into pi-dev
Kousuke Kitahara [Wed, 28 Mar 2018 20:49:50 +0000 (20:49 +0000)]
[automerger skipped] Merge "DO NOT MERGE Move IMS registration state to SIM status screen"
am:
e8b70d7422 -s ours
Change-Id: I16c7823773e1a1ca070bfc5189be080996f0d38e
Jan Nordqvist [Wed, 28 Mar 2018 20:40:15 +0000 (20:40 +0000)]
Merge "Entity header: When screen scrolls, there should be shadow under the header." into pi-dev
am:
00a2dcb8f9
Change-Id: I1d577b8432cde8b696a84a1aaa284576013612d7
TreeHugger Robot [Wed, 28 Mar 2018 20:12:46 +0000 (20:12 +0000)]
Merge "Entity header: When screen scrolls, there should be shadow under the header." into pi-dev
Fan Zhang [Wed, 28 Mar 2018 20:07:23 +0000 (20:07 +0000)]
Merge "Revert "Ignore broken test to unblock TreeHugger"" into pi-dev
am:
8482455df7
Change-Id: I10b2fc33b345607358ad81c98784eb15fcd2c2e5
Doris Ling [Tue, 27 Mar 2018 22:22:42 +0000 (15:22 -0700)]
Move IMS registration state to SIM status screen
Manually merge change I3aff03ebdc9dc165db66c5007a2fa987ab8cd822 due
to merge conflicts.
To show IMS registration state for each SIM, move the preference of
IMS registration state from Status screen to SIM Status screen.
Fixes:
66063299
Test: manual - Checked that the IMS registration state is displayed on
the SIM Status screen.
Test: make RunSettingsRoboTests
Change-Id: Ic0713c357085d94b59605c1b924e7b56a362e256
Makoto Onuki [Wed, 28 Mar 2018 20:00:45 +0000 (20:00 +0000)]
Merge "Fix battery saver setting default state" into pi-dev
am:
856017f915
Change-Id: I32f20eac01ddeed16ed95c3b8b9323067b8d0608
Treehugger Robot [Wed, 28 Mar 2018 19:51:28 +0000 (19:51 +0000)]
Merge "DO NOT MERGE Move IMS registration state to SIM status screen"
TreeHugger Robot [Wed, 28 Mar 2018 19:41:24 +0000 (19:41 +0000)]
Merge "Revert "Ignore broken test to unblock TreeHugger"" into pi-dev
TreeHugger Robot [Wed, 28 Mar 2018 19:31:51 +0000 (19:31 +0000)]
Merge "Fix battery saver setting default state" into pi-dev
Lei Yu [Wed, 28 Mar 2018 19:22:12 +0000 (19:22 +0000)]
Merge "Get anomaly info from StringArrayList" into pi-dev
am:
512cb18c2e
Change-Id: If0f76de185b489e5c7ac4ae4d6dfb930ef35e03f
TreeHugger Robot [Wed, 28 Mar 2018 18:58:00 +0000 (18:58 +0000)]
Merge "Get anomaly info from StringArrayList" into pi-dev
Victor Chang [Wed, 28 Mar 2018 18:50:06 +0000 (19:50 +0100)]
Fix incorrect GMT offset in display
- android.icu.impl.TimeZoneAdapter doesn't fully implement
java.util.TimeZone, e.g. does not override getOffset(long date).
TimeZoneAdapter isn't a public API in ICU/Android. It shouldn't be
used in the first place
Bug:
77223510
Test: m RunSettingsRoboTests ROBOTEST_FILTER=com.android.settings.datetime.timezone
Change-Id: Ic0d7794326948796dcc5cc0b268ef634a74803c4
Jan Nordqvist [Fri, 23 Mar 2018 22:45:17 +0000 (15:45 -0700)]
Entity header: When screen scrolls, there should be shadow under the header.
Bug:
70950124
Test: manual
Test: make RunSettingsRoboTests
Change-Id: I5c1d9f463a57d48e258d67602fc4d1fbbdfaad60
Victor Chang [Wed, 28 Mar 2018 17:55:17 +0000 (17:55 +0000)]
Merge "Add a header view to show the country in RegionZonePicker" into pi-dev
am:
05ab467e80
Change-Id: I0865b2a8cc8b920e17f8693e5015555f0241762f
TreeHugger Robot [Wed, 28 Mar 2018 17:49:36 +0000 (17:49 +0000)]
Merge "Add a header view to show the country in RegionZonePicker" into pi-dev
HJ ChangLiao [Wed, 28 Mar 2018 17:47:51 +0000 (17:47 +0000)]
Merge "Move BT, NFC out of Conntection pref" into pi-dev
am:
c621ddc3f2
Change-Id: I6ab6467b5c93b5d87695c1e919043e0a6a080ab9
TreeHugger Robot [Wed, 28 Mar 2018 17:38:34 +0000 (17:38 +0000)]
Merge "Move BT, NFC out of Conntection pref" into pi-dev
Jyun LuoLai [Wed, 28 Mar 2018 17:36:41 +0000 (17:36 +0000)]
Merge "Subtext of "Add device" should only show when BT is off" into pi-dev
am:
671db84734
Change-Id: If5da86ea853dd287a23abe67779aa579fdb48bf3
Bill Yi [Wed, 28 Mar 2018 17:28:34 +0000 (17:28 +0000)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev
am:
4fa5774b90 -s ours
Change-Id: I982cb88d891696dd14f36f9a4c908464746db66e
Makoto Onuki [Tue, 27 Mar 2018 20:14:40 +0000 (13:14 -0700)]
Fix battery saver setting default state
- Battery saver is off by default.
Test: manual test with: settings delete global low_power && settings delete global low_power_trigger_level
Test: b ROBOTEST_FILTER=BatterySaver RunSettingsRoboTests
Bug:
76460719
Change-Id: I749bba9a5e36fe8ccee6e4ed843596bc94d96fcc
Fix:
76460719
TreeHugger Robot [Wed, 28 Mar 2018 17:22:25 +0000 (17:22 +0000)]
Merge "Subtext of "Add device" should only show when BT is off" into pi-dev
Bill Yi [Wed, 28 Mar 2018 17:11:01 +0000 (17:11 +0000)]
Merge "Import translations. DO NOT MERGE" into pi-dev
Lei Yu [Wed, 28 Mar 2018 16:52:39 +0000 (16:52 +0000)]
Merge "Fix tests for time format in settings" into pi-dev
am:
d46cf49b6d
Change-Id: I40a23a9ac45e1bbcdae2ba51a2a1085469e19a76
Shawn Ding [Wed, 28 Mar 2018 16:47:24 +0000 (16:47 +0000)]
Merge "Fix data usage under Wi-Fi has title "Mobile data usage"" into pi-dev
am:
bbb3d3e72c
Change-Id: I515e7d7db8d4d365992b41df2306fa235169dea9
TreeHugger Robot [Wed, 28 Mar 2018 16:45:45 +0000 (16:45 +0000)]
Merge "Fix tests for time format in settings" into pi-dev
TreeHugger Robot [Wed, 28 Mar 2018 16:36:16 +0000 (16:36 +0000)]
Merge "Fix data usage under Wi-Fi has title "Mobile data usage"" into pi-dev
Fan Zhang [Wed, 28 Mar 2018 15:28:18 +0000 (15:28 +0000)]
Merge "Fix robotest failure" into pi-dev
am:
aad168729f
Change-Id: I2a013a921d3c818eefa3ef0732afc66755304cd5
Artem Iglikov [Wed, 28 Mar 2018 15:12:40 +0000 (15:12 +0000)]
Ignore broken test to unblock TreeHugger
am:
54f467f9ad
Change-Id: Icdc40c6ffa9624fa7ba28c3bfe0e70812066b150
Fan Zhang [Wed, 28 Mar 2018 15:10:10 +0000 (15:10 +0000)]
Revert "Ignore broken test to unblock TreeHugger"
This reverts commit
54f467f9adea4c1320ceab205194ef659c1ca1f5.
Bug:
77161730
Change-Id: Ib93d0cd75a10a8be94dec4f822359c6c492297ea
Fan Zhang [Wed, 28 Mar 2018 15:06:50 +0000 (15:06 +0000)]
Merge "Fix robotest failure" into pi-dev
Artem Iglikov [Wed, 28 Mar 2018 14:52:39 +0000 (15:52 +0100)]
Ignore broken test to unblock TreeHugger
Bug:
77161730
Test: make RunSettingsRoboTests -j
Change-Id: If16368d7cbf899dfacf376f33712f68daf2aebf7
Victor Chang [Tue, 27 Mar 2018 16:34:53 +0000 (17:34 +0100)]
Add a header view to show the country in RegionZonePicker
Extra fixes in this CL
- Minor string update in time zone picker.
Use date_time_search_region string in search bar,
and date_time_set_timezone_title string for lower case "zone".
- Fixed b/
76893139. Remove the unnecessary top padding in RecyclerView.
Create a new layout file time_zone_items_list.xml without the padding.
- Add missing return statement when region ISO code
is invalid in RegionZonePicker#getAllTimeZoneInfos
Bug:
76209571
Bug:
76893139
Test: m RunSettingsRoboTests ROBOTEST_FILTER=com.android.settings.datetime.timezone
Test: Verified that the strings are updated in the UI
Change-Id: I1fb3e2abf80da3cb53cfbc3363bbe46e40a6ac22
Julia Reynolds [Wed, 28 Mar 2018 11:29:33 +0000 (11:29 +0000)]
Merge "Allow app lists to have a toggle" into pi-dev
am:
2c18bbbd75
Change-Id: Id4debc1b5bb0be97615193eeebc51050442daf86
Julia Reynolds [Wed, 28 Mar 2018 11:21:51 +0000 (11:21 +0000)]
Merge "Allow app lists to have a toggle" into pi-dev
Kousuke Kitahara [Wed, 2 Aug 2017 08:48:00 +0000 (17:48 +0900)]
DO NOT MERGE Move IMS registration state to SIM status screen
To show IMS registration state for each SIM, move the preference of
IMS registration state from Status screen to SIM Status screen.
Test: manual - Checked that the IMS registration state is displayed on
the SIM Status screen.
Test: auto - Passed SimStatusTest.
Bug:
66063299
Change-Id: I3aff03ebdc9dc165db66c5007a2fa987ab8cd822
Jyun LuoLai [Tue, 27 Mar 2018 03:05:56 +0000 (11:05 +0800)]
Subtext of "Add device" should only show when BT is off
Bug:
73960246
Test: Manual test & make RunSettingsRoboTests
Change-Id: I6eb5fbed20a4ffc923faf992bbf0b30a817444a0
Fan Zhang [Wed, 28 Mar 2018 04:40:46 +0000 (21:40 -0700)]
Fix robotest failure
Change-Id: Ic584aab213fa7af8f6f79e10743710be6840c2ee
Fixes:
77161730
Test: robotest
HJ ChangLiao [Wed, 21 Mar 2018 08:01:31 +0000 (16:01 +0800)]
Move BT, NFC out of Conntection pref
Move BT, NFC preference out of Connection Preference,
To Connected devices page.
Because NFC and Android Beam are controlled by the same controller,
Create each controller for those preference and leave the sharing part.
Change-Id: I8bc303a5f487de9c667487119b49e1e4130aa80c
Fixes:
72458929
Test: manually test, make RunSettingsRoboTests
Fan Zhang [Wed, 28 Mar 2018 00:45:43 +0000 (00:45 +0000)]
Merge "Add "device is muted/vibrate, click to turn on" conditions" into pi-dev
am:
0a5367c0c4
Change-Id: I277b4c2123fbe6d08548972883c3e1cd5288a71c
TreeHugger Robot [Wed, 28 Mar 2018 00:05:32 +0000 (00:05 +0000)]
Merge "Add "device is muted/vibrate, click to turn on" conditions" into pi-dev
Shawn Ding [Mon, 26 Mar 2018 08:59:43 +0000 (16:59 +0800)]
Fix data usage under Wi-Fi has title "Mobile data usage"
Fix "Wi-Fi data usage" in Wi-Fi section. (Settings -> Network & internet -> Data usage)
Change-Id: I6c4117db321af252a2c3061f554ffbe2f87a714e
Fixes:
76165354
Test: Manual test
Lei Yu [Tue, 27 Mar 2018 23:10:54 +0000 (16:10 -0700)]
Get anomaly info from StringArrayList
Statsd populates the anomaly info in StringArrayList, not StringArray. So
in settings we should use the correct API to get the data.
Bug:
77141809
Test: RunSettingsRoboTests
Change-Id: I56fc096106b5c040422fd7f5bb8cb4be7fe71d9d
Vishwath Mohan [Tue, 27 Mar 2018 22:51:41 +0000 (22:51 +0000)]
Merge "Disable pattern fading during the setup flow." into pi-dev
am:
a6fa9226c9
Change-Id: I6f2546a9c271a4d7127b7101e6ffcf5754253069
Julia Reynolds [Mon, 26 Mar 2018 21:02:58 +0000 (17:02 -0400)]
Allow app lists to have a toggle
And make the notifications app list toggle block/unblock
notifications.
Test: make -j RunSettingsRoboTests
Change-Id: I7417b98fb1c66504897df515c4c84afad591764e
Fixes:
74318867
Bill Yi [Tue, 27 Mar 2018 22:26:27 +0000 (15:26 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Change-Id: Ie0351c94a04bdafdc0517be7c96dd89a366cfdf6
Vishwath Mohan [Tue, 27 Mar 2018 22:00:06 +0000 (22:00 +0000)]
Merge "Disable pattern fading during the setup flow." into pi-dev
Bill Yi [Tue, 27 Mar 2018 21:24:30 +0000 (21:24 +0000)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev
am:
97a1f85291 -s ours
Change-Id: Ief3ac341d55051ca2ea71128d64e4e45298a284c
Lei Yu [Tue, 27 Mar 2018 21:11:06 +0000 (21:11 +0000)]
Merge "Remove the old battery page" into pi-dev
am:
4e25277f60
Change-Id: Id73aa82818b697cf2754758120a8ff098a68fdd5
Lei Yu [Thu, 22 Mar 2018 22:01:20 +0000 (15:01 -0700)]
Fix tests for time format in settings
Because now we use different time format across the settings app.
We need to update all the tests.
Bug:
76113036
Test: RunSettingsRoboTests
Change-Id: Id4f7d55775adfdeb1aa0ae234f35d515ced4f450
TreeHugger Robot [Tue, 27 Mar 2018 20:41:16 +0000 (20:41 +0000)]
Merge "Import translations. DO NOT MERGE" into pi-dev
Fan Zhang [Tue, 27 Mar 2018 00:37:47 +0000 (17:37 -0700)]
Add "device is muted/vibrate, click to turn on" conditions
Bug:
76022431
Test: robotests
Change-Id: I89b71f99fa5ef866028912183ad04b053213bb0d
TreeHugger Robot [Tue, 27 Mar 2018 20:23:23 +0000 (20:23 +0000)]
Merge "Remove the old battery page" into pi-dev
Vishwath Mohan [Fri, 16 Feb 2018 20:22:57 +0000 (12:22 -0800)]
Disable pattern fading during the setup flow.
This CL disables fading the pattern during the pattern setup flow.
Test: The pattern fades everywhere but during the pattern setup flow.
Bug:
72798512
Change-Id: I959270cf39bc35080cce21777f0e168373406a17
Bill Yi [Tue, 27 Mar 2018 18:43:44 +0000 (11:43 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Change-Id: Ife3ef6257d8ade3bcc9689171e4365f639c36440
Fan Zhang [Tue, 27 Mar 2018 16:10:50 +0000 (16:10 +0000)]
Merge "Add string linter preupload check" into pi-dev
am:
49d0205749
Change-Id: Icaf820d0d6e4f6b9f56283e93752310355e15b89
TreeHugger Robot [Tue, 27 Mar 2018 16:01:24 +0000 (16:01 +0000)]
Merge "Add string linter preupload check" into pi-dev
Amin Shaikh [Tue, 27 Mar 2018 13:24:24 +0000 (13:24 +0000)]
Merge "Show wifi status label in preference summary." into pi-dev
am:
d467a8bc0f
Change-Id: Icae963b4831b916e615a9e729116135967c5a388
HJ ChangLiao [Tue, 27 Mar 2018 13:18:51 +0000 (13:18 +0000)]
Merge "Add title to What to block page" into pi-dev
am:
517f6d602d
Change-Id: I3e898bf29199164d279f611973459fd67b7f347c
TreeHugger Robot [Tue, 27 Mar 2018 13:10:24 +0000 (13:10 +0000)]
Merge "Show wifi status label in preference summary." into pi-dev
TreeHugger Robot [Tue, 27 Mar 2018 13:04:03 +0000 (13:04 +0000)]
Merge "Add title to What to block page" into pi-dev
HJ ChangLiao [Tue, 27 Mar 2018 09:47:07 +0000 (17:47 +0800)]
Add title to What to block page
Add title to page Sound> Do Not Disturb> What to block
Fixes:
76103812
Test: make RunSettingsRoboTests -j
Change-Id: Iee2679cb94e1447769402d27895b276b8853d97a
Victor Chang [Tue, 27 Mar 2018 09:42:04 +0000 (09:42 +0000)]
Fix crash in time zone picker due to race condition on view updates
am:
201c629fcc
Change-Id: Icd55bf16959da9e67b75ec93c53ef21fdcb9014f
Victor Chang [Sat, 24 Mar 2018 18:07:50 +0000 (18:07 +0000)]
Fix crash in time zone picker due to race condition on view updates
- Can't reproduce the race condition with manual test, probably the view
updates are fast enough that only monkey test can reproduce the issue.
- Reproduced a similar stacktrace and IndexOutOfBoundsException with
Robolectric test by assuming that the race condition happens after
text filtering and view updates. Try to fix the bug with this assumption
- The fix is to bind the data (data position in adapter) with ViewHolder.
Bug:
75322108
Test: m RunSettingsRoboTests ROBOTEST_FILTER=com.android.settings.datetime.timezone
Change-Id: Ie5d932bce30590b8067e042c3380911c9608872f
yuemingw [Tue, 27 Mar 2018 08:37:28 +0000 (08:37 +0000)]
Merge "Auto time should show dynamic subtext when restricted." into pi-dev
am:
d7ea524e81
Change-Id: I161487aff5d83975c6c0e647e8405fab89376f9e
TreeHugger Robot [Tue, 27 Mar 2018 08:30:20 +0000 (08:30 +0000)]
Merge "Auto time should show dynamic subtext when restricted." into pi-dev
Wenhung Teng [Tue, 27 Mar 2018 06:26:57 +0000 (06:26 +0000)]
Merge "Fix issue "open battery settings, switch locale, apps are still in old locale" into pi-dev" into pi-dev
am:
032b0454f8
Change-Id: I4676626f12b340752bd867c73d45eda5d0124a1c
Wenhung Teng [Tue, 27 Mar 2018 06:13:53 +0000 (06:13 +0000)]
Merge "Fix issue "open battery settings, switch locale, apps are still in old locale" into pi-dev" into pi-dev
Adam Newman [Tue, 27 Mar 2018 05:48:04 +0000 (05:48 +0000)]
Merge "Observe NetworkCallback instead of polling" into pi-dev
am:
d2fb46eac4
Change-Id: Id06fb42bf1144fa3f04d092718427d484557732f
Adam Newman [Tue, 27 Mar 2018 05:23:21 +0000 (05:23 +0000)]
Merge "Observe NetworkCallback instead of polling" into pi-dev
Fan Zhang [Tue, 27 Mar 2018 04:34:07 +0000 (21:34 -0700)]
Add string linter preupload check
Bug:
76097999
Test: repo upload
Change-Id: Ieb31c931d73a4325f605963b374ca7a2d568e08c
Fan Zhang [Tue, 27 Mar 2018 04:34:46 +0000 (04:34 +0000)]
Merge "Use custom drawable for Battery saver condition icon." into pi-dev
am:
74ac3b1f3a
Change-Id: I74be965dce1442a532c13590b105e43ec078c87c
Jyun LuoLai [Tue, 27 Mar 2018 04:28:56 +0000 (04:28 +0000)]
Merge "Update Bluetooth related string" into pi-dev
am:
198a6495ad
Change-Id: Icb0cdc09c6c0ccb1d359ff4b5e0887cab9f635d9
Fan Zhang [Tue, 27 Mar 2018 04:25:15 +0000 (04:25 +0000)]
Merge "Use custom drawable for Battery saver condition icon." into pi-dev
Kevin Chyn [Tue, 27 Mar 2018 04:03:30 +0000 (04:03 +0000)]
Merge "Don't show FP error canceled message" into pi-dev
am:
2c6ea60711
Change-Id: I3431a6be839f354ee0dc0e982162c894323271c2
TreeHugger Robot [Tue, 27 Mar 2018 03:53:27 +0000 (03:53 +0000)]
Merge "Update Bluetooth related string" into pi-dev
TreeHugger Robot [Tue, 27 Mar 2018 03:28:27 +0000 (03:28 +0000)]
Merge "Don't show FP error canceled message" into pi-dev
Jyun LuoLai [Tue, 27 Mar 2018 01:21:05 +0000 (09:21 +0800)]
Update Bluetooth related string
Bug:
73960246
Test: Manual test
Change-Id: Ied2a45648e52a78abe3dc84647694dd68874ba5f
Felka Chang [Tue, 27 Mar 2018 02:13:31 +0000 (02:13 +0000)]
Merge "To update from "Data saver" to "Data Saver"" into pi-dev
am:
135a7e9753
Change-Id: I95871ed90bfdc71a77569cb2f9fac9682d47d6ca
Felka Chang [Tue, 27 Mar 2018 02:08:21 +0000 (02:08 +0000)]
Merge "To update from "Data saver" to "Data Saver"" into pi-dev
Fan Zhang [Tue, 27 Mar 2018 00:52:06 +0000 (00:52 +0000)]
Merge "Add more string for device muted condition" into pi-dev
am:
2bc477959c
Change-Id: I0d58d639444733484818a557f2c35e4955c75beb
Fan Zhang [Mon, 26 Mar 2018 22:31:10 +0000 (15:31 -0700)]
Use custom drawable for Battery saver condition icon.
- Updated condition interface to use Drawable instead of Icon for icons.
- Converted all conditions to return drawable instead of Icon.
- Created a BatterySaverDrawable to draw a static battery saver icon.
Change-Id: Ie964f3439009c7658603a8ff352a05e964a0a795
Fixes:
76168403
Test: robotests
Lei Yu [Mon, 26 Mar 2018 21:31:57 +0000 (14:31 -0700)]
Remove the old battery page
This CL removes PowerUsageSummaryLegacy and PowerUsageAdvancedLegacy
and their related layouts and strigns.
Also remove the isBatteryV2Enabled method in feature provider.
Change-Id: I1ec30f713d733ed24335a3e698fb515751232948
Fixes:
76027338
Test: robo test still pass
Fan Zhang [Mon, 26 Mar 2018 23:55:07 +0000 (23:55 +0000)]
Merge "Add more string for device muted condition" into pi-dev
Fan Zhang [Mon, 26 Mar 2018 22:52:22 +0000 (15:52 -0700)]
Add more string for device muted condition
Bug:
76022431
Test: build
Change-Id: Ib3801b2ecd18d094e4431aeb89d711a6c9e62689
Fan Zhang [Mon, 26 Mar 2018 22:04:24 +0000 (22:04 +0000)]
Merge "Fix text overlap issue when flinging in ManageApplication" into pi-dev
am:
9f5849aaf4
Change-Id: Ief196f8d521b5727d2535086ab18a844349ddf1c
Lei Yu [Mon, 26 Mar 2018 21:56:16 +0000 (21:56 +0000)]
Merge "Use FIELD_ANOMALY_TYPE for anomalyType" into pi-dev
am:
6f22cec26d
Change-Id: I1e497fcc05faa582a1a5d9a9f958c1efad829a32
TreeHugger Robot [Mon, 26 Mar 2018 21:50:14 +0000 (21:50 +0000)]
Merge "Fix text overlap issue when flinging in ManageApplication" into pi-dev
Lei Yu [Mon, 26 Mar 2018 21:41:11 +0000 (21:41 +0000)]
Merge "Use FIELD_ANOMALY_TYPE for anomalyType" into pi-dev
yuemingw [Mon, 26 Mar 2018 13:18:10 +0000 (14:18 +0100)]
Auto time should show dynamic subtext when restricted.
Auto time preference should show dynamic subtext corresponding to
the current status of auto time when it's restricted, instead of
hard code "enabled by admin", as it could either be enabled or disabled
when disallow_config_date_time is set.
Bug:
73811933
Test: manually by TestDPC
Change-Id: Ia7181e8a67ccfe72117f95133e9081375c121fe3
Kevin Chyn [Mon, 26 Mar 2018 19:38:21 +0000 (12:38 -0700)]
Don't show FP error canceled message
Test: manual test of SUW, error message doesn't show up when
confirm credentials is complete
Change-Id: Ie0750629dcd5bb5d84df08c75e9c83384c299073
Fixes:
76400618
yuemingw [Mon, 26 Mar 2018 18:46:09 +0000 (18:46 +0000)]
Merge "Remove account should show policy transparency dialog when DISALLOW_MODIFY_ACCOUNTS is set." into pi-dev
am:
21926abed2
Change-Id: Ie4130e88a3355bb91a63578bd889147da3dba726
Amin Shaikh [Wed, 21 Mar 2018 19:08:54 +0000 (15:08 -0400)]
Show wifi status label in preference summary.
Bug:
74075761
Test: m RunSettingsRoboTests && manual
Change-Id: I286fac5d9390634facc0f04b845ef668c55d1331
TreeHugger Robot [Mon, 26 Mar 2018 18:34:31 +0000 (18:34 +0000)]
Merge "Remove account should show policy transparency dialog when DISALLOW_MODIFY_ACCOUNTS is set." into pi-dev
Fan Zhang [Sat, 24 Mar 2018 00:03:38 +0000 (17:03 -0700)]
Fix text overlap issue when flinging in ManageApplication
The issue is we have a background handler to find app size and set to
summary asynchronously. When flinging quickly, the view being request to
update by the background handler could be scrolled off screen already.
This change forces onPackageSizeChanged update to only happen when it's
not scrolling.
Change-Id: Ia7ccab776c3c789c8d4c0b55104b48e257b9cebf
Fixes:
76176014
Test: manually fling
Lei Yu [Mon, 26 Mar 2018 18:26:43 +0000 (11:26 -0700)]
Use FIELD_ANOMALY_TYPE for anomalyType
Change-Id: I36d5d806f45df4153cdba3e398fa72ab89e5e082
Fixes:
76424026
Test: RunSettingsRoboTests
OSDN Git Service
