Commit Graph

39459 Commits

Author SHA1 Message Date
TreeHugger Robot
7074e25a0e Merge "Log preference change as Integer instead of Long." into oc-mr1-dev 2017-08-10 03:41:07 +00:00
Kevin Chyn
8cf5bcdfa7 Reset fingerprint lockout upon successful unlock
FingerprintSettings should not start listening for fingerprints until
after Pin/Pattern/Pass is entered

Fixes: 63437524
Fixes: 63739006

Test: open FP settings, touch an invalid finger 5 times
close FP settings, re-enter FP settings, enter Pin/Pattern/Pass
touch FP with valid finger, should not be in lockout mode

Change-Id: Ia2e219824c33169a5610b36123c42aa3d6ff22c5
2017-08-09 18:49:17 -07:00
TreeHugger Robot
db56114b34 Merge "Initialize the volume seekbar preference max and progress." into oc-mr1-dev 2017-08-10 01:41:45 +00:00
TreeHugger Robot
0dc85bcc1e Merge "Update icon and string for new device intro suggestion" into oc-mr1-dev 2017-08-10 00:38:43 +00:00
Justin Klaassen
be3c8bf442 DO NOT MERGE - Ask device owner for master clear in demo mode
am: a22c8345fa  -s ours

Change-Id: Idba1b64f82a297c5617073e29c5f07902ca69177
2017-08-10 00:36:20 +00:00
Doris Ling
9dbd807ea1 Log preference change as Integer instead of Long.
Change-Id: I3dc93a4b8a5aa7f03bef05d39bd4504ed205334f
Fix: 64485529
Test: make RunSettingsRoboTests
2017-08-09 17:36:02 -07:00
TreeHugger Robot
5b820431d3 Merge "Delete DynamicindexableContentMonitor & all refs to it" into oc-mr1-dev 2017-08-10 00:28:03 +00:00
Fan Zhang
e3535d9998 Delete DynamicindexableContentMonitor & all refs to it
Convert input device search into a search query loader

And remove old logic from DynamicIndexableContentMonitor

Change-Id: If652b1ea7c8add9185bbd025055e14925d3a8eec
Bug: 64310452
Bug: 63831980
Test: robotests
2017-08-09 17:27:02 -07:00
Jayachandran C
4b2f10ed3c Do not translate "Wi-Fi calling" for VF DE
Test: Validated it by mimicking using T-Mobile SIM

Bug: 64139042
Change-Id: Iad3a6b9b7a47af140b14adebae55babfe31a4c26
2017-08-09 16:52:42 -07:00
qqzhou
467aad4219 Merge "Settings: Fix NPE in ChannelNotificationSettings" into oc-dr1-dev
am: 2c2b6b48de

Change-Id: Id7c3417b82cd6f814f5ffbdd993a8c22be1c7a81
2017-08-09 22:41:12 +00:00
Daniel Nishi
14be0e4124 Merge "Add floats to the SecureSettings shadow." into oc-dr1-dev
am: 97e0e42959  -s ours

Change-Id: Id1083efaf83092cf8329fac64b933dfb9e652396
2017-08-09 22:39:55 +00:00
Matthew Fritze
730bad152c Merge "Fix DataSaverBackend objects created on background threads" into oc-dr1-dev
am: 3161375f78  -s ours

Change-Id: I34e117b92e73a36f9c3c70f7c2e6b224ed308a0b
2017-08-09 22:38:28 +00:00
The Android Open Source Project
aeee659147 Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
am: dd6d975214  -s ours

Change-Id: I2ae2cce68305a32c8f1272a46b3eb784e32b8b22
2017-08-09 22:37:57 +00:00
Daniel Nishi
8bbc28a95b Merge "Expose the notification-swipe controls." into oc-dr1-dev
am: c075f8943e

Change-Id: I479a411c032df7426d89838a668f4303c4d67a54
2017-08-09 22:37:34 +00:00
Justin Klaassen
a22c8345fa DO NOT MERGE - Ask device owner for master clear in demo mode
Bug: 62712426
Test: make RunSettingsRoboTests -j19
Change-Id: I29f92ff1062590f2c5eb7713e5969da7870fc582
2017-08-09 15:37:01 -07:00
TreeHugger Robot
2c2b6b48de Merge "Settings: Fix NPE in ChannelNotificationSettings" into oc-dr1-dev 2017-08-09 20:57:50 +00:00
Fan Zhang
3fc194017d Update icon and string for new device intro suggestion
Change-Id: If1cca8e54e277d0ad58b76318df58842f2bec886
Fixes: 64342027
Test: visual
2017-08-09 13:57:37 -07:00
Doris Ling
b7490bea28 Initialize the volume seekbar preference max and progress.
When the media stream is set, initialize the preference max and progress
with the streams current value. Otherwise, when we initialize the seekbar
volumizer, it will first set the seekbar max to 0 and progress to 0,
then update with the correct value, which will result in the jank that
is seen when the sound settings are displayed.

Change-Id: I515c97bbc6ec38bbe92755e3d7cb53bb13ac52d0
Fix: 34035654
Test: make RunSettingsRoboTests
2017-08-09 13:56:13 -07:00
Ruchi Kandoi
bf81a17a31 Merge "Avoid Race condition with accessibility for NFC toggle switch" into oc-dr1-dev
am: 9eff3f90d8

Change-Id: I35b7606035a45c1705d0d8775b55c5d7ec9aa672
2017-08-09 20:22:10 +00:00
Salvador Martinez
7bc388d823 Merge "Update availability for mobile network" into oc-dr1-dev
am: 4bcc3eb193

Change-Id: I8dca27c407709961ed28c64b76304894d5456781
2017-08-09 20:21:32 +00:00
TreeHugger Robot
0ed0319005 Merge "Show confirmation dialog when user tries to skip fingerprint" into oc-mr1-dev 2017-08-09 20:15:20 +00:00
TreeHugger Robot
298d559c40 Merge "Close cursor after getting data from DB" into oc-mr1-dev 2017-08-09 19:58:36 +00:00
TreeHugger Robot
51bde3c8fe Merge "Fix issue where connected network sometimes doesn't update." into oc-mr1-dev 2017-08-09 19:49:41 +00:00
TreeHugger Robot
d59854de24 Merge "Ask device owner for master clear in demo mode" into oc-mr1-dev 2017-08-09 19:40:03 +00:00
Daniel Nishi
97e0e42959 Merge "Add floats to the SecureSettings shadow." into oc-dr1-dev 2017-08-09 19:25:35 +00:00
TreeHugger Robot
3161375f78 Merge "Fix DataSaverBackend objects created on background threads" into oc-dr1-dev 2017-08-09 19:15:27 +00:00
TreeHugger Robot
e0c0616d6f Merge "Fix DataSaverBackend objects created on background threads" into oc-mr1-dev 2017-08-09 18:22:21 +00:00
TreeHugger Robot
293899d5ce Merge "Refresh preferences when background data switch is toggled" into oc-mr1-dev 2017-08-09 17:53:22 +00:00
TreeHugger Robot
54d816fd90 Merge "Misc fixes for settings" into oc-mr1-dev 2017-08-09 17:52:49 +00:00
Ajay Nadathur
bf3a135170 Show confirmation dialog when user tries to skip fingerprint
- After the user finished adding lock screen, if the user tries to skip
fingerprint setup, show a confirmation dialog

bug: 64092225
Test: Manually tested; robolectric tests also added
Change-Id: Iba5088a9db93153988942cf78f11077f427e50cb
2017-08-09 17:51:50 +00:00
Justin Klaassen
3025727e16 Ask device owner for master clear in demo mode
Bug: 62712426
Test: make RunSettingsRoboTests -j19
Change-Id: I29f92ff1062590f2c5eb7713e5969da7870fc582
2017-08-09 10:44:19 -07:00
TreeHugger Robot
882d35715e Merge "Import translations. DO NOT MERGE" into oc-mr1-dev 2017-08-09 16:46:44 +00:00
TreeHugger Robot
dd6d975214 Merge "Import translations. DO NOT MERGE" into oc-dr1-dev 2017-08-09 16:20:46 +00:00
Daniel Nishi
c075f8943e Merge "Expose the notification-swipe controls." into oc-dr1-dev 2017-08-09 16:16:49 +00:00
TreeHugger Robot
a3a0a1e2e8 Merge "Update SMS mirroring icon to new style." into oc-mr1-dev 2017-08-09 15:54:19 +00:00
qqzhou
c18c517467 Settings: Fix NPE in ChannelNotificationSettings
java.lang.NullPointerException: Attempt to invoke virtual method 'int
android.app.NotificationChannel.getImportance()' on a null object
reference at com.android.settings.notification.ChannelNotificationSettings.
onActivityResult.

Change-Id: I3ec7b51e2533dc108b1a14c151e3ad70d22113e5
CRs-Fixed: 2068192
Fixes: 64116799
Fixes: 64134707
Test: monkey
2017-08-09 11:38:58 -04:00
TreeHugger Robot
a147d4a616 Merge "FRP: Add dedicated explanation strings for ConfirmCredential" into oc-mr1-dev 2017-08-09 13:36:40 +00:00
TreeHugger Robot
e286c0627b Merge "Use colorful +s" into oc-mr1-dev 2017-08-09 13:25:48 +00:00
Andrew Sapperstein
6eafaf46aa Merge "Refactoring for AmbientAlwaysOnPreferenceController" into oc-dr1-dev
am: 64b15c4a7b

Change-Id: Ic1bd3074c086723c231c05fe2706f6ccc30c4cdd
2017-08-09 13:06:33 +00:00
Adrian Roos
6600ddec73 FRP: Add dedicated explanation strings for ConfirmCredential
Change-Id: I1bf63898509032560cd302fde9dfe05473336e49
Fixes: 63958816
Test: adb shell settings put global device_provisioned 1 && adb shell am start -a android.app.action.CONFIRM_FRP_CREDENTIAL; verify strings
2017-08-09 11:08:13 +00:00
Winston Man
466adba25e Merge "Move work notification settings back to bottom" into oc-mr1-dev 2017-08-09 09:09:35 +00:00
Ruchi Kandoi
9eff3f90d8 Merge "Avoid Race condition with accessibility for NFC toggle switch" into oc-dr1-dev 2017-08-09 05:29:12 +00:00
Matthew Fritze
7c1825aa64 Fix DataSaverBackend objects created on background threads
Add the main looper to the handler created with each
DataSaverBackend to avoid crashes when the objects are
created on background threads.

Bug: 62022517
Test: make RunSettingsRoboTests
Change-Id: I7396107e4ed06982c8cd300912ce1f4e3c63df4c
Merged-In: Ie5ffabbfbe7660761527b3ecd51e6bc5a43c1ace
2017-08-09 02:06:42 +00:00
Matthew Fritze
c6211c8829 Fix DataSaverBackend objects created on background threads
Add the main looper to the handler created with each
DataSaverBackend to avoid crashes when the objects are
created on background threads.

Bug: 62022517
Test: make RunSettingsRoboTests
Change-Id: Ie5ffabbfbe7660761527b3ecd51e6bc5a43c1ace
2017-08-08 19:03:43 -07:00
The Android Open Source Project
1d05244fc2 Import translations. DO NOT MERGE
Change-Id: I5d4e5680aca99f0d47353175e796b0b3a0116598
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
2017-08-08 18:20:51 -07:00
The Android Open Source Project
8008408285 Import translations. DO NOT MERGE
Change-Id: I7c03ce57550b6618594ff59a6cb82d5871207216
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
2017-08-08 18:14:31 -07:00
TreeHugger Robot
4bcc3eb193 Merge "Update availability for mobile network" into oc-dr1-dev 2017-08-09 01:06:50 +00:00
TreeHugger Robot
9e47d2c233 Merge "Add modify string to resources." into oc-mr1-dev 2017-08-09 00:46:57 +00:00
Fan Zhang
816efc02fc Refresh preferences when background data switch is toggled
Change-Id: Id58f565645fc3c668b516dbd05049559afa9535e
Fixes: 64466310
Test: robotests
2017-08-08 17:38:28 -07:00
Daniel Nishi
f89327aa88 Expose the notification-swipe controls.
Bug: 62022517
Test: Settings robotest
Change-Id: I41368a9e03f38052bb47d04f6b98d56808d07e48
2017-08-08 17:30:38 -07:00