Commit Graph

38161 Commits

Author SHA1 Message Date
Andrew Sapperstein
3b30cbee7d Merge "Add ambient notifications as inline setting." into oc-dr1-dev
am: 3bd56d970d

Change-Id: I339952e598c48b1fedd0ecdaa05db164484d94cf
2017-07-27 05:41:58 +00:00
TreeHugger Robot
3bd56d970d Merge "Add ambient notifications as inline setting." into oc-dr1-dev 2017-07-27 05:37:49 +00:00
Ryusuke Sawa
a15be47bd5 Show Error dialog when WPS is interrupted
When WPS searching is interruptd by turning Wi-Fi off,
Error dialog should be displayed.

Bug: 29883134
Test: manual - tap WPS Push Button and turn Airplane mode on

Change-Id: Ie6667c6b7d09540af21b015e0d5b991d818d2c77
2017-07-27 10:53:31 +09:00
Bill Yi
a9fc19e385 Import translations. DO NOT MERGE am: 05185952c8 -s ours am: 64ce525c6a -s ours
am: e3e1e7b9d4  -s ours

Change-Id: I851c408375fa08799cc3be2330e18a928abd89e3
2017-07-27 01:24:51 +00:00
Andrew Sapperstein
fe35c40dad Merge "Fix more config_headlineFontFamily-induced test breakages" into oc-dr1-dev
am: 7b445d59ef

Change-Id: I44d837dd039a13ef7f2bf236657a5fae3640b0be
2017-07-27 01:20:05 +00:00
Bill Yi
1602913a75 Import translations. DO NOT MERGE am: 05185952c8 -s ours am: 64ce525c6a -s ours
am: b0126e3500  -s ours

Change-Id: Ie1a52928c7d6a8f8da3444e74249da90a62d7b00
2017-07-27 01:10:19 +00:00
Matthew Fritze
9092e1a0b0 Merge "Change SwipeForNotification Payload default to Off" into oc-dr1-dev
am: c2cb0d0b9e

Change-Id: I701fb6fc2d74fef1fce1f4b0d21c86d79012b76d
2017-07-27 01:09:55 +00:00
jackqdyulei
75e89dfede Merge "Set minLines for battery header text" into oc-dr1-dev
am: 02560caa92

Change-Id: I0bc848b91594cb0adfd2900ce2678f6acc6ef66e
2017-07-27 01:08:43 +00:00
Jeff Davidson
a0b8472c4d Remove eSIM reset checkbox and always perform the reset.
Due to substantial risk in landing the "retain profiles" flow that
would otherwise occur if the user elected not to wipe eSIM profiles
during a factory reset, we no longer expose this option to users
through the UI. Instead, we show affected users messaging indicating
that their eSIM will be wiped unconditionally.

The underlying plumbing is retained to keep the change small and to
make it easier to revert back to a checkbox when the rest of the
platform supports it.

Change-Id: Ida7df14d81ffc4cb6b4b414928d3ce7e5c78594b
Fixes: 64081853
Test: TreeHugger
2017-07-27 01:05: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
Bill Yi
e3e1e7b9d4 Import translations. DO NOT MERGE am: 05185952c8 -s ours
am: 64ce525c6a  -s ours

Change-Id: Ided1154cb4002792a68ddfed98dd057d7f88e620
2017-07-27 00:55:32 +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
TreeHugger Robot
02560caa92 Merge "Set minLines for battery header text" into oc-dr1-dev 2017-07-26 23:46:42 +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
3c308aef22 Merge "Use fingerprint icons during setupwizard flow" into oc-dr1-dev
am: f5ebc6f7ed

Change-Id: I106b98a55eec646959a4f00c44074efc9f0dbe39
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
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
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
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
eca6781a49 Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
am: 402abcc9df  -s ours

Change-Id: I8b980099381db8f56e3a339dfe497cce93595674
2017-07-26 17:04:23 +00:00
TreeHugger Robot
402abcc9df Merge "Import translations. DO NOT MERGE" into oc-dr1-dev 2017-07-26 16:31:13 +00: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

Change-Id: I63ea14bf12934edfe259ab04beae4653082fbf25
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
565664fad7 Import translations. DO NOT MERGE am: 8a25fb603a -s ours
am: 0c3ee7c15d  -s ours

Change-Id: Id2a54f2d8f8dd4a0558b95bf70f9ccd36c8d70b5
2017-07-26 08:24:19 +00:00
Bill Yi
0c3ee7c15d Import translations. DO NOT MERGE
am: 8a25fb603a  -s ours

Change-Id: Ic9ca03e989bf73561c4884cf168a33f64c02973f
2017-07-26 08:06:13 +00:00
Bill Yi
a2954b3232 Import translations. DO NOT MERGE am: 8a25fb603a -s ours
am: 9d7971905c  -s ours

Change-Id: I7f2e3e064028eb5634b3896ea24cee481d6e3c88
2017-07-26 08:03:05 +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
dfc2fb14c6 Merge "Bluetooth: reset mConnectionState when adapter is OFF" into oc-dr1-dev
am: 0c6f001c09

Change-Id: I6f9494b049d3e366c96edb60686fc8622c8b76d6
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
Doris Ling
3ab3fc9ee4 Merge "Disable Wallpaper setting when Wallpaper is disabled." into oc-dr1-dev
am: 4906a2a38a

Change-Id: Ie5ad8d1e5a943f2d3f878ad6f30ac1f56c80085d
2017-07-26 06:23:08 +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
2583cbe16b Merge "Extract method to build preference count logging's name." into oc-dr1-dev
am: 5fb56c5b37

Change-Id: Id4ae064a804b649b431913f02bde26013c1c87c2
2017-07-26 06:07:30 +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
Bill Yi
8a25fb603a Import translations. DO NOT MERGE
Change-Id: Id4aa99e287f17df735e0998f3989b38bb9170cbf
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
2017-07-25 21:25:48 -07:00
Christine Franks
be0ac89704 Merge "Restrict changing wi-fi networks" into oc-dr1-dev
am: a7e10e0316

Change-Id: Ia864cb26244e294b7e6a31ebfd559dd727ef7003
2017-07-26 02:56:36 +00:00
Christine Franks
a7e10e0316 Merge "Restrict changing wi-fi networks" into oc-dr1-dev 2017-07-26 02:38:08 +00:00
Doris Ling
f8bb8a9792 Merge "Add divider line below "see all apps" preference" into oc-dr1-dev
am: 0e9711ab92

Change-Id: I80aee4e13aff91ac66309df438511826a2b75187
2017-07-26 02:08:44 +00:00
TreeHugger Robot
0e9711ab92 Merge "Add divider line below "see all apps" preference" into oc-dr1-dev 2017-07-26 02:02:32 +00:00
Matthew Fritze
ee18f9f8aa Merge "Add default value to inline payloads" into oc-dr1-dev
am: 5aca5f3aec

Change-Id: Iabc71663e942b453e8125bc19401adccc06e85a3
2017-07-26 01:57:29 +00:00
TreeHugger Robot
5aca5f3aec Merge "Add default value to inline payloads" into oc-dr1-dev 2017-07-26 01:52:38 +00:00
Jack He
70f293ee50 Bluetooth: reset mConnectionState when adapter is OFF
* No device is connected when Bluetooth adapter is OFF
* BluetoothSummaryUpdater should reset its connection state tracker in
  order to display the correct summary message on ConnectedDevice
  preference
* Otherwise, "Connected to null" will be shown because no device is
  connected while BluetoothSummaryUpdater is still in CONNECTED state
* Removed unused imports from BluetoothSummaryUpdater
* Write additional unit test to verify the above behaviour
* Add additional logging when deviceName is null in CONNECTED state

Bug: 62492716
Test: Pair and connect to Bluetooth device, turning Bluetooth ON/OFF,
      unit tests
Change-Id: I30726636f5678d61d6052f5b8d211aa20f26f409
2017-07-26 00:31:55 +00:00
Andrew Sapperstein
3db8c874f1 Merge "Fix robotests." into oc-dr1-dev
am: b5696a9162

Change-Id: I126be625a1b9114ca067dca0f2fe99c7aa395873
2017-07-25 23:51:03 +00:00
Fan Zhang
ae70d2cd34 Extract method to build preference count logging's name.
Bug: 35066566
Test: robotests still pass
Change-Id: I665b7ecea9866227ef3cb06bf4aebacbfa2c65a9
2017-07-25 16:49:43 -07:00
Doris Ling
3230d95f9c Disable Wallpaper setting when Wallpaper is disabled.
Check whether the wallpaper picker is enabled in
WallpaperPreferenceController.isAvailable() instead of always returning
true.

Change-Id: I85fb90ad783e5be008c9343a0804893604814bd1
Merged-In: Ie3a4a68b728ccab1a7aa50c0018a5153907c49b4
Merged-In: I1afba6639a2b94f9d57f546c220f417092f92387
Fix: 63939450
Test: make RunSettingsRoboTests
2017-07-25 16:40:30 -07:00