Sundeep Ghuman
4fd8528c2f
Merge "Use EntityHeaderController in WifiDetailPreferenceController." into oc-dr1-dev
...
am: 09229abbf2
2017-07-05 22:30:22 +00:00
TreeHugger Robot
09229abbf2
Merge "Use EntityHeaderController in WifiDetailPreferenceController." into oc-dr1-dev
2017-07-05 22:21:40 +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
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
Sundeep Ghuman
d569195299
Use EntityHeaderController in WifiDetailPreferenceController.
...
Switch to the Entity header to bring parity in design of
WifiNetworkDetailsFragment and other Settings pages.
Bug: b/37252029
Test: make -j40 RunSettingsRoboTests
Change-Id: Ib11f3d37eac4dca08fa61eef67910cd328682bac
2017-07-05 12:54:38 -07: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
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
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
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
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
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
Salvador Martinez
97642af54d
Merge "Add BatteryInfo logging to settings" into oc-dr1-dev
...
am: 9a3b115cc8
2017-06-30 22:05:53 +00:00
Daniel Nishi
0c48b5a29d
Merge "Use normal layout for "Space Used" header." into oc-dr1-dev
...
am: 7809c3d2f0
2017-06-30 22:05:33 +00:00
TreeHugger Robot
9a3b115cc8
Merge "Add BatteryInfo logging to settings" into oc-dr1-dev
2017-06-30 21:58:38 +00:00
Daniel Nishi
7809c3d2f0
Merge "Use normal layout for "Space Used" header." into oc-dr1-dev
2017-06-30 21:54:38 +00:00
Jason Monk
bc4df21ef7
Allow clicking on guest user
...
am: c1cc9fefa8
2017-06-30 19:43:00 +00:00
jackqdyulei
a66363a787
Make items in Advanced battery page unclickable.
...
Because these items only display info and have no click action:
1. foreground time item
2. background time item
3. battery usage item
Bug: 62423725
Test: Build
Change-Id: I8d15be13953c73fce4d5f42711e186673673a036
2017-06-30 11:11:16 -07:00
Jason Monk
c1cc9fefa8
Allow clicking on guest user
...
This is needed since the user switch will be hidden by default in
QS and will show up once multi-user has been activated in some way.
Test: click on guest
Bug: 37152893
Change-Id: I351a5d95e9e8a5e47e388d9f0611924b077754da
2017-06-30 11:29:40 -04:00
Fan Zhang
517daf43a4
Fix settings robotest
...
am: 4e34839a1e
2017-06-30 03:49:57 +00:00
Fan Zhang
4e34839a1e
Fix settings robotest
...
Change-Id: I0685b1f47ae286a4fdf78a57c21f7a656804754f
Fix: 63146944
Test: robotest
2017-06-30 01:27:20 +00:00
Sundeep Ghuman
b963c1190f
Merge "Don't scroll when removing saved networks." into oc-dr1-dev
...
am: 1e561edb45
2017-06-30 00:04:37 +00:00
Sundeep Ghuman
1e561edb45
Merge "Don't scroll when removing saved networks." into oc-dr1-dev
2017-06-29 23:56:51 +00:00
Salvador Martinez
cc7c9603db
Add BatteryInfo logging to settings
...
This Cl adds a few log statements to BatteryInfo to try
and determine what the bottleneck in the Battery Settings
Advanced page could be.
Test: robotests still pass
Bug: 62959645
Change-Id: I1ff712d97bc8be78873c63e187edbffa8e10cd21
2017-06-29 16:53:27 -07:00
Andrew Sapperstein
8e1c3b9b1b
Merge "Fix robotests." into oc-dr1-dev
...
am: db72caf3ea
2017-06-29 23:35:26 +00:00
Andrew Sapperstein
db72caf3ea
Merge "Fix robotests." into oc-dr1-dev
2017-06-29 23:27:24 +00:00
Andrew Sapperstein
51e4a66446
Fix robotests.
...
Change-Id: Ia0615bfdd303a19b145ead44979a03ccdd29bf41
Fixes: 63141368
Test: robotest
2017-06-29 16:24:32 -07:00
Lei Yu
34c96fff5c
Merge "Update strings for anomaly dialog" into oc-dr1-dev
...
am: 2354fae941
2017-06-29 22:13:36 +00:00
Lei Yu
2354fae941
Merge "Update strings for anomaly dialog" into oc-dr1-dev
2017-06-29 22:08:40 +00:00
Shunta Sato
97419f8d52
Merge "Fix Wi-Fi list adds same AP repeatedly" into oc-dr1-dev
...
am: 9638e020e5
2017-06-29 20:38:03 +00:00
TreeHugger Robot
9638e020e5
Merge "Fix Wi-Fi list adds same AP repeatedly" into oc-dr1-dev
2017-06-29 20:31:18 +00:00
Daniel Nishi
7aad345862
Use normal layout for "Space Used" header.
...
This fixes the issue where the indentation was wrong.
Change-Id: Ie16bcdec87aa8605d65ac33a05c12d7a26b89b55
Fixes: 62548754
Test: Manual
2017-06-29 12:37:23 -07:00
Doris Ling
cf57e17791
Merge "Add account sync summary." into oc-dr1-dev
...
am: 5243d5dd85
2017-06-29 19:02:29 +00:00
