TreeHugger Robot
1f34a5cf46
Merge "Limit the suggestions to be shown to 5." into oc-mr1-dev
2017-07-27 21:14:43 +00:00
jackqdyulei
8541d8905a
Merge "Don't update the header when toggle menu" into oc-dr1-dev
...
am: 4ab4966e7a
Change-Id: I3a814981c648d9b777d2fbf5a2d243864aaaee3c
2017-07-27 18:21:16 +00:00
TreeHugger Robot
4ab4966e7a
Merge "Don't update the header when toggle menu" into oc-dr1-dev
2017-07-27 18:15:55 +00:00
Soroosh Mariooryad
6f0e9273f8
Merge "Update suggestion ranking model coefficients." into oc-dr1-dev
...
am: c3bb4cd8c0
Change-Id: Ia59839d3b952420390896d06c030905853df92e7
2017-07-27 17:54:48 +00:00
TreeHugger Robot
ea7c30265c
Merge "Add ResultPayload for Allow notification dots" into oc-mr1-dev
2017-07-27 17:53:54 +00:00
Doris Ling
4940539479
Limit the suggestions to be shown to 5.
...
- when creating the dashboard data, pass the sublist of suggestions to
cap the total number of suggestions to be shown to 5.
- if user swipe away the suggestion, it will only remove the suggestion
from the suggestion adapater, and will not trigger rebuilding the whole
UI.
Bug: 64072051
Change-Id: I1efabeb2a805c670007c631d3ccb0fdfbde7b55a
Fix: 63309218
Test: make RunSettingsRoboTests
2017-07-27 10:45:30 -07:00
Soroosh Mariooryad
c3bb4cd8c0
Merge "Update suggestion ranking model coefficients." into oc-dr1-dev
2017-07-27 17:39:04 +00:00
Julia Reynolds
d6ab7dee09
Merge "Revert string change" into oc-dr1-dev
...
am: 4b8f2c9ad5
Change-Id: I7460c5c8ad88e7a504b8b246fbbf50d2757f3df6
2017-07-27 12:43:21 +00:00
TreeHugger Robot
4b8f2c9ad5
Merge "Revert string change" into oc-dr1-dev
2017-07-27 12:36:55 +00:00
Soroosh Mariooryad
a861d11027
Update suggestion ranking model coefficients.
...
- This is not a functional change and it only updates the model weights
which affects the ranking of suggestion items. The previous weights were
tuned to force the ranking to have immediate response to signal changes.
But, the current weights are tuned to maximize the user interactions
with suggestion.
Test: RunSettingsRoboTests & also manually testing suggestions
Bug: 64093782
Change-Id: I9f50ed6c4ed22d1a14110ec61156c14ba74aef64
2017-07-27 00:38:42 -07:00
Andrew Sapperstein
97ca7e473a
Merge "Add ambient notifications as inline setting." into oc-dr1-dev
...
am: 3bd56d970d
-s ours
Change-Id: If5bdc4ddce79552eb06001f29afb550cc48ebd83
2017-07-27 05:41:56 +00:00
TreeHugger Robot
3bd56d970d
Merge "Add ambient notifications as inline setting." into oc-dr1-dev
2017-07-27 05:37:49 +00:00
Andrew Sapperstein
1ee62c16a3
Merge "Fix more config_headlineFontFamily-induced test breakages" into oc-dr1-dev
...
am: 7b445d59ef
Change-Id: Ibe7f73e37c446d908e8b69b2a3789c7b22f34509
2017-07-27 01:21:05 +00:00
Bill Yi
ef36ef28d9
Import translations. DO NOT MERGE am: 05185952c8
-s ours am: 64ce525c6a
-s ours
...
am: b0126e3500
-s ours
Change-Id: Id66f31e0cb7118122723aa5f7ac87837d8075e8a
2017-07-27 01:20:25 +00:00
Matthew Fritze
68617a6f42
Merge "Change SwipeForNotification Payload default to Off" into oc-dr1-dev
...
am: c2cb0d0b9e
Change-Id: I0c11d28b60492723f985c606253a0a9dc6c07595
2017-07-27 01:20:02 +00:00
Andrew Sapperstein
7b445d59ef
Merge "Fix more config_headlineFontFamily-induced test breakages" into oc-dr1-dev
2017-07-27 01:01:26 +00:00
Bill Yi
b0126e3500
Import translations. DO NOT MERGE am: 05185952c8
-s ours
...
am: 64ce525c6a
-s ours
Change-Id: Idfd7931360bf1ac57a9bc7937ceb36ade0839963
2017-07-27 00:55:57 +00:00
jackqdyulei
aa5618fd82
Add ResultPayload for Allow notification dots
...
Bug: 62022517
Test: robotests
Change-Id: I86caa1c8604ae8eff27574ca45b5e9f3f6830f8f
2017-07-26 17:55:11 -07:00
TreeHugger Robot
8e13218ec8
Merge "Fix gestures summary text when there is no sensor for assit." into oc-mr1-dev
2017-07-27 00:50:10 +00:00
Andrew Sapperstein
b3cf0a0923
Fix more config_headlineFontFamily-induced test breakages
...
Change-Id: Ic8a68a77e7ef8a3fd422e53e39d2fee74324c355
Fixes: 64024743
Test: robotests
2017-07-26 17:41:48 -07:00
TreeHugger Robot
c2cb0d0b9e
Merge "Change SwipeForNotification Payload default to Off" into oc-dr1-dev
2017-07-27 00:31:13 +00:00
jackqdyulei
063e87c689
Merge "Set minLines for battery header text" into oc-dr1-dev
...
am: 02560caa92
Change-Id: I2a4d3ed816a7bb938b5613154b8a4bc8f3114142
2017-07-27 00:05:53 +00:00
TreeHugger Robot
02560caa92
Merge "Set minLines for battery header text" into oc-dr1-dev
2017-07-26 23:46:42 +00:00
TreeHugger Robot
5d7fab4f22
Merge "Add ambient notifications as inline setting." into oc-mr1-dev
2017-07-26 23:34:22 +00:00
Bill Yi
64ce525c6a
Import translations. DO NOT MERGE
...
am: 05185952c8
-s ours
Change-Id: I2fcf9dbc20ad0600ac924d106e5a87d49752f379
2017-07-26 23:22:33 +00:00
jackqdyulei
bc86e4747f
Don't update the header when toggle menu
...
If we only toggle the app type in battery settings, don't update
the header. Then it won't have flicker in battery header.
Bug: 64065456
Test: RunSettingsRoboTest
Change-Id: If1cfa745f723f808ad9c5fd921be797acd3199ba
2017-07-26 15:28:59 -07:00
Ajay Nadathur
044485b850
Merge "Use fingerprint icons during setupwizard flow" into oc-dr1-dev
...
am: f5ebc6f7ed
Change-Id: Ia91197e1d6ee74fd890887330da1eaeb932cd5cb
2017-07-26 22:02:33 +00:00
Ajay Nadathur
f5ebc6f7ed
Merge "Use fingerprint icons during setupwizard flow" into oc-dr1-dev
2017-07-26 21:42:12 +00:00
Andrew Sapperstein
50ca1968e6
Add ambient notifications as inline setting.
...
Bug: 62022517
Test: robotest and manual
Change-Id: I7e3faf56a1c8282017a2e84d88e7b0b788a7bfb6
Merged-In: If245f541ec3c8a1627d082b97bba9b325438cfeb
2017-07-26 20:20:19 +00:00
Andrew Sapperstein
e8e65a367b
Add ambient notifications as inline setting.
...
Bug: 62022517
Test: robotest and manual
Change-Id: If245f541ec3c8a1627d082b97bba9b325438cfeb
2017-07-26 20:19:19 +00:00
Matthew Fritze
c36ec8e629
Change SwipeForNotification Payload default to Off
...
Bug: 62022517
Test: make RunSettingsRoboTests
Change-Id: Icf6b1224e0857841dcb0d9dd14948d9ef39110ee
2017-07-26 12:59:50 -07:00
TreeHugger Robot
975d9a18f1
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
2017-07-26 19:39:46 +00:00
jackqdyulei
dbe6bd3984
Set minLines for battery header text
...
So the header won't grow/shrink when the text changes.
Bug: 64065456
Test: Build
Change-Id: I96bb00e81d677b1efd55afbfe5f23024d6afd71b
2017-07-26 11:24:54 -07:00
Doris Ling
9042f822a6
Fix gestures summary text when there is no sensor for assit.
...
Should exit the summary handling if sensor is not available.
Change-Id: I5918fa5ac614db48fc2c41e1de555d1ba6928bd4
Fix: 64039312
Test: make RunSettingsRoboTests
2017-07-26 11:07:19 -07:00
Bill Yi
05185952c8
Import translations. DO NOT MERGE
...
Change-Id: I8f49a9c6acaa689f9269aaca9f22e8b4ab4a5ae0
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
2017-07-26 10:27:31 -07:00
Bill Yi
bd429f42cb
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
...
am: 402abcc9df
-s ours
Change-Id: Ib6905c29f41aaea8c779f1771793da0daa2326dd
2017-07-26 16:46:51 +00:00
TreeHugger Robot
402abcc9df
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
2017-07-26 16:31:13 +00:00
Antony Sargent
1e69f27a41
Merge "Allow open password dialog for wrong-password wifi access points" into oc-dr1-dev
...
am: 9fb7a3b8b4
Change-Id: Ic44e0cf3972085439a603e25374d46447ebe7a8f
2017-07-26 16:18:50 +00:00
Bill Yi
0d07e5e3f3
Import translations. DO NOT MERGE
...
Change-Id: I0dd55f8bfcdc12a551f396cdd6b84072c78bb88e
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
2017-07-26 08:07:49 -07:00
Bill Yi
d5390dac46
Import translations. DO NOT MERGE
...
Change-Id: If2e8b93c86f4499c112549d060696e4b272eb5ce
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
2017-07-26 07:32:24 -07:00
TreeHugger Robot
9fb7a3b8b4
Merge "Allow open password dialog for wrong-password wifi access points" into oc-dr1-dev
2017-07-26 10:53:30 +00:00
Bill Yi
9d33ddc3f7
Import translations. DO NOT MERGE am: 8a25fb603a
-s ours
...
am: 9d7971905c
-s ours
Change-Id: I689d34a1c300988ae315959a6d4fbb48158cffbf
2017-07-26 08:03:07 +00:00
Bill Yi
9d7971905c
Import translations. DO NOT MERGE
...
am: 8a25fb603a
-s ours
Change-Id: If4a3775dac048d13e739174b79415cf025bd4454
2017-07-26 07:59:05 +00:00
Antony Sargent
c00fedc639
Allow open password dialog for wrong-password wifi access points
...
When we're failing to connect to a wifi access point due to an incorrect
password, we want to allow an intent from a notification to open up the
wifi settings page and bring up the dialog for entering a different
password. We already have code in settings to do this for not-yet-saved
access points, so this CL just changes it slightly to also allow it for
saved access points.
Unfortunately WifiSettings can't be tested with Robolectric due to it
not supporting PreferenceScreen, so this adds a test to
WifiSettingsUiTest. There were some existing test failures in that file
which I've fixed while I was in there:
-The TestAccessPointBuilder class wasn't being found at runtime because
it was getting stripped out at build time due to not being used in
settings.
-The changingSecurityStateOnApShouldNotCauseMultipleListItems test was
asserting that we don't end up with multiple entries for the same SSID
in the access point list when changing the security state for the AP,
but it was accidentally passing multiple AP's with the same name the
first time.
Bug: 33245941
Test: runtest --path WifiSettingsUiTest.java
Change-Id: I16c9c8b0d8380a0e26f9b23df6a8d012af6a2476
Merged-In: I929ca6892242059df157c01d6e9ea30e8d1c5e78
2017-07-26 07:00:51 +00:00
Jack He
a65e3e6795
Merge "Bluetooth: reset mConnectionState when adapter is OFF" into oc-dr1-dev
...
am: 0c6f001c09
Change-Id: I2a161d403cf0c8e34a16b1ac9328135c40f7e50a
2017-07-26 06:34:30 +00:00
TreeHugger Robot
0c6f001c09
Merge "Bluetooth: reset mConnectionState when adapter is OFF" into oc-dr1-dev
2017-07-26 06:28:44 +00:00
Doris Ling
dac62d24f4
Merge "Disable Wallpaper setting when Wallpaper is disabled." into oc-dr1-dev
...
am: 4906a2a38a
-s ours
Change-Id: I6f51c2464ab39e78c89625a0e27296c888080333
2017-07-26 06:23:03 +00:00
TreeHugger Robot
4906a2a38a
Merge "Disable Wallpaper setting when Wallpaper is disabled." into oc-dr1-dev
2017-07-26 06:11:07 +00:00
Fan Zhang
43ef9743a2
Merge "Extract method to build preference count logging's name." into oc-dr1-dev
...
am: 5fb56c5b37
Change-Id: I7974307f83886ab9e075eee4ef347ef95562acef
2017-07-26 06:07:37 +00:00
Fan Zhang
5fb56c5b37
Merge "Extract method to build preference count logging's name." into oc-dr1-dev
2017-07-26 05:59:57 +00:00