Commit Graph

19025 Commits

Author SHA1 Message Date
Maurice Lam
a4b54e52ba Merge "Fix bad string reference" into oc-mr1-dev am: f4716e89c0
am: f7a818345d

Change-Id: I3c9bb76c5c986d58e2b91ae25cdb2a7333d78249
2017-08-17 07:13:41 +00:00
Maurice Lam
f7a818345d Merge "Fix bad string reference" into oc-mr1-dev
am: f4716e89c0

Change-Id: I8f0a632761f30aff990dad51cff99f0a7907b94c
2017-08-17 01:21:10 +00:00
TreeHugger Robot
74ca171dba Merge "Update detail icon only if its signal level changed." 2017-08-16 20:48:12 +00:00
Maurice Lam
209410dd2a Fix bad string reference
The source string was removed but there are still references to it.
Updating the references as well in this CL.

Test: mma with ANDROID_AAPT_IGNORE on locale files
Bug: 64763091
Change-Id: I43ef63207e884cbaa92ff3853b0f1fd690cf05f8
2017-08-16 13:39:12 -07:00
Fan Zhang
0654a22578 Merge "Stub out feature flag UI" 2017-08-16 20:27:14 +00:00
TreeHugger Robot
c99ef27f8d Merge "Remove "saved networks" from search indexing" 2017-08-16 19:36:34 +00:00
Eric Schwarzenbach
241cb0db02 Update detail icon only if its signal level changed.
Changes behavior to only render the wifi pie icon if the new rssi has
resulted in a new signal level.

Bug: 64712237
Test: make -j40 ROBOTEST_FILTER=WifiDetailPreferenceControllerTest
RunSettingsRoboTests

Change-Id: I01be2f87d61489242d646ff2003db13c9268ea14
2017-08-16 11:52:17 -07:00
Maurice Lam
2c43d273b8 Merge "Update strings for screen lock setup" 2017-08-16 17:40:52 +00:00
Fan Zhang
ec96dc1542 Remove "saved networks" from search indexing
Change-Id: Ic8c1f8cee2c2a325ba3518d52d0c35b230a6abfd
Fixes: 64755091
Test: robotests
2017-08-16 10:31:16 -07:00
Maurice Lam
0c39aa781e Merge "Don't launch Choose Lock again if recreating" into oc-mr1-dev am: 0ece5f2a06
am: 2dad90da4b

Change-Id: Iadffbc4f2e84c9c36ed7d0470831aac6bb0656f4
2017-08-16 08:09:50 +00:00
Maurice Lam
2dad90da4b Merge "Don't launch Choose Lock again if recreating" into oc-mr1-dev
am: 0ece5f2a06

Change-Id: Ib00277edf9edc35fbb0c279f1e103c02c0e508fc
2017-08-16 08:04:41 +00:00
TreeHugger Robot
0ece5f2a06 Merge "Don't launch Choose Lock again if recreating" into oc-mr1-dev 2017-08-16 07:51:27 +00:00
Fan Zhang
75cd1d2010 Stub out feature flag UI
Bug: 36222960
Test: make -j40 RunSettingsRoboTests
Change-Id: Id2483d39018b2d93868f4ef7032124795ea91a53
2017-08-15 17:42:58 -07:00
TreeHugger Robot
0dfd1f7dc1 Merge "Remove references to NetworkBadging." 2017-08-16 00:11:56 +00:00
Fan Zhang
0764a663fc Merge "Compute aspect ratio properly" 2017-08-15 23:37:59 +00:00
Maurice Lam
2bb6238044 Don't launch Choose Lock again if recreating
When ChooseLockGeneric is recreated, don't automatically launch
ChooseLock[Password/Pattern] even if the corresponding intent extras
are specified, because one would have been launched in the previous
onCreate.

Test: Manual
Bug: 64605627
Change-Id: I227a14abb2f4dd6c4577186a3d8164df0bec7791
2017-08-15 16:26:05 -07:00
Fan Zhang
36717d4399 Compute aspect ratio properly
Change-Id: Ic4e1f20f7354b9ab5f4e9c7564d16d06324ec23d
Fixes: 64608152
Test: visual
2017-08-15 11:14:58 -07:00
Eric Schwarzenbach
27a1b76fdc Remove references to NetworkBadging.
Removes all references to the deprecated NetworkBadging class. Replaces
Badging enums with AccessPoint.Speed. Uses SettingsLib Utils class to
get the WifiIcons.

Note: This change depends on ag/2676505.

Bug: 62355275
Test: make -j40 RunSettingsRoboTests
Change-Id: If3301ce30e22a7b2cc4d534b0a89e6d7ddfef45b
2017-08-15 09:49:53 -07:00
Jesse Evans
51a13df33a Merge "Change strings from Instant app account to setting" into oc-mr1-dev am: 858ea46a3a
am: eee0e82fba

Change-Id: I996ed8caf0581cc3f273423b7d8d3989235e2f4e
2017-08-15 02:43:00 +00:00
TreeHugger Robot
7d32761da4 Merge "Add userId to key when type is USER" 2017-08-15 01:47:05 +00:00
Jesse Evans
eee0e82fba Merge "Change strings from Instant app account to setting" into oc-mr1-dev
am: 858ea46a3a

Change-Id: I22fb4b6d3ee5456a591f8dfa8f78d9f6d6da82dd
2017-08-15 01:37:07 +00:00
Maurice Lam
841288144c Update strings for screen lock setup
Manual cherry pick of 3eb4c8333e

Test: Manual, existing tests pass
Bug: 64084524
Change-Id: Iff4b004aaf504ae3d574428e41bf91fd46a66f30
2017-08-14 22:45:30 +00:00
Fan Zhang
97e535b603 Use ThreadUtils instead of AsyncTask to get app title/icon
Change-Id: I44459d9e4a11329a3bd3bfda5057e05eb7e04d6a
Fixes: 63620905
Test: robotest
2017-08-14 12:46:24 -07:00
jackqdyulei
44dc63ec7b Add userId to key when type is USER
Before this cl, the app list couldn't distinguish different users
because all of them have the same key: USER.

This cl adds userId into key, to make sure the preference key
is unique.

Bug: 64605854
Test: RunSettingsRoboTests
Change-Id: Ia4de2ff85b214465a35f1983ca69a9280d053154
2017-08-14 18:36:31 +00:00
Jesse Evans
804b0daf49 Change strings from Instant app account to setting
Test: existing tests
Bug: 63762769
Change-Id: I5499f76b9f8b5f513813c4ee09a4fb00c96c3fd4
2017-08-11 18:12:42 -07:00
Maurice Lam
a773403cd2 Update strings for screen lock setup
am: 3eb4c8333e

Change-Id: If48e98edbdc3eb7266ca951e23994942f31c2ef4
2017-08-12 00:22:14 +00:00
Maurice Lam
3eb4c8333e Update strings for screen lock setup
Test: Manual, existing tests pass
Bug: 64084524
Change-Id: Iff4b004aaf504ae3d574428e41bf91fd46a66f30
2017-08-11 13:12:20 -07:00
Kevin Chyn
e3ca685321 Merge "Reset fingerprint lockout upon successful unlock" into oc-mr1-dev am: 2e7b65f74a
am: 5e8f4b6320

Change-Id: Iafc8de444be0c455a8b6e3e51c3b6b407fd125e5
2017-08-11 17:49:58 +00:00
Kevin Chyn
5e8f4b6320 Merge "Reset fingerprint lockout upon successful unlock" into oc-mr1-dev
am: 2e7b65f74a

Change-Id: I20ab95a2a6b677ac04cd46dbf89775f1cd8f071c
2017-08-11 17:34:35 +00:00
TreeHugger Robot
2e7b65f74a Merge "Reset fingerprint lockout upon successful unlock" into oc-mr1-dev 2017-08-11 17:26:08 +00:00
Ajay Nadathur
2c2d41f8e9 Merge "Update strings for skip fingerprint setup" into oc-mr1-dev am: 719d80e6e0
am: aec29ee4be

Change-Id: I66480f242ed99d3f6488b2c832b0b2745e7432e8
2017-08-11 17:25:31 +00:00
Ajay Nadathur
aec29ee4be Merge "Update strings for skip fingerprint setup" into oc-mr1-dev
am: 719d80e6e0

Change-Id: I844147fa567fd168dbf14effb746d96aee12ad3a
2017-08-11 17:21:24 +00:00
Ajay Nadathur
719d80e6e0 Merge "Update strings for skip fingerprint setup" into oc-mr1-dev 2017-08-11 17:12:26 +00:00
Tony Mantler
db02207999 Merge "Don't lose dialogs during configuration change" 2017-08-11 16:28:43 +00:00
Kevin Chyn
a7144ae5b2 Merge "Clean up AssistGesturePreferenceController" into oc-mr1-dev am: 14450c5669
am: e54e3de80c

Change-Id: Ifa1964b6d9d6b32e8b2fc440c40f2431ddcc7b43
2017-08-11 03:11:27 +00:00
Kevin Chyn
e54e3de80c Merge "Clean up AssistGesturePreferenceController" into oc-mr1-dev
am: 14450c5669

Change-Id: I511a265ff31d6ced75bc3915c97e09eb95cbbc51
2017-08-11 03:06:19 +00:00
TreeHugger Robot
14450c5669 Merge "Clean up AssistGesturePreferenceController" into oc-mr1-dev 2017-08-11 03:01:33 +00:00
Kevin Chyn
bd947c7ba9 Clean up AssistGesturePreferenceController
The preference controller shouldn't be shared between the
"Assist Gesture" parent setting, and the child setting within

Fixes: 64318213

Test: manual test of settings && make -j RunSettingsRoboTests
Change-Id: I2d2437e2036881a08977924dc1386aa1fab67070
2017-08-11 00:58:09 +00:00
Ajay Nadathur
58c2da2d9e Update strings for skip fingerprint setup
bug: 64092225
Test: Manually tested and verified updated strings used
Change-Id: I813f72abb8cb9fd2ba9ec952c0926ecd2f670ed0
2017-08-11 00:42:30 +00:00
TreeHugger Robot
65e557754e Merge "onConnectedChanged should not update access points" 2017-08-10 23:35:07 +00:00
Tony Mantler
ff2f8c61ba Don't lose dialogs during configuration change
Bug: 62442606
Test: Rotate device when a dialog is showing
Change-Id: I616d6030e2c43937e4b59dd7f6d78dd7124228dc
2017-08-10 14:21:04 -07:00
Joachim Sauer
8a739a4bd1 Merge "Implement auto 12/24h setting toggle." 2017-08-10 16:36:47 +00:00
Joachim Sauer
95beae0089 Implement auto 12/24h setting toggle.
This implements an explicit toggle to enable/disable automatic 12h/24h
time formatting detection based on the current locale.

Previously automatic detection was the norm on a freshly wiped device,
but could never be re-enabled once either 12h or 24h format was
configured.

Bug: 32761619
Test: m RunSettingsRoboTests
Change-Id: Idbbb8f79fccec95e33bf2f12767d5736e1118fa7
2017-08-10 13:32:17 +01:00
Antony Sargent
caaccbc72c Merge "Stay discoverable in Bluetooth settings and pairing pages" into oc-dr1-dev am: 49cd8f2327 am: 0fe460a8e3
am: d9456d807b

Change-Id: I5bd24cc8cc532ffdcec05c51424140e8dcc764f8
2017-08-10 07:32:23 +00:00
Antony Sargent
d9456d807b Merge "Stay discoverable in Bluetooth settings and pairing pages" into oc-dr1-dev am: 49cd8f2327
am: 0fe460a8e3

Change-Id: I000eba2d8266b3d86f08c336f4ae3217ae48b8ac
2017-08-10 07:28:51 +00:00
Antony Sargent
8cd8519eab Merge "Stay discoverable in Bluetooth settings and pairing pages" into oc-dr1-dev
am: 49cd8f2327

Change-Id: I4b8989fd95405bfeb7ada518b0ce2f76dec5cdb3
2017-08-10 07:25:53 +00:00
Antony Sargent
0fe460a8e3 Merge "Stay discoverable in Bluetooth settings and pairing pages" into oc-dr1-dev
am: 49cd8f2327

Change-Id: I02c6056ab8efb238cb8ba97ea4d4ea6de247c13d
2017-08-10 07:25:52 +00:00
TreeHugger Robot
49cd8f2327 Merge "Stay discoverable in Bluetooth settings and pairing pages" into oc-dr1-dev 2017-08-10 07:23:29 +00:00
Antony Sargent
c86440538f Stay discoverable in Bluetooth settings and pairing pages
There are two problems with the Bluetooth settings and pairing pages
that are fixed by this CL:

(1) We advertise on the page that the local device is visible to other
devices, but that only lasts for the length of the default timeout (120
seconds) for the local adapter being in discoverable mode.

(2) Both the BluetoothSettings and BluetoothPairingDetail fragments
enter discoverable mode in their onStart handler and exit it in their
onStop handler. Unfortunately when doing a fragment navigation the
onStart and onStop events interleave in a non-intuitive manner. When you
go from BluetoothSettings to BluetoothPairingDetail, we see the onStop
event for BluetoothSettings *after* the onStart event for
BluetoothPairingDetail, and similarly when going back from
BluetoothSettings to BluetoothPairingDetail. What this means in practice
is that if you go to the BluetoothSettings page, the device will be
discoverable, but once you navigate to BluetoothPairingDetail or back
again you won't be discoverable again until you go somewhere else or end
the settings activity.

This CL adds a new object called AlwaysDiscoverable which can be used to
start and stop a mode of "always being discoverable". While started, it
will listen for changes to the discoverable state, and return to
discoverable mode. This fixes (1) by returning to discoverable mode
whenever the normal timeout expires, and (2) similary by returning to
discoverable mode when we accidentally exit it due to the onStop/onStart
mismatch.

A better fix for (2) would be to avoid the "glitch" of briefly exiting
discoverable mode only to re-enter it, but the implementation of that is
a little more complicated so that's being left as future work in order
to keep this CL as small as possible.

Bug: 64130265
Test: make RunSettingsRoboTests
Change-Id: I559dd8187263ea6a0008be1a8abdfffac97cb87a
2017-08-09 22:10:40 -07:00
Doris Ling
e1aa184bb6 Merge "Log preference change as Integer instead of Long." into oc-mr1-dev am: 7074e25a0e
am: cb5b48df7a

Change-Id: I8f321efc5f8df7c767f6d10e3fa944d65058aa96
2017-08-10 04:02:08 +00:00