Fan Zhang
aeb94f0e5c
Fix race condition and optimize categoryUpdater refresh
...
- In SettingsActivity, do not call updateCategories() if nothing
changed.
- In SummaryLoader, create a mapping between tile key and summary. This
is necessary to handle a race condition where category is refreshed
after summary load.
- In DashboardSummary, refresh Tile's summary to latest cache value
everytime category is refreshed.
Change-Id: I61389b8ba614ba7e34939325bada6e1bd6fa6709
Fix: 63149109
Test: robotests
2017-07-06 10:13:58 -07:00
TreeHugger Robot
ff45106b49
Merge "Adjust UX for toggles when active scorer is not set."
2017-07-05 21:19:58 +00:00
Android Build Merger (Role)
f612e41f7d
Merge "Merge "Merge "Storage item preferences should be 72dp tall." into oc-dr1-dev am: 37caf9c7da" into oc-dr1-dev-plus-aosp am: 5daad21245"
2017-07-05 20:45:22 +00:00
Daniel Nishi
9e3b0ad50a
Merge "Merge "Storage item preferences should be 72dp tall." into oc-dr1-dev am: 37caf9c7da" into oc-dr1-dev-plus-aosp
...
am: 5daad21245
2017-07-05 20:45:07 +00:00
Android Build Merger (Role)
6c3bdb2ca2
Merge "Merge "Storage item preferences should be 72dp tall." into oc-dr1-dev am: 37caf9c7da am: d7685ec8c8"
2017-07-05 20:45:01 +00:00
Daniel Nishi
cb66524cdf
Merge "Storage item preferences should be 72dp tall." into oc-dr1-dev am: 37caf9c7da
...
am: d7685ec8c8
2017-07-05 20:44:43 +00:00
Daniel Nishi
e2e4c1276a
Merge "Merge "Storage item preferences should be 72dp tall." into oc-dr1-dev am: 37caf9c7da" into oc-dr1-dev-plus-aosp
...
am: 5daad21245
2017-07-05 20:44:42 +00:00
Daniel Nishi
ac4c095f3e
Merge "Storage item preferences should be 72dp tall." into oc-dr1-dev am: 37caf9c7da
...
am: d7685ec8c8
2017-07-05 20:44:22 +00:00
jackqdyulei
e0fa4afc71
Merge "Update the method about foreground time." into oc-dr1-dev am: 96e774b7d7
...
am: b067dea683
2017-07-05 20:43:58 +00:00
Android Build Merger (Role)
5daad21245
Merge "Merge "Storage item preferences should be 72dp tall." into oc-dr1-dev am: 37caf9c7da" into oc-dr1-dev-plus-aosp
2017-07-05 20:42:57 +00:00
Daniel Nishi
33c0f8888b
Merge "Storage item preferences should be 72dp tall." into oc-dr1-dev
...
am: 37caf9c7da
2017-07-05 20:42:44 +00:00
Daniel Nishi
d7685ec8c8
Merge "Storage item preferences should be 72dp tall." into oc-dr1-dev
...
am: 37caf9c7da
2017-07-05 20:42:29 +00:00
jackqdyulei
b067dea683
Merge "Update the method about foreground time." into oc-dr1-dev
...
am: 96e774b7d7
2017-07-05 20:42:10 +00:00
Daniel Nishi
37caf9c7da
Merge "Storage item preferences should be 72dp tall." into oc-dr1-dev
2017-07-05 20:40:41 +00:00
TreeHugger Robot
96e774b7d7
Merge "Update the method about foreground time." into oc-dr1-dev
2017-07-05 20:38:52 +00:00
Android Build Merger (Role)
95cc1f6829
Merge "Merge "Make items in Advanced battery page unclickable." into oc-dr1-dev am: 3a9734261d am: 593049c1d4"
2017-07-05 20:30:51 +00:00
jackqdyulei
2a6abb5e80
Merge "Make items in Advanced battery page unclickable." into oc-dr1-dev am: 3a9734261d
...
am: 593049c1d4
2017-07-05 20:27:29 +00:00
jackqdyulei
6a4f234ec0
Merge "Make items in Advanced battery page unclickable." into oc-dr1-dev am: 3a9734261d
...
am: 593049c1d4
2017-07-05 20:26:39 +00:00
jackqdyulei
593049c1d4
Merge "Make items in Advanced battery page unclickable." into oc-dr1-dev
...
am: 3a9734261d
2017-07-05 20:24:58 +00:00
TreeHugger Robot
3a9734261d
Merge "Make items in Advanced battery page unclickable." into oc-dr1-dev
2017-07-05 20:21:46 +00:00
Stephen Chen
7e27006a7b
Adjust UX for toggles when active scorer is not set.
...
This change fixes two issues: when wakeup is not available, update the
number of items to show above the fold in wifi preferences. When scorer
is not set, grey out wakeup toggle and set summary to reflect the
status.
Bug: 62410973
Bug: 62343859
Test: make RunSettingsRoboTests -j40
Change-Id: I5f4131c6a86eab6c0fb03ea2b5101ba107a9189f
2017-07-05 12:29:06 -07:00
TreeHugger Robot
f0398e1294
Merge "Add an activity that starts DataUsageList fragment for mobile."
2017-07-05 17:40:13 +00:00
Charles He
d5612408af
Merge "Disable incorrect strong auth prompt strings." into oc-dr1-dev am: c619ad77bb
...
am: 3ae7bacff4
2017-07-03 15:38:13 +00:00
Charles He
3ae7bacff4
Merge "Disable incorrect strong auth prompt strings." into oc-dr1-dev
...
am: c619ad77bb
2017-07-03 15:34:45 +00:00
Charles He
c619ad77bb
Merge "Disable incorrect strong auth prompt strings." into oc-dr1-dev
2017-07-03 15:32:09 +00:00
Charles He
701ac5cbee
Disable incorrect strong auth prompt strings.
...
The prompt strings on the confirm credentials screen (pin, password,
pattern) are incorrect. They currently say strong auth is "required
after device restarts". But instead they should be "required for
additional security" because strong auth can be enforced not only after
device or profile restarts, but also after profile key eviction, for
example.
Unfortunately, we've already missed the window for string changes.
Therefore, as an alternative, we use generic prompt strings in this CL,
to avoid conveying the incorrect (and misleading) information. We'll
follow up with another CL in master with a proper string change to fix
the issue.
Bug: 36511626
Test: manual
Test: make SettingsRoboTests
Change-Id: I44f84420b88bb4933ad0afa6e8032af465de0cd3
2017-07-03 09:42:20 +01:00
Bill Yi
10b7b9e943
Merge "Import translations. DO NOT MERGE am: 126ce95bc6 -s ours am: 07a57fc90b -s ours" into oc-dr1-dev-plus-aosp
...
am: a659760862
2017-07-01 16:15:40 +00:00
Bill Yi
9ce196f540
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am: aaeb09e6c7 -s ours
...
am: 8aa5c204f6
2017-07-01 16:15:17 +00:00
Bill Yi
a177e243e8
Import translations. DO NOT MERGE am: 126ce95bc6 -s ours am: 2626c36d29 -s ours
...
am: 44a5f4cece
2017-07-01 16:14:53 +00:00
Android Build Merger (Role)
a659760862
Merge "Import translations. DO NOT MERGE am: 126ce95bc6 -s ours am: 07a57fc90b -s ours" into oc-dr1-dev-plus-aosp
2017-07-01 16:10:18 +00:00
Bill Yi
6532f4c129
Import translations. DO NOT MERGE am: 126ce95bc6 -s ours
...
am: 07a57fc90b
2017-07-01 16:09:54 +00:00
Bill Yi
8aa5c204f6
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
...
am: aaeb09e6c7
2017-07-01 16:09:53 +00:00
Bill Yi
44a5f4cece
Import translations. DO NOT MERGE am: 126ce95bc6 -s ours
...
am: 2626c36d29
2017-07-01 16:09:34 +00:00
TreeHugger Robot
aaeb09e6c7
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
2017-07-01 16:06:05 +00:00
Bill Yi
07a57fc90b
Import translations. DO NOT MERGE
...
am: 126ce95bc6
2017-07-01 16:05:02 +00:00
Bill Yi
2626c36d29
Import translations. DO NOT MERGE
...
am: 126ce95bc6
2017-07-01 16:05:02 +00:00
Kevin Chyn
9fde3fe2ab
Merge "Assist gesture setting should not be available on unsupported devices" into oc-dr1-dev am: 72a94e9f5a
...
am: 408efb26f0
2017-07-01 03:11:52 +00:00
Kevin Chyn
408efb26f0
Merge "Assist gesture setting should not be available on unsupported devices" into oc-dr1-dev
...
am: 72a94e9f5a
2017-07-01 03:06:52 +00:00
TreeHugger Robot
72a94e9f5a
Merge "Assist gesture setting should not be available on unsupported devices" into oc-dr1-dev
2017-07-01 02:59:19 +00:00
Bill Yi
126ce95bc6
Import translations. DO NOT MERGE
...
Change-Id: Id991a5f419ccb85d8e25a5111b717a84e4de6184
Auto-generated-cl: translation import
2017-06-30 18:07:52 -07:00
TreeHugger Robot
d9f978af21
Merge "Code cleanup: DashboardAdapter.category is no longer a list"
2017-07-01 01:06:58 +00:00
Bill Yi
7df73c0524
Import translations. DO NOT MERGE
...
Change-Id: I67181f9f767d7edccf78f901ad70e903b123649f
Auto-generated-cl: translation import
2017-06-30 18:02:00 -07:00
Fan Zhang
63b43c082d
Change permission preference to only 1 line summary am: 32a8568230
...
am: 33a91c5004
2017-07-01 00:49:43 +00:00
Fan Zhang
33a91c5004
Change permission preference to only 1 line summary
...
am: 32a8568230
2017-07-01 00:45:13 +00:00
Kevin Chyn
1db30b7749
Assist gesture setting should not be available on unsupported devices
...
Fixes: 63176246
Test: manual
Change-Id: I17cd338eafd2e1a86d1e82d81bc9817eaf18d57b
2017-06-30 16:27:49 -07:00
jackqdyulei
43cbee6914
Update the method about foreground time.
...
For now it uses MIN(STATE_TOP_TIME, FOREGROUND_ACTIVITY_TIME) and this
method is used in both display and screen smearing.
Bug: 63080621
Test: RunSettingsRoboTests
Change-Id: I2ca3109697aa66fae67d8b2f4f10c4d08bb99d59
2017-06-30 16:18:29 -07:00
TreeHugger Robot
25faa52b34
Merge "Move the placeholder in Account detail page above Account sync."
2017-06-30 23:00:19 +00:00
TreeHugger Robot
b35d7301d7
Merge "Remove animation from account detail page."
2017-06-30 22:49:31 +00:00
Fan Zhang
b487fae5d8
Code cleanup: DashboardAdapter.category is no longer a list
...
We only ever display a single DashboardCategory in homepaeg, so the
category doesn't need to be a list in DashboardData/Adapter
Change-Id: I57db02bb45cbc511f0fce1bf33043b51ef9db15c
Fix: 33861822
Test: updated robotests
2017-06-30 15:30:51 -07:00
Fan Zhang
32a8568230
Change permission preference to only 1 line summary
...
Test: visual
Change-Id: I0e397c096eac19d312c5632cd7f0a1856c199b96
Fix: 36413664
2017-06-30 22:29:27 +00:00
