Fan Zhang
c144c9c380
Merge "Update icon for language settings" into oc-dr1-dev am: 124232d6fa
...
am: 6175c9cc6a
2017-06-27 18:53:25 +00:00
daqi
3251bb4a42
Merge "Fix PremiumSmsAccess memory leak" am: 31a2f413f8 -s ours am: 34fe9136c6 am: 96e566a68c
...
am: 49729cbd9e
2017-06-27 18:53:02 +00:00
Kevin Chyn
958b3c9ba0
Merge "Remove unnecessary functions from AssistGestureFeatureProvider" into oc-dr1-dev am: 0e393d4163
...
am: 4efa54e342
2017-06-27 18:52:13 +00:00
jackqdyulei
6b7ff12008
Merge "Update the chargeLabel when battery level is full" into oc-dr1-dev am: 1eb2f15339
...
am: e9d1f6f1ae
2017-06-27 18:46:14 +00:00
TreeHugger Robot
2f09c9e4c8
Merge "resolve merge conflicts of 758b2d4ae6 to master"
2017-06-27 18:39:34 +00:00
Fan Zhang
8a1fd388fd
Improve delete fingerprint UI.
...
- Make fingerprint preference use two_target preference
- And add a delete button as secondary target
- Remove delete fingerint code from RenameDeleteDialog, and move to new
DeleteFingerprintDialog
- Some code cleanup
- Tests
Change-Id: I49d9c7d1d03497f07c7e20a805f23e6da934f587
Fix: 37783186
Test: make RunSettingsRoboTests
2017-06-27 11:33:23 -07:00
Sean Stout
d695f232d5
Merge "Add Night Light to Settings widget" into oc-dr1-dev
...
am: 2b0ea1c710
2017-06-27 18:10:15 +00:00
Sean Stout
2b0ea1c710
Merge "Add Night Light to Settings widget" into oc-dr1-dev
2017-06-27 18:04:30 +00:00
Andrew Sapperstein
a35b49a17d
Merge "Search results page polish" into oc-dr1-dev
...
am: 692a4b5514
2017-06-27 17:02:58 +00:00
TreeHugger Robot
692a4b5514
Merge "Search results page polish" into oc-dr1-dev
2017-06-27 16:53:54 +00:00
TreeHugger Robot
326c91c8b5
Merge "Show IMSI in RadioInfo."
2017-06-27 16:23:38 +00:00
Phil Weaver
928045e5d5
Merge "Adjust a11y shortcut settings based on UX input"
2017-06-27 15:09:35 +00:00
Charles He
fc1ce57b13
Disable always-on VPN options if an app has opted out.
...
The user can turn on / off always-on for individual VPN apps in
Settings > Network > VPN. Now that we're providing an opt-out of the
always-on feature for VPN apps, we should disabled the toggles if the
VPN app has an explicit opt-out.
Related unit tests are also removed as the check is now performed in the
frameworks, not in Settings.
Bug: 36650087
Test: CTS Verifier
Change-Id: I486fec14a1f8b86e7120dbdbfed3885801ab4dd7
2017-06-27 14:14:31 +01:00
Bill Yi
8e132ce53c
Import translations. DO NOT MERGE
...
Change-Id: I19a85ce3981e7aac6708b6aa2d78fd51c9d03141
Auto-generated-cl: translation import
2017-06-27 00:26:26 -07:00
Bill Yi
fda3a11ba7
Import translations. DO NOT MERGE
...
Change-Id: I032ef2ee9e18202c2b114497577e8fd770ec6775
Auto-generated-cl: translation import
2017-06-27 00:20:56 -07:00
Kevin Chyn
b26ac1f381
Merge "Fix assist gesture settings summary" into oc-dr1-dev
...
am: 63e36128e6
2017-06-27 03:34:30 +00:00
TreeHugger Robot
63e36128e6
Merge "Fix assist gesture settings summary" into oc-dr1-dev
2017-06-27 03:28:43 +00:00
Andrew Sapperstein
f4b40fa221
Merge "Dashboard search bar polish" into oc-dr1-dev
...
am: 3b7ed7ae65
2017-06-27 02:35:15 +00:00
TreeHugger Robot
3b7ed7ae65
Merge "Dashboard search bar polish" into oc-dr1-dev
2017-06-27 02:28:26 +00:00
jackqdyulei
8ce27bc37c
resolve merge conflicts of 758b2d4ae6 to master
...
Test: I solemnly swear I tested this conflict resolution.
Change-Id: Ic82e244ad1485bdd1f73cff628e0e343bfdb1c53
2017-06-26 18:30:40 -07:00
TreeHugger Robot
58005fc5c1
Merge "Fix assist gesture settings summary"
2017-06-27 01:22:17 +00:00
Maurice Lam
57e61ba4f3
Merge "Rename buttons in lock screen setup" into oc-dr1-dev
...
am: fbfca43e6e
2017-06-27 01:17:25 +00:00
Maurice Lam
467f39d243
Merge "Update skip button label to "Do it later"" into oc-dr1-dev
...
am: b97f91c971
2017-06-27 01:17:05 +00:00
Maurice Lam
a3eb263479
Merge "Add skip button to fingerprint enrolling screen" into oc-dr1-dev
...
am: 624212f43c
2017-06-27 01:16:46 +00:00
Maurice Lam
2cc641940d
Merge "Update buttons in FP find sensor" into oc-dr1-dev
...
am: a102714c19
2017-06-27 01:16:16 +00:00
Maurice Lam
fbfca43e6e
Merge "Rename buttons in lock screen setup" into oc-dr1-dev
2017-06-27 01:10:49 +00:00
Maurice Lam
b97f91c971
Merge "Update skip button label to "Do it later"" into oc-dr1-dev
2017-06-27 01:10:37 +00:00
Maurice Lam
624212f43c
Merge "Add skip button to fingerprint enrolling screen" into oc-dr1-dev
2017-06-27 01:10:23 +00:00
Maurice Lam
a102714c19
Merge "Update buttons in FP find sensor" into oc-dr1-dev
2017-06-27 01:10:10 +00:00
Kevin Chyn
57c7294e57
Merge "Remove unnecessary functions from AssistGestureFeatureProvider"
2017-06-27 00:45:31 +00:00
Andrew Sapperstein
ab0c049bc2
Search results page polish
...
Changes made:
- up button added and in correct place
- text color correct when entering query
- query text aligned with results
- grey background around searchbar
Fixes: 37477506
Test: robotests
Change-Id: Ieb135f81f684032f3d5e4102304e617088c88117
2017-06-26 17:19:53 -07:00
TreeHugger Robot
60b71f53e3
Merge "resolve merge conflicts of 31a2f413f8 to master"
2017-06-27 00:14:14 +00:00
TreeHugger Robot
4c1a871216
Merge "Dashboard search bar polish"
2017-06-27 00:11:59 +00:00
Kevin Chyn
59f901861b
Remove unnecessary functions from AssistGestureFeatureProvider
...
Fixes: 62945918
Test: make -j RunSettingsRoboTests && manual
Change-Id: I13438e6741a3398d06917b45f098c13df7dff97e
2017-06-26 16:58:43 -07:00
Sundeep Ghuman
eb41c8cf15
Scroll to top when connecting to network.
...
Bug: b/34093572
Test: Open wifi picker. Select new network. Picker should scroll to top
of list to display the connected access point category.
Change-Id: Ie555f076a62e8cb589f8c6157d628b345cd84a4c
2017-06-26 16:57:27 -07:00
TreeHugger Robot
68fcefed1e
Merge "Remove redundant talkback readout when rebooting device"
2017-06-26 22:30:48 +00:00
Fan Zhang
6175c9cc6a
Merge "Update icon for language settings" into oc-dr1-dev
...
am: 124232d6fa
2017-06-26 22:22:30 +00:00
daqi
49729cbd9e
Merge "Fix PremiumSmsAccess memory leak" am: 31a2f413f8 -s ours am: 34fe9136c6
...
am: 96e566a68c
2017-06-26 22:20:53 +00:00
daqi
96e566a68c
Merge "Fix PremiumSmsAccess memory leak" am: 31a2f413f8 -s ours
...
am: 34fe9136c6
2017-06-26 22:18:38 +00:00
Fan Zhang
896f1b363c
Reduce jank around loading view when opening data usage UI
...
Change-Id: I3d23d8160b046de8fe125ba0697b7b3d7786453c
Fix: 28181319
Test: robotests
2017-06-26 15:15:30 -07:00
TreeHugger Robot
124232d6fa
Merge "Update icon for language settings" into oc-dr1-dev
2017-06-26 22:08:34 +00:00
daqi
34fe9136c6
Merge "Fix PremiumSmsAccess memory leak"
...
am: 31a2f413f8
2017-06-26 22:05:13 +00:00
daqi
ba3c8edc2f
resolve merge conflicts of 31a2f413f8 to master
...
Test: I solemnly swear I tested this conflict resolution.
Change-Id: I2d665a710a58d9e18d56517bffb69f42b9ffe7a6
2017-06-26 15:04:15 -07:00
Andrew Sapperstein
c0d544943f
Merge commit 'e414cd231656314442cb503f9cda3677561dc44a' into manual_merge_e414cd2316
...
Test: none
Change-Id: I5dedcc30c9f15fa61532ecad2e0f68de4fd97c8e
2017-06-26 14:28:10 -07:00
Treehugger Robot
31a2f413f8
Merge "Fix PremiumSmsAccess memory leak"
2017-06-26 21:13:49 +00:00
TreeHugger Robot
c26ae0677e
Merge "Fix typo in metrics constants"
2017-06-26 21:06:48 +00:00
Kevin Chyn
891ab1a713
Fix assist gesture settings summary
...
Bug: 62841640
Test: make -j RunSettingsRoboTests && manual testing of settings
Change-Id: I75ffce4ff1054dad6b2733a7d4f6bc7e526a8034
2017-06-26 13:36:02 -07:00
Kevin Chyn
4efa54e342
Merge "Remove unnecessary functions from AssistGestureFeatureProvider" into oc-dr1-dev
...
am: 0e393d4163
2017-06-26 20:30:56 +00:00
jackqdyulei
e9d1f6f1ae
Merge "Update the chargeLabel when battery level is full" into oc-dr1-dev
...
am: 1eb2f15339
2017-06-26 20:30:26 +00:00
TreeHugger Robot
0e393d4163
Merge "Remove unnecessary functions from AssistGestureFeatureProvider" into oc-dr1-dev
2017-06-26 20:23:11 +00:00
