Commit Graph

44631 Commits

Author SHA1 Message Date
Bill Yi
70d8e8dea2 [automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev
am: 97a1f85291  -s ours

Change-Id: Ief3ac341d55051ca2ea71128d64e4e45298a284c
2018-03-27 21:24:30 +00:00
Lei Yu
71333cb477 Merge "Remove the old battery page" into pi-dev
am: 4e25277f60

Change-Id: Id73aa82818b697cf2754758120a8ff098a68fdd5
2018-03-27 21:11:06 +00:00
Lei Yu
04d13ee378 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
2018-03-27 13:45:25 -07:00
TreeHugger Robot
97a1f85291 Merge "Import translations. DO NOT MERGE" into pi-dev 2018-03-27 20:41:16 +00:00
Fan Zhang
8878a957f8 Add "device is muted/vibrate, click to turn on" conditions
Bug: 76022431
Test: robotests
Change-Id: I89b71f99fa5ef866028912183ad04b053213bb0d
2018-03-27 13:31:12 -07:00
TreeHugger Robot
4e25277f60 Merge "Remove the old battery page" into pi-dev 2018-03-27 20:23:23 +00:00
Daniel Nishi
ec4866b323 Merge "Don't allow a zero-length device name to work." 2018-03-27 19:52:41 +00:00
Vishwath Mohan
670c252429 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
2018-03-27 19:47:08 +00:00
Bill Yi
7764850080 Import translations. DO NOT MERGE
Auto-generated-cl: translation import

Bug: 64712476
Change-Id: Ife3ef6257d8ade3bcc9689171e4365f639c36440
2018-03-27 11:43:44 -07:00
Fan Zhang
473ee0e019 Merge "Add string linter preupload check" into pi-dev am: 49d0205749
am: cb3b32c9c4

Change-Id: I10351f1a71173ccc1e65de12ffbfdbf78c836af9
2018-03-27 16:18:38 +00:00
Fan Zhang
cb3b32c9c4 Merge "Add string linter preupload check" into pi-dev
am: 49d0205749

Change-Id: Icaf820d0d6e4f6b9f56283e93752310355e15b89
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

Change-Id: I577ffa4b4e699a9163a5ca190fcfe08f167dc2f5
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

Change-Id: I4b1d206842370e08e73f32e00404109a55463561
2018-03-27 13:32:12 +00:00
Amin Shaikh
2f6979c9fe Merge "Show wifi status label in preference summary." into pi-dev
am: d467a8bc0f

Change-Id: Icae963b4831b916e615a9e729116135967c5a388
2018-03-27 13:24:24 +00:00
HJ ChangLiao
ac4d617706 Merge "Add title to What to block page" into pi-dev
am: 517f6d602d

Change-Id: I3e898bf29199164d279f611973459fd67b7f347c
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

Change-Id: I909d13c92601b63dccd782af2c0962e81507cc0f
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

Change-Id: Icd55bf16959da9e67b75ec93c53ef21fdcb9014f
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

Change-Id: Ifc207a8adb1ab1e976d540366c3d1ef29588ebfa
2018-03-27 08:44:30 +00:00
yuemingw
8c3bccda2c Merge "Auto time should show dynamic subtext when restricted." into pi-dev
am: d7ea524e81

Change-Id: I161487aff5d83975c6c0e647e8405fab89376f9e
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

Change-Id: Ie15b207e3d75ee862e58be72dc240da9f9d859df
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

Change-Id: I4676626f12b340752bd867c73d45eda5d0124a1c
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

Change-Id: I440c17b8cf5670e40706f07832737927930de986
2018-03-27 06:01:17 +00:00
Adam Newman
211535a10d Merge "Observe NetworkCallback instead of polling" into pi-dev
am: d2fb46eac4

Change-Id: Id06fb42bf1144fa3f04d092718427d484557732f
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

Change-Id: Ib7d4ea27dae28192ce4e1a53324b9062a2e6948b
2018-03-27 05:20:19 +00:00
Jyun LuoLai
283e24a028 Merge "Update Bluetooth related string" into pi-dev am: 198a6495ad
am: 1c502210e3

Change-Id: Id6cdd7982d73835baec447076a49e184979e099d
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

Change-Id: I9fa98d943cafa514b4205a39feeeb07fd9dcbfcb
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

Change-Id: I74be965dce1442a532c13590b105e43ec078c87c
2018-03-27 04:34:46 +00:00
Jyun LuoLai
1c502210e3 Merge "Update Bluetooth related string" into pi-dev
am: 198a6495ad

Change-Id: Icb0cdc09c6c0ccb1d359ff4b5e0887cab9f635d9
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

Change-Id: I3431a6be839f354ee0dc0e982162c894323271c2
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

Change-Id: Ie32dec259c8053d7745e052b81d69f686fe28606
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

Change-Id: I95871ed90bfdc71a77569cb2f9fac9682d47d6ca
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

Change-Id: I884441946a5b64ea66e7cb9e0b8bf9463b80916a
2018-03-27 01:10:50 +00:00
Fan Zhang
3ca50d70ac Merge "Add more string for device muted condition" into pi-dev
am: 2bc477959c

Change-Id: I0d58d639444733484818a557f2c35e4955c75beb
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
Lei Yu
68ffee1a7d 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
2018-03-26 17:40:10 -07:00
Fan Zhang
2bc477959c Merge "Add more string for device muted condition" into pi-dev 2018-03-26 23:55:07 +00:00