Commit Graph

38886 Commits

Author SHA1 Message Date
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
TreeHugger Robot
64b15c4a7b Merge "Refactoring for AmbientAlwaysOnPreferenceController" into oc-dr1-dev 2017-08-08 23:59:50 +00:00
Eric Schwarzenbach
69fa528074 Fix issue where connected network sometimes doesn't update.
Ensures that the connected network Preference and WifiTracker have the
same reference so that updates to one propagate to the other.

Bug: 64124982
Test: manual
Change-Id: I1b838b1cf65da1b5aebf4f5f37f0df0c5e473dba
2017-08-08 16:08:19 -07:00
Fan Zhang
623faaa00e Close cursor after getting data from DB
Fixes: 64487360
Test: manual

Change-Id: I7d8a7550dca272a62b2c664cc893e4319e628c18
2017-08-08 16:03:55 -07:00
TreeHugger Robot
fef5f6aa4a Merge "Clean up logic for dismissing suggestion" into oc-mr1-dev 2017-08-08 22:13:13 +00:00
Salvador Martinez
fe7c35803e Update availability for mobile network
This CL updates the availability to behave properly when a
user other than the primary user is accessing it. This also
makes the api return no intent if they don't have permission to
access this because attempting to go to that screen will cause a
crash. Also updates tests related to this change.

Test: robotests still pass
Bug: 64092292
Change-Id: If9913d9ae08ee3e205ff324aaeeadc755ff1d23d
2017-08-08 15:04:04 -07:00
Salvador Martinez
cc92875825 Refactor tether logic for reuse
am: 135619d483  -s ours

Change-Id: I5b00c372d02e86dc683c49e1142167316613f96f
2017-08-08 21:53:54 +00:00
Eric Schwarzenbach
b82f51099a Add modify string to resources.
Bug: 36483704
Test: n/a
Change-Id: I8c68e11a7bbaff98e6384713dea69ef34bf46d01
2017-08-08 14:11:51 -07:00
Ruchi Kandoi
1eab553653 Avoid Race condition with accessibility for NFC toggle switch
Bug: 64429429
Test: Enable TalkBack; Toggle NFC settings
Change-Id: Iadeae0ca33c32b320c202efc2acf0be647b10078
2017-08-08 20:58:29 +00:00
Andrew Sapperstein
5be6c30012 Refactoring for AmbientAlwaysOnPreferenceController
Makes a few methods static so we can call them from other locations.

Bug: 64256644
Test: robotests
Change-Id: Ie97cda342c3143a21bd273e4d29f64f75e006059
2017-08-08 13:58:18 -07:00
Oren Blasberg
9705aad8db Update SMS mirroring icon to new style.
Test: Verified the icon looks good in Settings.

Bug: 37546615
Change-Id: I313548022fa37676bc0dfee598d45e9f09d5bfb5
2017-08-08 13:49:48 -07:00
Daniel Nishi
a28dc40543 Merge "Add floats to the SecureSettings shadow." into oc-mr1-dev 2017-08-08 20:46:50 +00:00
TreeHugger Robot
101f3d2e44 Merge "SMS mirroring: Add placeholder summary." into oc-mr1-dev 2017-08-08 20:02:42 +00:00
TreeHugger Robot
4068fe7d38 Merge "Add new strings for b/63109928" into oc-mr1-dev 2017-08-08 19:36:40 +00:00
Salvador Martinez
135619d483 Refactor tether logic for reuse
Some logic related to permissions needs to be used elsewhere. This
CL refactors the relevant code into a method so that it stays in
sync in both places.

Test: robotests still pass
Bug: 64092292
Change-Id: If8191698023d1da90db99b518d9f770683b5c789
Merged-In: I3b54529865e16b7e1640b0adda7f7edb9d1a41f7
2017-08-08 12:35:20 -07:00
TreeHugger Robot
189899c169 Merge "Add uid data even though on battery stats" into oc-mr1-dev 2017-08-08 19:22:50 +00:00
TreeHugger Robot
705a9e7e85 Merge "Refactor tether logic for reuse" into oc-mr1-dev 2017-08-08 18:53:39 +00:00
Daniel Nishi
3ff4b933e6 Add floats to the SecureSettings shadow.
Test: Exercised in other robotests
Change-Id: I7c99272f330d9d5fa043c155d2f818e70ac271e0
Merged-In: I0791bdddf0bc97abc21cd27613998247b11d7bb4
2017-08-08 11:37:50 -07:00
Daniel Nishi
fb83e50d99 Add floats to the SecureSettings shadow.
Test: Exercised in other robotests
Change-Id: I0791bdddf0bc97abc21cd27613998247b11d7bb4
2017-08-08 11:21:01 -07:00
Julia Reynolds
fabe766958 Use colorful +s
Instead of grey

Change-Id: Iac0454110d3af9045a83098e67957130987ad718
Fixes: 63820885
Test: manual
2017-08-08 14:00:09 -04:00
Fan Zhang
6d479d99a9 Misc fixes for settings
- Set device credential's Window flag to be SECURE. This prevents
  showing any pattern/pin in recent list.
- Disable tap sound on entity header

Fixes: 64339515
Fixes: 64413598
Test: visual
Test: runtest --path \
      tests/app/src/com/android/settings/password/ChooseLockGenericTest.java
2017-08-08 10:34:03 -07:00
Winston Man
c603a99ba4 Move work notification settings back to bottom
- Settings order now matches
- screenshot with work profile: https://hsv.googleplex.com/5742195667632128
- screenshot without work profile: https://hsv.googleplex.com/5683485175971840

Bug: 64436619
Test: RunSettingsRoboTests; manual

Merged-In: Ia665ee5295981e11193e69585232874d1dddba23

Change-Id: Ia665ee5295981e11193e69585232874d1dddba23
2017-08-08 16:17:12 +00:00
Alison Cichowlas
3f9d0f1614 Add new strings for b/63109928
Test: Strings only; manual
Bug: 63109928
Change-Id: Ib2d491aff81faa866300e6b4f3a0d7c0e1417b98
2017-08-08 11:05:23 -04:00
Salvador Martinez
b1c0e38284 Refactor permissions code for bluetooth controller enabler
am: a8db5ccea8

Change-Id: I6288cf595419229f58abb396cbe9b6cf6e2c5fc4
2017-08-08 03:04:45 +00:00