Fan Zhang
473ee0e019
Merge "Add string linter preupload check" into pi-dev am: 49d0205749
...
am: cb3b32c9c4
2018-03-27 16:18:38 +00:00
Fan Zhang
cb3b32c9c4
Merge "Add string linter preupload check" into pi-dev
...
am: 49d0205749
2018-03-27 16:10:50 +00:00
TreeHugger Robot
49d0205749
Merge "Add string linter preupload check" into pi-dev
2018-03-27 16:01:24 +00:00
Amin Shaikh
b30587b473
Merge "Show wifi status label in preference summary." into pi-dev am: d467a8bc0f
...
am: 2f6979c9fe
2018-03-27 13:49:09 +00:00
HJ ChangLiao
b945a2a876
Merge "Add title to What to block page" into pi-dev am: 517f6d602d
...
am: ac4d617706
2018-03-27 13:32:12 +00:00
Amin Shaikh
2f6979c9fe
Merge "Show wifi status label in preference summary." into pi-dev
...
am: d467a8bc0f
2018-03-27 13:24:24 +00:00
HJ ChangLiao
ac4d617706
Merge "Add title to What to block page" into pi-dev
...
am: 517f6d602d
2018-03-27 13:18:51 +00:00
TreeHugger Robot
d467a8bc0f
Merge "Show wifi status label in preference summary." into pi-dev
2018-03-27 13:10:24 +00:00
TreeHugger Robot
517f6d602d
Merge "Add title to What to block page" into pi-dev
2018-03-27 13:04:03 +00:00
Victor Chang
dae61e0fa3
Fix crash in time zone picker due to race condition on view updates am: 201c629fcc
...
am: 93e464564f
2018-03-27 09:53:53 +00:00
HJ ChangLiao
7fcf157762
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
2018-03-27 17:47:07 +08:00
Victor Chang
93e464564f
Fix crash in time zone picker due to race condition on view updates
...
am: 201c629fcc
2018-03-27 09:42:04 +00:00
Victor Chang
201c629fcc
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
2018-03-27 09:31:54 +00:00
yuemingw
5dc9faf1a0
Merge "Auto time should show dynamic subtext when restricted." into pi-dev am: d7ea524e81
...
am: 8c3bccda2c
2018-03-27 08:44:30 +00:00
yuemingw
8c3bccda2c
Merge "Auto time should show dynamic subtext when restricted." into pi-dev
...
am: d7ea524e81
2018-03-27 08:37:28 +00:00
TreeHugger Robot
d7ea524e81
Merge "Auto time should show dynamic subtext when restricted." into pi-dev
2018-03-27 08:30:20 +00:00
Wenhung Teng
17c93edb3c
Merge "Fix issue "open battery settings, switch locale, apps are still in old locale" into pi-dev" into pi-dev am: 032b0454f8
...
am: 00bddd986e
2018-03-27 06:33:29 +00:00
Wenhung Teng
00bddd986e
Merge "Fix issue "open battery settings, switch locale, apps are still in old locale" into pi-dev" into pi-dev
...
am: 032b0454f8
2018-03-27 06:26:57 +00:00
Wenhung Teng
032b0454f8
Merge "Fix issue "open battery settings, switch locale, apps are still in old locale" into pi-dev" into pi-dev
2018-03-27 06:13:53 +00:00
Adam Newman
61484db01d
Merge "Observe NetworkCallback instead of polling" into pi-dev am: d2fb46eac4
...
am: 211535a10d
2018-03-27 06:01:17 +00:00
Adam Newman
211535a10d
Merge "Observe NetworkCallback instead of polling" into pi-dev
...
am: d2fb46eac4
2018-03-27 05:48:04 +00:00
Adam Newman
d2fb46eac4
Merge "Observe NetworkCallback instead of polling" into pi-dev
2018-03-27 05:23:21 +00:00
Fan Zhang
ec67075abc
Merge "Use custom drawable for Battery saver condition icon." into pi-dev am: 74ac3b1f3a
...
am: b4c4d47e2e
2018-03-27 05:20:19 +00:00
Jyun LuoLai
283e24a028
Merge "Update Bluetooth related string" into pi-dev am: 198a6495ad
...
am: 1c502210e3
2018-03-27 05:03:15 +00:00
Kevin Chyn
d017a1ff2c
Merge "Don't show FP error canceled message" into pi-dev am: 2c6ea60711
...
am: 674902b537
2018-03-27 04:47:36 +00:00
Fan Zhang
4b2c171288
Add string linter preupload check
...
Bug: 76097999
Test: repo upload
Change-Id: Ieb31c931d73a4325f605963b374ca7a2d568e08c
2018-03-26 21:38:34 -07:00
Fan Zhang
b4c4d47e2e
Merge "Use custom drawable for Battery saver condition icon." into pi-dev
...
am: 74ac3b1f3a
2018-03-27 04:34:46 +00:00
Jyun LuoLai
1c502210e3
Merge "Update Bluetooth related string" into pi-dev
...
am: 198a6495ad
2018-03-27 04:28:56 +00:00
Fan Zhang
74ac3b1f3a
Merge "Use custom drawable for Battery saver condition icon." into pi-dev
2018-03-27 04:25:15 +00:00
Kevin Chyn
674902b537
Merge "Don't show FP error canceled message" into pi-dev
...
am: 2c6ea60711
2018-03-27 04:03:30 +00:00
TreeHugger Robot
198a6495ad
Merge "Update Bluetooth related string" into pi-dev
2018-03-27 03:53:27 +00:00
TreeHugger Robot
2c6ea60711
Merge "Don't show FP error canceled message" into pi-dev
2018-03-27 03:28:27 +00:00
Jyun LuoLai
b71cb79a07
Update Bluetooth related string
...
Bug: 73960246
Test: Manual test
Change-Id: Ied2a45648e52a78abe3dc84647694dd68874ba5f
2018-03-27 03:09:32 +00:00
Felka Chang
39cfed5707
Merge "To update from "Data saver" to "Data Saver"" into pi-dev am: 135a7e9753
...
am: 5021c0c22d
2018-03-27 02:29:49 +00:00
Felka Chang
5021c0c22d
Merge "To update from "Data saver" to "Data Saver"" into pi-dev
...
am: 135a7e9753
2018-03-27 02:13:31 +00:00
Felka Chang
135a7e9753
Merge "To update from "Data saver" to "Data Saver"" into pi-dev
2018-03-27 02:08:21 +00:00
Fan Zhang
f17216d29d
Merge "Add more string for device muted condition" into pi-dev am: 2bc477959c
...
am: 3ca50d70ac
2018-03-27 01:10:50 +00:00
Fan Zhang
3ca50d70ac
Merge "Add more string for device muted condition" into pi-dev
...
am: 2bc477959c
2018-03-27 00:52:06 +00:00
Fan Zhang
0c8f8a8b46
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
2018-03-26 17:50:27 -07:00
Fan Zhang
2bc477959c
Merge "Add more string for device muted condition" into pi-dev
2018-03-26 23:55:07 +00:00
Fan Zhang
5088523c5d
Add more string for device muted condition
...
Bug: 76022431
Test: build
Change-Id: Ib3801b2ecd18d094e4431aeb89d711a6c9e62689
2018-03-26 15:52:22 -07:00
Fan Zhang
607d63468a
Merge "Fix text overlap issue when flinging in ManageApplication" into pi-dev am: 9f5849aaf4
...
am: a89fb2e6dd
2018-03-26 22:17:03 +00:00
Fan Zhang
a89fb2e6dd
Merge "Fix text overlap issue when flinging in ManageApplication" into pi-dev
...
am: 9f5849aaf4
2018-03-26 22:04:24 +00:00
Lei Yu
5dea982625
Merge "Use FIELD_ANOMALY_TYPE for anomalyType" into pi-dev am: 6f22cec26d
...
am: 13a40e76eb
2018-03-26 22:03:30 +00:00
Lei Yu
13a40e76eb
Merge "Use FIELD_ANOMALY_TYPE for anomalyType" into pi-dev
...
am: 6f22cec26d
2018-03-26 21:56:16 +00:00
TreeHugger Robot
9f5849aaf4
Merge "Fix text overlap issue when flinging in ManageApplication" into pi-dev
2018-03-26 21:50:14 +00:00
Lei Yu
6f22cec26d
Merge "Use FIELD_ANOMALY_TYPE for anomalyType" into pi-dev
2018-03-26 21:41:11 +00:00
yuemingw
3434e72f31
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
2018-03-26 20:37:56 +00:00
Kevin Chyn
7319214db9
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
2018-03-26 12:38:21 -07:00
yuemingw
03b617bdea
Merge "Remove account should show policy transparency dialog when DISALLOW_MODIFY_ACCOUNTS is set." into pi-dev am: 21926abed2
...
am: a3db549834
2018-03-26 18:51:49 +00:00
