Ajay Nadathur
cfc78d7d7c
Update text for lock screen notifications
...
bug: 62844951
Test: Manually tested
Change-Id: Ie6a85c87252f073cb6dec8f3812024cfade49e1e
2017-07-27 00:38:14 +00: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
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
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
06a9a033a0
Merge "Use fingerprint icons during setupwizard flow" into oc-dr1-dev am: f5ebc6f7ed
...
am: 044485b850
2017-07-26 22:26:27 +00:00
Ajay Nadathur
03737f1c9c
Merge "Use fingerprint icons during setupwizard flow" into oc-dr1-dev am: f5ebc6f7ed
...
am: 3c308aef22
2017-07-26 22:16:46 +00:00
Ajay Nadathur
044485b850
Merge "Use fingerprint icons during setupwizard flow" into oc-dr1-dev
...
am: f5ebc6f7ed
2017-07-26 22:02:33 +00:00
Ajay Nadathur
3c308aef22
Merge "Use fingerprint icons during setupwizard flow" into oc-dr1-dev
...
am: f5ebc6f7ed
2017-07-26 22:02:05 +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
Bill Yi
fee1e54914
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
...
am: 975d9a18f1
2017-07-26 19:47:51 +00: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
8c88b53dda
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am: 402abcc9df -s ours
...
am: bd429f42cb
2017-07-26 17:48:32 +00: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
db8172a4fe
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am: 402abcc9df -s ours
...
am: eca6781a49
2017-07-26 17:26:06 +00:00
Antony Sargent
2665600b75
Merge "Allow open password dialog for wrong-password wifi access points" into oc-dr1-dev am: 9fb7a3b8b4
...
am: 1e69f27a41
2017-07-26 17:09:14 +00:00
Bill Yi
eca6781a49
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
...
am: 402abcc9df
2017-07-26 17:04:23 +00:00
Bill Yi
bd429f42cb
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
...
am: 402abcc9df
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
1c84e34cb5
Merge "Allow open password dialog for wrong-password wifi access points" into oc-dr1-dev am: 9fb7a3b8b4
...
am: c3cd88c302
2017-07-26 16:19:02 +00:00
Antony Sargent
1e69f27a41
Merge "Allow open password dialog for wrong-password wifi access points" into oc-dr1-dev
...
am: 9fb7a3b8b4
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
Antony Sargent
c3cd88c302
Merge "Allow open password dialog for wrong-password wifi access points" into oc-dr1-dev
...
am: 9fb7a3b8b4
2017-07-26 11:12:39 +00: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
c2d779e568
Import translations. DO NOT MERGE am: 8a25fb603a -s ours am: 0c3ee7c15d -s ours
...
am: 565664fad7
2017-07-26 08:46:06 +00:00
Bill Yi
565664fad7
Import translations. DO NOT MERGE am: 8a25fb603a -s ours
...
am: 0c3ee7c15d
2017-07-26 08:24:19 +00:00
Android Build Merger (Role)
13607bdea0
Merge "Import translations. DO NOT MERGE am: 8a25fb603a -s ours am: 9d7971905c -s ours am: 9d33ddc3f7 -s ours" into oc-mr1-dev-plus-aosp
2017-07-26 08:06:55 +00:00
Bill Yi
37425295cf
Import translations. DO NOT MERGE am: 8a25fb603a -s ours am: 9d7971905c -s ours
...
am: 9d33ddc3f7
2017-07-26 08:06:37 +00:00
Bill Yi
2bfaa1856b
Import translations. DO NOT MERGE am: 8a25fb603a -s ours am: 9d7971905c -s ours
...
am: a2954b3232
2017-07-26 08:06:35 +00:00
Bill Yi
0c3ee7c15d
Import translations. DO NOT MERGE
...
am: 8a25fb603a
2017-07-26 08:06:13 +00:00
Bill Yi
9d33ddc3f7
Import translations. DO NOT MERGE am: 8a25fb603a -s ours
...
am: 9d7971905c
2017-07-26 08:03:07 +00:00
Bill Yi
a2954b3232
Import translations. DO NOT MERGE am: 8a25fb603a -s ours
...
am: 9d7971905c
2017-07-26 08:03:05 +00:00
Bill Yi
9d7971905c
Import translations. DO NOT MERGE
...
am: 8a25fb603a
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
Android Build Merger (Role)
0792518ba8
Merge "Merge "Bluetooth: reset mConnectionState when adapter is OFF" into oc-dr1-dev am: 0c6f001c09 am: a65e3e6795" into oc-mr1-dev-plus-aosp
2017-07-26 06:38:57 +00:00
Jack He
8f8d7ba466
Merge "Bluetooth: reset mConnectionState when adapter is OFF" into oc-dr1-dev am: 0c6f001c09
...
am: a65e3e6795
2017-07-26 06:38:40 +00:00
Jack He
85d9a7c48a
Merge "Bluetooth: reset mConnectionState when adapter is OFF" into oc-dr1-dev am: 0c6f001c09
...
am: dfc2fb14c6
2017-07-26 06:38:32 +00:00
Jack He
a65e3e6795
Merge "Bluetooth: reset mConnectionState when adapter is OFF" into oc-dr1-dev
...
am: 0c6f001c09
2017-07-26 06:34:30 +00:00
Jack He
dfc2fb14c6
Merge "Bluetooth: reset mConnectionState when adapter is OFF" into oc-dr1-dev
...
am: 0c6f001c09
2017-07-26 06:34:29 +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
Android Build Merger (Role)
40449ad439
Merge "Merge "Disable Wallpaper setting when Wallpaper is disabled." into oc-dr1-dev am: 4906a2a38a am: 3ab3fc9ee4 -s ours" into oc-mr1-dev-plus-aosp
2017-07-26 06:27:25 +00:00
Doris Ling
01c408bc76
Merge "Disable Wallpaper setting when Wallpaper is disabled." into oc-dr1-dev am: 4906a2a38a
...
am: 3ab3fc9ee4
2017-07-26 06:27:07 +00:00
