OSDN Git Service
Suprabh Shukla [Wed, 16 Aug 2017 19:51:03 +0000 (19:51 +0000)]
Disabling the activate button when paused am:
8e08a9bb71 am:
08207f457d am:
1e9af33c41 am:
1370eb3d52 am:
616c84ccb0 -s ours am:
aedf7cdfdb -s ours
am:
f52c8ccbfc -s ours
Change-Id: I432c3951bc7bd3a1aafca201dd9206dcfb33ceee
Suprabh Shukla [Wed, 16 Aug 2017 19:48:33 +0000 (19:48 +0000)]
Disabling the activate button when paused am:
8e08a9bb71 am:
08207f457d am:
1e9af33c41 am:
1370eb3d52 am:
616c84ccb0 -s ours
am:
aedf7cdfdb -s ours
Change-Id: I95b94ed593f31067244d5d7bd795fe734cba971a
Suprabh Shukla [Wed, 16 Aug 2017 19:40:30 +0000 (19:40 +0000)]
Disabling the activate button when paused am:
8e08a9bb71 am:
08207f457d am:
1e9af33c41 am:
1370eb3d52
am:
616c84ccb0 -s ours
Change-Id: Ibb6e939c0511012a567baf5df3aafdb4da9198ef
Suprabh Shukla [Wed, 16 Aug 2017 19:34:24 +0000 (19:34 +0000)]
Disabling the activate button when paused am:
8e08a9bb71 am:
08207f457d am:
1e9af33c41
am:
1370eb3d52
Change-Id: Ifd670d7a6a673b49b2b0563b81a83fda20889126
Suprabh Shukla [Wed, 16 Aug 2017 19:30:03 +0000 (19:30 +0000)]
Disabling the activate button when paused am:
8e08a9bb71 am:
08207f457d
am:
1e9af33c41
Change-Id: Iea61138c41fdb00ee30e0fba0d06b1d59b9c6afa
Suprabh Shukla [Wed, 16 Aug 2017 19:25:59 +0000 (19:25 +0000)]
Disabling the activate button when paused am:
8e08a9bb71
am:
08207f457d
Change-Id: I693fde0d9935e0b92fa8848b205db3a810a58b67
Suprabh Shukla [Wed, 16 Aug 2017 19:22:01 +0000 (19:22 +0000)]
Disabling the activate button when paused
am:
8e08a9bb71
Change-Id: I9b9ccd0bd849d34343ff0a6d6b579274d02264c6
Maurice Lam [Wed, 16 Aug 2017 18:25:02 +0000 (18:25 +0000)]
Merge "Use default primary color for choose lock screens" into oc-mr1-dev
TreeHugger Robot [Wed, 16 Aug 2017 07:51:27 +0000 (07:51 +0000)]
Merge "Don't launch Choose Lock again if recreating" into oc-mr1-dev
Maurice Lam [Wed, 16 Aug 2017 02:30:14 +0000 (19:30 -0700)]
Use default primary color for choose lock screens
Make the settings screens that inherit from SuwThemeGlif use the
default blue primary color.
Test: Manual
Bug:
63143321
Change-Id: I07026139a5e0562c192ec1ca9304d5cd3647d5b0
Maurice Lam [Tue, 15 Aug 2017 23:26:05 +0000 (16:26 -0700)]
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
Suprabh Shukla [Tue, 15 Aug 2017 03:33:12 +0000 (03:33 +0000)]
Disabling the activate button when paused
This revises the previous attempt to drop taps when another window is
obscuring the device admin details. Any system alert windows or toasts
are disabled when the activity is in focus, otherwise the button is
disabled so no floating activities can obscure it and delegate taps back
to the security sensitive "Activate" button.
Test: CtsVerifier -> Device Administration -> Device Admin Tapjacking Test
Bug:
35056974
Change-Id: I292a44e713ea4a4b0305ca3b3b21f1c82fd73c2b
Merged-In: I292a44e713ea4a4b0305ca3b3b21f1c82fd73c2b
TreeHugger Robot [Tue, 15 Aug 2017 01:18:27 +0000 (01:18 +0000)]
Merge "Change strings from Instant app account to setting" into oc-mr1-dev
Bill Yi [Mon, 14 Aug 2017 13:35:42 +0000 (13:35 +0000)]
Revert "Import translations. DO NOT MERGE"
am:
d8d29f2964 -s ours
Change-Id: Ia169054dc581d5633ceed24edf4892a10ca601ad
Bill Yi [Mon, 14 Aug 2017 13:32:35 +0000 (13:32 +0000)]
Revert "Import translations. DO NOT MERGE"
This reverts commit
a2a4037f593b6bbbe5c178971f13ef869b7ffe8e.
Change-Id: I2145ac4c4f1092799bbc547ef9ea7d19c101cd95
Exempt-From-Owner-Approval: translation import
Bill Yi [Sat, 12 Aug 2017 18:39:26 +0000 (18:39 +0000)]
Import translations. DO NOT MERGE
am:
a2a4037f59 -s ours
Change-Id: I70d51d28867e44da0d95e14089584988ae3c98e9
Bill Yi [Sat, 12 Aug 2017 15:56:25 +0000 (08:56 -0700)]
Import translations. DO NOT MERGE
Change-Id: I8f1c2c8a6591596db2098eac88bbb99660cfbefa
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Jesse Evans [Sat, 12 Aug 2017 00:51:33 +0000 (17:51 -0700)]
Change strings from Instant app account to setting
Test: existing tests
Bug:
63762769
Change-Id: I5499f76b9f8b5f513813c4ee09a4fb00c96c3fd4
Maurice Lam [Thu, 3 Aug 2017 03:11:28 +0000 (20:11 -0700)]
Update strings for screen lock setup
Test: Manual, existing tests pass
Bug:
64084524
Change-Id: Iff4b004aaf504ae3d574428e41bf91fd46a66f30
TreeHugger Robot [Fri, 11 Aug 2017 17:26:08 +0000 (17:26 +0000)]
Merge "Reset fingerprint lockout upon successful unlock" into oc-mr1-dev
Ajay Nadathur [Fri, 11 Aug 2017 17:12:26 +0000 (17:12 +0000)]
Merge "Update strings for skip fingerprint setup" into oc-mr1-dev
TreeHugger Robot [Fri, 11 Aug 2017 03:01:33 +0000 (03:01 +0000)]
Merge "Clean up AssistGesturePreferenceController" into oc-mr1-dev
Kevin Chyn [Fri, 4 Aug 2017 00:03:13 +0000 (17:03 -0700)]
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
Ajay Nadathur [Thu, 10 Aug 2017 19:36:00 +0000 (12:36 -0700)]
Update strings for skip fingerprint setup
bug:
64092225
Test: Manually tested and verified updated strings used
Change-Id: I813f72abb8cb9fd2ba9ec952c0926ecd2f670ed0
Doris Ling [Thu, 10 Aug 2017 22:28:20 +0000 (22:28 +0000)]
Initialize the volume seekbar preference max and progress.
am:
cbc231c545
Change-Id: Ibfe977a33e25f5cd7188062595f2c8aa990ee8f3
Doris Ling [Tue, 8 Aug 2017 23:52:42 +0000 (16:52 -0700)]
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
(cherry picked from commit
b7490bea28cb28d301fe4ec0275cef7129621206)
Antony Sargent [Thu, 10 Aug 2017 07:25:53 +0000 (07:25 +0000)]
Merge "Stay discoverable in Bluetooth settings and pairing pages" into oc-dr1-dev
am:
49cd8f2327
Change-Id: I4b8989fd95405bfeb7ada518b0ce2f76dec5cdb3
TreeHugger Robot [Thu, 10 Aug 2017 07:23:29 +0000 (07:23 +0000)]
Merge "Stay discoverable in Bluetooth settings and pairing pages" into oc-dr1-dev
Jayachandran Chinnakkannu [Thu, 10 Aug 2017 06:04:37 +0000 (06:04 +0000)]
Merge "Do not translate "Wi-Fi calling" for VF DE" into oc-dr1-dev
am:
9476e824be
Change-Id: I584d95282cc7c5f681fd6bc5ac4c0f03ad22053c
Jayachandran Chinnakkannu [Thu, 10 Aug 2017 06:00:29 +0000 (06:00 +0000)]
Merge "Do not translate "Wi-Fi calling" for VF DE" into oc-dr1-dev
Antony Sargent [Wed, 9 Aug 2017 22:57:17 +0000 (15:57 -0700)]
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
TreeHugger Robot [Thu, 10 Aug 2017 03:41:07 +0000 (03:41 +0000)]
Merge "Log preference change as Integer instead of Long." into oc-mr1-dev
Kevin Chyn [Thu, 27 Jul 2017 00:35:23 +0000 (17:35 -0700)]
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
TreeHugger Robot [Thu, 10 Aug 2017 01:41:45 +0000 (01:41 +0000)]
Merge "Initialize the volume seekbar preference max and progress." into oc-mr1-dev
TreeHugger Robot [Thu, 10 Aug 2017 00:38:43 +0000 (00:38 +0000)]
Merge "Update icon and string for new device intro suggestion" into oc-mr1-dev
Justin Klaassen [Thu, 10 Aug 2017 00:36:20 +0000 (00:36 +0000)]
DO NOT MERGE - Ask device owner for master clear in demo mode
am:
a22c8345fa -s ours
Change-Id: Idba1b64f82a297c5617073e29c5f07902ca69177
Doris Ling [Tue, 8 Aug 2017 21:03:29 +0000 (14:03 -0700)]
Log preference change as Integer instead of Long.
Change-Id: I3dc93a4b8a5aa7f03bef05d39bd4504ed205334f
Fix:
64485529
Test: make RunSettingsRoboTests
TreeHugger Robot [Thu, 10 Aug 2017 00:28:03 +0000 (00:28 +0000)]
Merge "Delete DynamicindexableContentMonitor & all refs to it" into oc-mr1-dev
Fan Zhang [Thu, 3 Aug 2017 00:32:43 +0000 (17:32 -0700)]
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
Jayachandran C [Tue, 8 Aug 2017 20:06:51 +0000 (13:06 -0700)]
Do not translate "Wi-Fi calling" for VF DE
Test: Validated it by mimicking using T-Mobile SIM
Bug:
64139042
Change-Id: Iad3a6b9b7a47af140b14adebae55babfe31a4c26
qqzhou [Wed, 9 Aug 2017 22:41:12 +0000 (22:41 +0000)]
Merge "Settings: Fix NPE in ChannelNotificationSettings" into oc-dr1-dev
am:
2c2b6b48de
Change-Id: Id7c3417b82cd6f814f5ffbdd993a8c22be1c7a81
Daniel Nishi [Wed, 9 Aug 2017 22:39:55 +0000 (22:39 +0000)]
Merge "Add floats to the SecureSettings shadow." into oc-dr1-dev
am:
97e0e42959 -s ours
Change-Id: Id1083efaf83092cf8329fac64b933dfb9e652396
Matthew Fritze [Wed, 9 Aug 2017 22:38:28 +0000 (22:38 +0000)]
Merge "Fix DataSaverBackend objects created on background threads" into oc-dr1-dev
am:
3161375f78 -s ours
Change-Id: I34e117b92e73a36f9c3c70f7c2e6b224ed308a0b
The Android Open Source Project [Wed, 9 Aug 2017 22:37:57 +0000 (22:37 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
am:
dd6d975214 -s ours
Change-Id: I2ae2cce68305a32c8f1272a46b3eb784e32b8b22
Daniel Nishi [Wed, 9 Aug 2017 22:37:34 +0000 (22:37 +0000)]
Merge "Expose the notification-swipe controls." into oc-dr1-dev
am:
c075f8943e
Change-Id: I479a411c032df7426d89838a668f4303c4d67a54
Justin Klaassen [Wed, 9 Aug 2017 04:58:05 +0000 (21:58 -0700)]
DO NOT MERGE - Ask device owner for master clear in demo mode
Bug:
62712426
Test: make RunSettingsRoboTests -j19
Change-Id: I29f92ff1062590f2c5eb7713e5969da7870fc582
TreeHugger Robot [Wed, 9 Aug 2017 20:57:50 +0000 (20:57 +0000)]
Merge "Settings: Fix NPE in ChannelNotificationSettings" into oc-dr1-dev
Fan Zhang [Wed, 9 Aug 2017 18:28:38 +0000 (11:28 -0700)]
Update icon and string for new device intro suggestion
Change-Id: If1cca8e54e277d0ad58b76318df58842f2bec886
Fixes:
64342027
Test: visual
Doris Ling [Tue, 8 Aug 2017 23:52:42 +0000 (16:52 -0700)]
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
Ruchi Kandoi [Wed, 9 Aug 2017 20:22:10 +0000 (20:22 +0000)]
Merge "Avoid Race condition with accessibility for NFC toggle switch" into oc-dr1-dev
am:
9eff3f90d8
Change-Id: I35b7606035a45c1705d0d8775b55c5d7ec9aa672
Salvador Martinez [Wed, 9 Aug 2017 20:21:32 +0000 (20:21 +0000)]
Merge "Update availability for mobile network" into oc-dr1-dev
am:
4bcc3eb193
Change-Id: I8dca27c407709961ed28c64b76304894d5456781
TreeHugger Robot [Wed, 9 Aug 2017 20:15:20 +0000 (20:15 +0000)]
Merge "Show confirmation dialog when user tries to skip fingerprint" into oc-mr1-dev
TreeHugger Robot [Wed, 9 Aug 2017 19:58:36 +0000 (19:58 +0000)]
Merge "Close cursor after getting data from DB" into oc-mr1-dev
TreeHugger Robot [Wed, 9 Aug 2017 19:49:41 +0000 (19:49 +0000)]
Merge "Fix issue where connected network sometimes doesn't update." into oc-mr1-dev
TreeHugger Robot [Wed, 9 Aug 2017 19:40:03 +0000 (19:40 +0000)]
Merge "Ask device owner for master clear in demo mode" into oc-mr1-dev
Daniel Nishi [Wed, 9 Aug 2017 19:25:35 +0000 (19:25 +0000)]
Merge "Add floats to the SecureSettings shadow." into oc-dr1-dev
TreeHugger Robot [Wed, 9 Aug 2017 19:15:27 +0000 (19:15 +0000)]
Merge "Fix DataSaverBackend objects created on background threads" into oc-dr1-dev
TreeHugger Robot [Wed, 9 Aug 2017 18:22:21 +0000 (18:22 +0000)]
Merge "Fix DataSaverBackend objects created on background threads" into oc-mr1-dev
TreeHugger Robot [Wed, 9 Aug 2017 17:53:22 +0000 (17:53 +0000)]
Merge "Refresh preferences when background data switch is toggled" into oc-mr1-dev
TreeHugger Robot [Wed, 9 Aug 2017 17:52:49 +0000 (17:52 +0000)]
Merge "Misc fixes for settings" into oc-mr1-dev
Ajay Nadathur [Tue, 1 Aug 2017 00:18:56 +0000 (17:18 -0700)]
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
Justin Klaassen [Wed, 9 Aug 2017 04:58:05 +0000 (21:58 -0700)]
Ask device owner for master clear in demo mode
Bug:
62712426
Test: make RunSettingsRoboTests -j19
Change-Id: I29f92ff1062590f2c5eb7713e5969da7870fc582
TreeHugger Robot [Wed, 9 Aug 2017 16:46:44 +0000 (16:46 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
TreeHugger Robot [Wed, 9 Aug 2017 16:20:46 +0000 (16:20 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
Daniel Nishi [Wed, 9 Aug 2017 16:16:49 +0000 (16:16 +0000)]
Merge "Expose the notification-swipe controls." into oc-dr1-dev
TreeHugger Robot [Wed, 9 Aug 2017 15:54:19 +0000 (15:54 +0000)]
Merge "Update SMS mirroring icon to new style." into oc-mr1-dev
qqzhou [Mon, 3 Jul 2017 07:10:59 +0000 (15:10 +0800)]
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
TreeHugger Robot [Wed, 9 Aug 2017 13:36:40 +0000 (13:36 +0000)]
Merge "FRP: Add dedicated explanation strings for ConfirmCredential" into oc-mr1-dev
TreeHugger Robot [Wed, 9 Aug 2017 13:25:48 +0000 (13:25 +0000)]
Merge "Use colorful +s" into oc-mr1-dev
Andrew Sapperstein [Wed, 9 Aug 2017 13:06:33 +0000 (13:06 +0000)]
Merge "Refactoring for AmbientAlwaysOnPreferenceController" into oc-dr1-dev
am:
64b15c4a7b
Change-Id: Ic1bd3074c086723c231c05fe2706f6ccc30c4cdd
Adrian Roos [Sun, 23 Jul 2017 12:18:16 +0000 (14:18 +0200)]
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
Winston Man [Wed, 9 Aug 2017 09:09:35 +0000 (09:09 +0000)]
Merge "Move work notification settings back to bottom" into oc-mr1-dev
Ruchi Kandoi [Wed, 9 Aug 2017 05:29:12 +0000 (05:29 +0000)]
Merge "Avoid Race condition with accessibility for NFC toggle switch" into oc-dr1-dev
Matthew Fritze [Tue, 18 Jul 2017 20:12:05 +0000 (13:12 -0700)]
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
Matthew Fritze [Tue, 18 Jul 2017 20:12:05 +0000 (13:12 -0700)]
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
The Android Open Source Project [Wed, 9 Aug 2017 01:20:51 +0000 (18:20 -0700)]
Import translations. DO NOT MERGE
Change-Id: I5d4e5680aca99f0d47353175e796b0b3a0116598
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
The Android Open Source Project [Wed, 9 Aug 2017 01:14:31 +0000 (18:14 -0700)]
Import translations. DO NOT MERGE
Change-Id: I7c03ce57550b6618594ff59a6cb82d5871207216
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
TreeHugger Robot [Wed, 9 Aug 2017 01:06:50 +0000 (01:06 +0000)]
Merge "Update availability for mobile network" into oc-dr1-dev
TreeHugger Robot [Wed, 9 Aug 2017 00:46:57 +0000 (00:46 +0000)]
Merge "Add modify string to resources." into oc-mr1-dev
Fan Zhang [Wed, 9 Aug 2017 00:36:06 +0000 (17:36 -0700)]
Refresh preferences when background data switch is toggled
Change-Id: Id58f565645fc3c668b516dbd05049559afa9535e
Fixes:
64466310
Test: robotests
Daniel Nishi [Wed, 9 Aug 2017 00:29:46 +0000 (17:29 -0700)]
Expose the notification-swipe controls.
Bug:
62022517
Test: Settings robotest
Change-Id: I41368a9e03f38052bb47d04f6b98d56808d07e48
TreeHugger Robot [Tue, 8 Aug 2017 23:59:50 +0000 (23:59 +0000)]
Merge "Refactoring for AmbientAlwaysOnPreferenceController" into oc-dr1-dev
Eric Schwarzenbach [Wed, 2 Aug 2017 22:29:53 +0000 (15:29 -0700)]
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
Fan Zhang [Mon, 7 Aug 2017 22:11:00 +0000 (15:11 -0700)]
Close cursor after getting data from DB
Fixes:
64487360
Test: manual
Change-Id: I7d8a7550dca272a62b2c664cc893e4319e628c18
TreeHugger Robot [Tue, 8 Aug 2017 22:13:13 +0000 (22:13 +0000)]
Merge "Clean up logic for dismissing suggestion" into oc-mr1-dev
Salvador Martinez [Mon, 7 Aug 2017 20:59:16 +0000 (13:59 -0700)]
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
Salvador Martinez [Tue, 8 Aug 2017 21:53:54 +0000 (21:53 +0000)]
Refactor tether logic for reuse
am:
135619d483 -s ours
Change-Id: I5b00c372d02e86dc683c49e1142167316613f96f
Eric Schwarzenbach [Tue, 8 Aug 2017 21:11:51 +0000 (14:11 -0700)]
Add modify string to resources.
Bug:
36483704
Test: n/a
Change-Id: I8c68e11a7bbaff98e6384713dea69ef34bf46d01
Ruchi Kandoi [Tue, 8 Aug 2017 20:41:31 +0000 (13:41 -0700)]
Avoid Race condition with accessibility for NFC toggle switch
Bug:
64429429
Test: Enable TalkBack; Toggle NFC settings
Change-Id: Iadeae0ca33c32b320c202efc2acf0be647b10078
Andrew Sapperstein [Tue, 8 Aug 2017 02:06:57 +0000 (19:06 -0700)]
Refactoring for AmbientAlwaysOnPreferenceController
Makes a few methods static so we can call them from other locations.
Bug:
64256644
Test: robotests
Change-Id: Ie97cda342c3143a21bd273e4d29f64f75e006059
Oren Blasberg [Tue, 8 Aug 2017 18:21:19 +0000 (11:21 -0700)]
Update SMS mirroring icon to new style.
Test: Verified the icon looks good in Settings.
Bug:
37546615
Change-Id: I313548022fa37676bc0dfee598d45e9f09d5bfb5
Daniel Nishi [Tue, 8 Aug 2017 20:46:50 +0000 (20:46 +0000)]
Merge "Add floats to the SecureSettings shadow." into oc-mr1-dev
TreeHugger Robot [Tue, 8 Aug 2017 20:02:42 +0000 (20:02 +0000)]
Merge "SMS mirroring: Add placeholder summary." into oc-mr1-dev
TreeHugger Robot [Tue, 8 Aug 2017 19:36:40 +0000 (19:36 +0000)]
Merge "Add new strings for b/
63109928" into oc-mr1-dev
Salvador Martinez [Mon, 7 Aug 2017 17:22:37 +0000 (10:22 -0700)]
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
TreeHugger Robot [Tue, 8 Aug 2017 19:22:50 +0000 (19:22 +0000)]
Merge "Add uid data even though on battery stats" into oc-mr1-dev
TreeHugger Robot [Tue, 8 Aug 2017 18:53:39 +0000 (18:53 +0000)]
Merge "Refactor tether logic for reuse" into oc-mr1-dev
Daniel Nishi [Thu, 27 Jul 2017 18:06:41 +0000 (11:06 -0700)]
Add floats to the SecureSettings shadow.
Test: Exercised in other robotests
Change-Id: I7c99272f330d9d5fa043c155d2f818e70ac271e0
Merged-In: I0791bdddf0bc97abc21cd27613998247b11d7bb4
Daniel Nishi [Thu, 27 Jul 2017 18:06:41 +0000 (11:06 -0700)]
Add floats to the SecureSettings shadow.
Test: Exercised in other robotests
Change-Id: I0791bdddf0bc97abc21cd27613998247b11d7bb4
Julia Reynolds [Tue, 8 Aug 2017 18:00:09 +0000 (14:00 -0400)]
Use colorful +s
Instead of grey
Change-Id: Iac0454110d3af9045a83098e67957130987ad718
Fixes:
63820885
Test: manual