Commit Graph

38077 Commits

Author SHA1 Message Date
Suprabh Shukla
26f4aceece Disabling the activate button when paused
am: af5d8b9b03

Change-Id: Icf4cd1c4ff5a520a72f9deedf85c486e892da250
2017-08-16 19:26:00 +00:00
Suprabh Shukla
1e9af33c41 Disabling the activate button when paused am: 8e08a9bb71
am: 08207f457d

Change-Id: I693fde0d9935e0b92fa8848b205db3a810a58b67
2017-08-16 19:25:59 +00:00
Suprabh Shukla
779237e37f Disabling the activate button when paused
am: de5df8b090

Change-Id: I7878f3f3addbb0f47f3c145a34977a9ebb62a055
2017-08-16 19:25:59 +00:00
Suprabh Shukla
08207f457d Disabling the activate button when paused
am: 8e08a9bb71

Change-Id: I9b9ccd0bd849d34343ff0a6d6b579274d02264c6
2017-08-16 19:22:01 +00:00
Nick Desaulniers
4cdaebd0c4 Merge "DeviceInfoSettingsTest: test parsing llvm kernel" am: 33046b4ec2 -s ours am: f25a418e24
am: e625c2f64e

Change-Id: If659955e693b8bae1aae5118fa7122fa2d287b3b
2017-08-16 18:44:56 +00:00
Nick Desaulniers
e625c2f64e Merge "DeviceInfoSettingsTest: test parsing llvm kernel" am: 33046b4ec2 -s ours
am: f25a418e24

Change-Id: I3e1b36b906f137b9960b25c8c6de61e31f751804
2017-08-16 18:37:21 +00:00
Nick Desaulniers
f25a418e24 Merge "DeviceInfoSettingsTest: test parsing llvm kernel"
am: 33046b4ec2  -s ours

Change-Id: I1f83d7375246e2b84bb3a0f911dfdc5980da76f9
2017-08-16 18:34:27 +00:00
Treehugger Robot
33046b4ec2 Merge "DeviceInfoSettingsTest: test parsing llvm kernel" 2017-08-16 18:00:44 +00:00
Nick Desaulniers
4021eb5229 DeviceInfoSettingsTest: test parsing llvm kernel
Adds unit test for DeviceInfoUtils.formatKernelVersion to see if it can
parse a /proc/version string from a kernel compiled with Clang/LLVM.

Bug: 32455817
Change-Id: I25123bf44f67e038e01d8c76d6eab18d5616c7c2
2017-08-16 09:51:41 -07:00
Suprabh Shukla
9ffee0d534 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.


Bug: 35056974
Change-Id: I292a44e713ea4a4b0305ca3b3b21f1c82fd73c2b
Merged-In: I292a44e713ea4a4b0305ca3b3b21f1c82fd73c2b
2017-08-15 03:43:10 +00:00
Suprabh Shukla
de5df8b090 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.

Bug: 35056974
Change-Id: I292a44e713ea4a4b0305ca3b3b21f1c82fd73c2b
Merged-In: I292a44e713ea4a4b0305ca3b3b21f1c82fd73c2b
2017-08-15 03:40:37 +00:00
Suprabh Shukla
8e08a9bb71 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
2017-08-15 03:35:43 +00:00
Suprabh Shukla
af5d8b9b03 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
2017-08-15 02:37:37 +00:00
Bill Yi
6ece6e96fb Revert "Import translations. DO NOT MERGE"
am: d8d29f2964  -s ours

Change-Id: I6f29a8cc9f7667aa5209638e3caf1441216ea319
2017-08-14 13:35:42 +00:00
Bill Yi
d8d29f2964 Revert "Import translations. DO NOT MERGE"
This reverts commit a2a4037f59.

Change-Id: I2145ac4c4f1092799bbc547ef9ea7d19c101cd95
Exempt-From-Owner-Approval: translation import
2017-08-14 13:32:35 +00:00
Bill Yi
d3f28537a4 Import translations. DO NOT MERGE
am: a2a4037f59  -s ours

Change-Id: I5702da8e0a51efa1ab4ad1e262e53f720a36b96a
2017-08-12 18:39:26 +00:00
Bill Yi
a2a4037f59 Import translations. DO NOT MERGE
Change-Id: I8f1c2c8a6591596db2098eac88bbb99660cfbefa
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
2017-08-12 08:56:25 -07:00
Doris Ling
cd4dc413f4 Initialize the volume seekbar preference max and progress.
am: cbc231c545

Change-Id: Ifd70d6362064f640dfd899d4437d582d853ed7a7
2017-08-10 22:29:23 +00:00
Doris Ling
cbc231c545 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 b7490bea28)
2017-08-10 20:22:34 +00:00
Antony Sargent
0fe460a8e3 Merge "Stay discoverable in Bluetooth settings and pairing pages" into oc-dr1-dev
am: 49cd8f2327

Change-Id: I02c6056ab8efb238cb8ba97ea4d4ea6de247c13d
2017-08-10 07:25:52 +00:00
TreeHugger Robot
49cd8f2327 Merge "Stay discoverable in Bluetooth settings and pairing pages" into oc-dr1-dev 2017-08-10 07:23:29 +00:00
Jayachandran Chinnakkannu
835152f391 Merge "Do not translate "Wi-Fi calling" for VF DE" into oc-dr1-dev
am: 9476e824be

Change-Id: I7aa611840a3e14476f7f637be866920b5723d39c
2017-08-10 06:04:30 +00:00
Jayachandran Chinnakkannu
9476e824be Merge "Do not translate "Wi-Fi calling" for VF DE" into oc-dr1-dev 2017-08-10 06:00:29 +00:00
Antony Sargent
c86440538f 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
2017-08-09 22:10:40 -07:00
Justin Klaassen
0a982f39c2 DO NOT MERGE - Ask device owner for master clear in demo mode
am: a22c8345fa

Change-Id: Idf0f52476201a55c6d3a8051158e0ea3a7f555b0
2017-08-10 00:23:52 +00: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
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
qqzhou
13d1167e44 Merge "Settings: Fix NPE in ChannelNotificationSettings" into oc-dr1-dev
am: 2c2b6b48de

Change-Id: I4255d1eea7583a448172dbfaba5fdec1eb168c28
2017-08-09 21:07:36 +00:00
TreeHugger Robot
2c2b6b48de Merge "Settings: Fix NPE in ChannelNotificationSettings" into oc-dr1-dev 2017-08-09 20:57:50 +00:00
Daniel Nishi
b2da45dd09 Merge "Add floats to the SecureSettings shadow." into oc-dr1-dev
am: 97e0e42959

Change-Id: I14f7ce1b372520d52f6e91e047aea15e764f18a3
2017-08-09 19:27:58 +00:00
Matthew Fritze
8efbe4e120 Merge "Fix DataSaverBackend objects created on background threads" into oc-dr1-dev
am: 3161375f78

Change-Id: Iea4b58025fbc83557b4eb37940931eb0b831cc45
2017-08-09 19:26:10 +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
mingliang.x.lei
8ba28798aa Merge "Fix memory leak in Bluetooth settings" am: 5a652c0286 am: 8d3bb3e2ad
am: c46b5e60b9

Change-Id: I1c8766701e83c9354bebf6554742c24756de7117
2017-08-09 18:53:07 +00:00
mingliang.x.lei
c46b5e60b9 Merge "Fix memory leak in Bluetooth settings" am: 5a652c0286
am: 8d3bb3e2ad

Change-Id: Iebccb788115a2be1fca3144199fc3e857a11556f
2017-08-09 18:36:33 +00:00
mingliang.x.lei
8d3bb3e2ad Merge "Fix memory leak in Bluetooth settings"
am: 5a652c0286

Change-Id: Ica95ac1bed6dbbc305315a32c1c9a92bb83d4574
2017-08-09 18:34:07 +00:00
Treehugger Robot
5a652c0286 Merge "Fix memory leak in Bluetooth settings" 2017-08-09 18:27:43 +00:00
The Android Open Source Project
5d13310d94 Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
am: dd6d975214  -s ours

Change-Id: Ibdf27617dfdd337155c1d2bbc756621234bdf515
2017-08-09 16:31:10 +00:00
Daniel Nishi
5f3f655ad2 Merge "Expose the notification-swipe controls." into oc-dr1-dev
am: c075f8943e

Change-Id: If4e022ce3189995eade9b7ef8ce131bf97be71b3
2017-08-09 16:30:01 +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
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
Ruchi Kandoi
3b012860db Merge "Avoid Race condition with accessibility for NFC toggle switch" into oc-dr1-dev
am: 9eff3f90d8

Change-Id: I6b27975aa51356f31c2a31c8ee04abc7bb84f2b2
2017-08-09 05:38:23 +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
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
Salvador Martinez
3781030b94 Merge "Update availability for mobile network" into oc-dr1-dev
am: 4bcc3eb193

Change-Id: I1f99651b28ba8576769d0efdb1283c4f6da46695
2017-08-09 01:20:24 +00:00
TreeHugger Robot
4bcc3eb193 Merge "Update availability for mobile network" into oc-dr1-dev 2017-08-09 01:06:50 +00: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
Andrew Sapperstein
92592b4c25 Merge "Refactoring for AmbientAlwaysOnPreferenceController" into oc-dr1-dev
am: 64b15c4a7b

Change-Id: I3d17c1389486b7a4d1fe901a69ffa37f1cf16b78
2017-08-09 00:20:03 +00:00