OSDN Git Service
qqzhou [Wed, 9 Aug 2017 23:04:07 +0000 (23:04 +0000)]
Merge "Settings: Fix NPE in ChannelNotificationSettings" into oc-dr1-dev am:
2c2b6b48de
am:
467aad4219
Change-Id: I8084bdf06e20e94a2963f5bfe590a7588a9c2e4c
Daniel Nishi [Wed, 9 Aug 2017 22:54:24 +0000 (22:54 +0000)]
Merge "Add floats to the SecureSettings shadow." into oc-dr1-dev am:
97e0e42959 -s ours
am:
14be0e4124 -s ours
Change-Id: Ib0be13003a7a56fb64d0f8a901bc38850627e8f8
Matthew Fritze [Wed, 9 Aug 2017 22:52:43 +0000 (22:52 +0000)]
Merge "Fix DataSaverBackend objects created on background threads" into oc-dr1-dev am:
3161375f78 -s ours
am:
730bad152c -s ours
Change-Id: I3a79f410b37f330deed8bdb8a6e6c7070f3ce732
The Android Open Source Project [Wed, 9 Aug 2017 22:52:06 +0000 (22:52 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am:
dd6d975214 -s ours
am:
aeee659147 -s ours
Change-Id: I446a2efc2cc4afda46abdb775ffb36044ae82983
Daniel Nishi [Wed, 9 Aug 2017 22:51:45 +0000 (22:51 +0000)]
Merge "Expose the notification-swipe controls." into oc-dr1-dev am:
c075f8943e
am:
8bbc28a95b
Change-Id: I2f52d59322a5b5f3960aa686adca06451ca87d13
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
TreeHugger Robot [Wed, 9 Aug 2017 20:57:50 +0000 (20:57 +0000)]
Merge "Settings: Fix NPE in ChannelNotificationSettings" into oc-dr1-dev
Ruchi Kandoi [Wed, 9 Aug 2017 20:35:36 +0000 (20:35 +0000)]
Merge "Avoid Race condition with accessibility for NFC toggle switch" into oc-dr1-dev am:
9eff3f90d8
am:
bf81a17a31
Change-Id: I8ac2a1d903588f27b57b7f5993cb833100436108
Salvador Martinez [Wed, 9 Aug 2017 20:28:30 +0000 (20:28 +0000)]
Merge "Update availability for mobile network" into oc-dr1-dev am:
4bcc3eb193
am:
7bc388d823
Change-Id: I33cb44239c0725efd34611c06ed1734a6898d943
Ajay Nadathur [Wed, 9 Aug 2017 20:27:45 +0000 (20:27 +0000)]
Merge "Show confirmation dialog when user tries to skip fingerprint" into oc-mr1-dev
am:
0ed0319005
Change-Id: I37fdea03ab0193a6c42da584166c30ce6ee7b3c7
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
Fan Zhang [Wed, 9 Aug 2017 20:05:14 +0000 (20:05 +0000)]
Merge "Close cursor after getting data from DB" into oc-mr1-dev
am:
298d559c40
Change-Id: Ie93dd52be56f24d8bf5d3e12fd1ae02cb189a588
Eric Schwarzenbach [Wed, 9 Aug 2017 20:02:03 +0000 (20:02 +0000)]
Merge "Fix issue where connected network sometimes doesn't update." into oc-mr1-dev
am:
51bde3c8fe
Change-Id: Ie9139274f1c472baa87121d5a6faf8c2b40b6a3f
Justin Klaassen [Wed, 9 Aug 2017 20:01:40 +0000 (20:01 +0000)]
Merge "Ask device owner for master clear in demo mode" into oc-mr1-dev
am:
d59854de24
Change-Id: I244bebfc463e3d045556a74a2de0cb9ef5f862af
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
Andrew Sapperstein [Wed, 9 Aug 2017 19:33:30 +0000 (19:33 +0000)]
Merge "Refactoring for AmbientAlwaysOnPreferenceController" into oc-dr1-dev am:
64b15c4a7b
am:
92592b4c25
Change-Id: I9dea2428459cf654f1e509114f2ec97ea9e6811b
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
Matthew Fritze [Wed, 9 Aug 2017 18:37:19 +0000 (18:37 +0000)]
Merge "Fix DataSaverBackend objects created on background threads" into oc-mr1-dev
am:
e0c0616d6f
Change-Id: I4c63b3c4fad2824d45cc6637d08074a7fb3059fd
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
Fan Zhang [Wed, 9 Aug 2017 18:04:15 +0000 (18:04 +0000)]
Merge "Refresh preferences when background data switch is toggled" into oc-mr1-dev
am:
293899d5ce
Change-Id: Ic1518ede3d6ae01f409c44582415233371ba48ab
Fan Zhang [Wed, 9 Aug 2017 18:03:29 +0000 (18:03 +0000)]
Merge "Misc fixes for settings" into oc-mr1-dev
am:
54d816fd90
Change-Id: I7a015ea3ddd7b7cdd9db6896e6459ce3f491dabc
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
The Android Open Source Project [Wed, 9 Aug 2017 17:14:44 +0000 (17:14 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
am:
882d35715e -s ours
Change-Id: I2eccdf0b32f8a206717eedbe14a39102e9cb2070
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
Oren Blasberg [Wed, 9 Aug 2017 16:06:02 +0000 (16:06 +0000)]
Merge "Update SMS mirroring icon to new style." into oc-mr1-dev
am:
a3a0a1e2e8
Change-Id: I9de7aeaa4e81b969c40e137125777f8eb7274152
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
Adrian Roos [Wed, 9 Aug 2017 13:55:00 +0000 (13:55 +0000)]
Merge "FRP: Add dedicated explanation strings for ConfirmCredential" into oc-mr1-dev
am:
a147d4a616
Change-Id: I6a585ed52bf746fe125cd8abcdd6ca5ac1ef8d87
Julia Reynolds [Wed, 9 Aug 2017 13:54:40 +0000 (13:54 +0000)]
Merge "Use colorful +s" into oc-mr1-dev
am:
e286c0627b
Change-Id: If04c234b436914a208c3a0cc9f3f9c6902d5d2d5
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
Andrew Sapperstein [Wed, 9 Aug 2017 13:26:31 +0000 (13:26 +0000)]
Merge "Refactoring for AmbientAlwaysOnPreferenceController" into oc-dr1-dev am:
64b15c4a7b
am:
6eafaf46aa
Change-Id: I27c05398a20cfe1ece5313c31a0a502fd7ce3f42
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:19:43 +0000 (09:19 +0000)]
Merge "Move work notification settings back to bottom" into oc-mr1-dev
am:
466adba25e
Change-Id: Ib6e3348917eb90515aeef8e7131e55c95ee0768e
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
Eric Schwarzenbach [Wed, 9 Aug 2017 01:04:33 +0000 (01:04 +0000)]
Merge "Add modify string to resources." into oc-mr1-dev
am:
9e47d2c233
Change-Id: I439eea568712e0818613ad8b88b2b9770ae72a68
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
Andrew Sapperstein [Wed, 9 Aug 2017 00:20:03 +0000 (00:20 +0000)]
Merge "Refactoring for AmbientAlwaysOnPreferenceController" into oc-dr1-dev
am:
64b15c4a7b
Change-Id: I3d17c1389486b7a4d1fe901a69ffa37f1cf16b78
Maurice Lam [Wed, 9 Aug 2017 00:02:12 +0000 (00:02 +0000)]
Merge "Show help string when onEnrollmentHelp() is called" am:
5a926705ef am:
dbfde54fb6 am:
d415cbfc0d
am:
6b5f99bcbd
Change-Id: Ibf17029cec44e8767bf843358f497efebc9cec7d
TreeHugger Robot [Tue, 8 Aug 2017 23:59:50 +0000 (23:59 +0000)]
Merge "Refactoring for AmbientAlwaysOnPreferenceController" into oc-dr1-dev
Maurice Lam [Tue, 8 Aug 2017 23:26:20 +0000 (23:26 +0000)]
Merge "Show help string when onEnrollmentHelp() is called" am:
5a926705ef am:
dbfde54fb6
am:
d415cbfc0d
Change-Id: Ic3a74f8ce7d4a068d4a21fe367cd232a103bf130
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
Maurice Lam [Tue, 8 Aug 2017 23:05:55 +0000 (23:05 +0000)]
Merge "Show help string when onEnrollmentHelp() is called" am:
5a926705ef
am:
dbfde54fb6
Change-Id: Ie98fa2d24ebe48e868762cf85129139974ce845f
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
Maurice Lam [Tue, 8 Aug 2017 22:56:38 +0000 (22:56 +0000)]
Merge "Show help string when onEnrollmentHelp() is called"
am:
5a926705ef
Change-Id: I5af1cac8ee4018e40005484631b6f3f3434e03b9
Fan Zhang [Tue, 8 Aug 2017 22:28:07 +0000 (22:28 +0000)]
Merge "Clean up logic for dismissing suggestion" into oc-mr1-dev
am:
fef5f6aa4a
Change-Id: I8c5ee9684f4a1fb8356aa35ab6ca26b80ada7436
Salvador Martinez [Tue, 8 Aug 2017 22:18:30 +0000 (22:18 +0000)]
Refactor tether logic for reuse am:
135619d483
am:
4c2fc34707 -s ours
Change-Id: I0fc8272a026d188010ce8a613f02cc6c892828c7
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 [Tue, 8 Aug 2017 22:08:50 +0000 (22:08 +0000)]
Refactor tether logic for reuse
am:
135619d483
Change-Id: I216dcb55a0f2423766abb4c30fc996f13afda2e4
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
Maurice Lam [Tue, 8 Aug 2017 22:02:20 +0000 (22:02 +0000)]
Merge "Show help string when onEnrollmentHelp() is called"
Salvador Martinez [Tue, 8 Aug 2017 21:59:50 +0000 (21:59 +0000)]
Refactor tether logic for reuse am:
135619d483 -s ours
am:
cc92875825 -s ours
Change-Id: Ifdf63b4f14dffb0cdf4149f228e03dd7807d3562
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
Daniel Nishi [Tue, 8 Aug 2017 21:03:32 +0000 (21:03 +0000)]
Merge "Add floats to the SecureSettings shadow." into oc-mr1-dev
am:
a28dc40543
Change-Id: I55ba747a08ac5ab6c043a7b53961b1728e4c1a6d
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
Oren Blasberg [Tue, 8 Aug 2017 20:07:55 +0000 (20:07 +0000)]
Merge "SMS mirroring: Add placeholder summary." into oc-mr1-dev
am:
101f3d2e44
Change-Id: If2e2c15f2672bac1250783376c102b9bda6e1156
TreeHugger Robot [Tue, 8 Aug 2017 20:02:42 +0000 (20:02 +0000)]
Merge "SMS mirroring: Add placeholder summary." into oc-mr1-dev
Alison Cichowlas [Tue, 8 Aug 2017 19:50:50 +0000 (19:50 +0000)]
Merge "Add new strings for b/
63109928" into oc-mr1-dev
am:
4068fe7d38
Change-Id: I23f34a35cea64a8f599f3dca2c9a65b8b85d05b1
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
jackqdyulei [Tue, 8 Aug 2017 19:28:39 +0000 (19:28 +0000)]
Merge "Add uid data even though on battery stats" into oc-mr1-dev
am:
189899c169
Change-Id: If77a54cbcb8dc972297fab9779b3947aa25cf020
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
Salvador Martinez [Tue, 8 Aug 2017 19:02:08 +0000 (19:02 +0000)]
Merge "Refactor tether logic for reuse" into oc-mr1-dev
am:
705a9e7e85
Change-Id: If61a7e53543929257b689c9cc7326c836d6c397c
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
Fan Zhang [Tue, 8 Aug 2017 00:29:18 +0000 (17:29 -0700)]
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
Winston Man [Tue, 8 Aug 2017 13:32:52 +0000 (14:32 +0100)]
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
Alison Cichowlas [Tue, 8 Aug 2017 15:05:23 +0000 (11:05 -0400)]
Add new strings for b/
63109928
Test: Strings only; manual
Bug:
63109928
Change-Id: Ib2d491aff81faa866300e6b4f3a0d7c0e1417b98
Android Build Merger (Role) [Tue, 8 Aug 2017 03:07:45 +0000 (03:07 +0000)]
Merge "Refactor permissions code for bluetooth controller enabler am:
a8db5ccea8 am:
b1c0e38284" into oc-mr1-dev-plus-aosp
Salvador Martinez [Tue, 8 Aug 2017 03:07:08 +0000 (03:07 +0000)]
Refactor permissions code for bluetooth controller enabler am:
a8db5ccea8
am:
b32159f242
Change-Id: I7734f18a3fd1c5abc401131862701c47bfae64c9
Salvador Martinez [Tue, 8 Aug 2017 03:07:08 +0000 (03:07 +0000)]
Refactor permissions code for bluetooth controller enabler am:
a8db5ccea8
am:
b1c0e38284
Change-Id: I1f58b6310db52eb0d3286a755e210dfe74c6fc96