Beverly
f1e4e4fdd3
Merge "Null-pointer check when updating name of ZenRule." into oc-mr1-dev am: 268c6c6ca6
...
am: 7ba9e9f849
2017-08-18 14:19:20 +00:00
Beverly
7ba9e9f849
Merge "Null-pointer check when updating name of ZenRule." into oc-mr1-dev
...
am: 268c6c6ca6
2017-08-18 14:13:20 +00:00
TreeHugger Robot
268c6c6ca6
Merge "Null-pointer check when updating name of ZenRule." into oc-mr1-dev
2017-08-18 14:08:24 +00:00
TreeHugger Robot
8ae8b7a931
Merge "Index TTS-Settings and dedupe TTS-engine in search result."
2017-08-17 17:30:19 +00:00
Fan Zhang
5bfe4c4309
Merge "Suppress some search results" into oc-mr1-dev am: f51b4a580f
...
am: f8817000ac
2017-08-17 07:18:10 +00:00
Antony Sargent
fcb1073326
Merge "Fix rotation bug in Bluetooth pairing PIN dialog" into oc-mr1-dev am: 53a77a2452
...
am: 811b25ac2b
2017-08-17 07:15:24 +00:00
Ruchi Kandoi
bcd3cff7a2
Merge "Nfc Payment Preference check if the dialog is non-null before dismissing" into oc-mr1-dev am: 7a5e42f3db
...
am: 1030cf5ad4
2017-08-17 07:14:28 +00:00
Maurice Lam
a4b54e52ba
Merge "Fix bad string reference" into oc-mr1-dev am: f4716e89c0
...
am: f7a818345d
2017-08-17 07:13:41 +00:00
Fan Zhang
f8817000ac
Merge "Suppress some search results" into oc-mr1-dev
...
am: f51b4a580f
2017-08-17 01:29:44 +00:00
Antony Sargent
811b25ac2b
Merge "Fix rotation bug in Bluetooth pairing PIN dialog" into oc-mr1-dev
...
am: 53a77a2452
2017-08-17 01:22:27 +00:00
Ruchi Kandoi
1030cf5ad4
Merge "Nfc Payment Preference check if the dialog is non-null before dismissing" into oc-mr1-dev
...
am: 7a5e42f3db
2017-08-17 01:21:51 +00:00
Maurice Lam
f7a818345d
Merge "Fix bad string reference" into oc-mr1-dev
...
am: f4716e89c0
2017-08-17 01:21:10 +00:00
TreeHugger Robot
f51b4a580f
Merge "Suppress some search results" into oc-mr1-dev
2017-08-17 01:20:42 +00:00
TreeHugger Robot
53a77a2452
Merge "Fix rotation bug in Bluetooth pairing PIN dialog" into oc-mr1-dev
2017-08-17 00:38:40 +00:00
TreeHugger Robot
7a5e42f3db
Merge "Nfc Payment Preference check if the dialog is non-null before dismissing" into oc-mr1-dev
2017-08-17 00:32:40 +00:00
Fan Zhang
18a168239e
Index TTS-Settings and dedupe TTS-engine in search result.
...
Fixes: 63022866
Test: robotests
Change-Id: I5c711e7bafba4e413ee271768c58742be05d8640
2017-08-16 15:46:41 -07:00
Fan Zhang
83eaff5e4a
Suppress some search results
...
Fixes: 62137086
Test: reindex search
Test: robotests
Change-Id: I12e873edade80e4c0007d10352fb037b3230c643
2017-08-16 22:25:29 +00:00
Antony Sargent
563c4a6557
Fix rotation bug in Bluetooth pairing PIN dialog
...
BluetoothPairingDialogFragment has code that makes the OK button on the
dialog disabled until the user has entered at least one character into
the PIN field. However it didn't properly handle the case where the user
had entered some text and then rotated the screen - because it always
marked the OK button as disabled during onShow even if it already had
some content. This CL fixes that by looking at the text content and only
disabling the OK button if the content is empty.
Bug: 36514895
Test: make RunSettingsRoboTests
Change-Id: I4e8e70089a862e67b20ff614bbaa64fc2b641fd4
2017-08-16 15:19:47 -07:00
TreeHugger Robot
74ca171dba
Merge "Update detail icon only if its signal level changed."
2017-08-16 20:48:12 +00:00
Ruchi Kandoi
8bd3ec13c6
Nfc Payment Preference check if the dialog is non-null before dismissing
...
Test: monkey test
Bug: 64758793
Change-Id: I3905096889b2dc6ef468afc76e9767f63b4163ad
2017-08-16 13:45:39 -07: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
Beverly
949d813715
Null-pointer check when updating name of ZenRule.
...
Test: manual, current tests pass
Fixes: 64758679
Change-Id: Ia94b1749afdc6db4780bd09a5794f4110d4d032d
2017-08-16 15:47:27 -04: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
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
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
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
2017-08-15 01:37:07 +00:00
Maurice Lam
841288144c
Update strings for screen lock setup
...
Manual cherry pick of 3eb4c8333e
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
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
2017-08-11 17:49:58 +00:00
Kevin Chyn
5e8f4b6320
Merge "Reset fingerprint lockout upon successful unlock" into oc-mr1-dev
...
am: 2e7b65f74a
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
2017-08-11 17:25:31 +00:00
Ajay Nadathur
aec29ee4be
Merge "Update strings for skip fingerprint setup" into oc-mr1-dev
...
am: 719d80e6e0
2017-08-11 17:21:24 +00:00
