Suprabh Shukla
3ce6d3ee87
Disabling the activate button when paused am: de5df8b090 am: 779237e37f am: 24547155ea -s ours am: 889036189b -s ours am: 9acf640efd -s ours am: 29c1777ca5 -s ours am: 694ab09ff3 -s ours am: a92a7e400f -s ours
...
am: cf0caf8f22
2017-08-16 20:02:33 +00:00
Suprabh Shukla
b2f5566de5
Disabling the activate button when paused am: 9ffee0d534 am: d27e28eab7 am: 93a9e9f7f2 -s ours am: 78a9d598f1 -s ours am: 0dba51f9f0 -s ours am: 7bd8e120cb -s ours am: d22de194f5 -s ours
...
am: de8e1f4be5
2017-08-16 19:59:04 +00:00
Suprabh Shukla
cf0caf8f22
Disabling the activate button when paused am: de5df8b090 am: 779237e37f am: 24547155ea -s ours am: 889036189b -s ours am: 9acf640efd -s ours am: 29c1777ca5 -s ours am: 694ab09ff3 -s ours
...
am: a92a7e400f
2017-08-16 19:59:04 +00:00
Suprabh Shukla
817c35056c
Disabling the activate button when paused am: af5d8b9b03 am: 26f4aceece am: ccad4a3621 am: 72beaddfd4 -s ours
...
am: 2e6cf5dcde
2017-08-16 19:55:14 +00:00
Suprabh Shukla
a92a7e400f
Disabling the activate button when paused am: de5df8b090 am: 779237e37f am: 24547155ea -s ours am: 889036189b -s ours am: 9acf640efd -s ours am: 29c1777ca5 -s ours
...
am: 694ab09ff3
2017-08-16 19:55:02 +00:00
Suprabh Shukla
de8e1f4be5
Disabling the activate button when paused am: 9ffee0d534 am: d27e28eab7 am: 93a9e9f7f2 -s ours am: 78a9d598f1 -s ours am: 0dba51f9f0 -s ours am: 7bd8e120cb -s ours
...
am: d22de194f5
2017-08-16 19:55:01 +00:00
Android Build Merger (Role)
910f4fb003
Merge "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" into oc-dr1-dev-plus-aosp
2017-08-16 19:51:50 +00:00
Suprabh Shukla
db8682996d
Disabling the activate button when paused am: 8e08a9bb71 am: 08207f457d am: 1e9af33c41 am: 1370eb3d52 am: 616c84ccb0 -s ours am: aedf7cdfdb -s ours
...
am: baf4375f01
2017-08-16 19:51:03 +00:00
Suprabh Shukla
9f458c77fd
Disabling the activate button when paused am: 8e08a9bb71 am: 08207f457d am: 1e9af33c41 am: 1370eb3d52 am: 616c84ccb0 -s ours am: aedf7cdfdb -s ours
...
am: f52c8ccbfc
2017-08-16 19:51:03 +00:00
Suprabh Shukla
d22de194f5
Disabling the activate button when paused am: 9ffee0d534 am: d27e28eab7 am: 93a9e9f7f2 -s ours am: 78a9d598f1 -s ours am: 0dba51f9f0 -s ours
...
am: 7bd8e120cb
2017-08-16 19:51:02 +00:00
Suprabh Shukla
baf4375f01
Disabling the activate button when paused am: 8e08a9bb71 am: 08207f457d am: 1e9af33c41 am: 1370eb3d52 am: 616c84ccb0 -s ours
...
am: aedf7cdfdb
2017-08-16 19:49:08 +00:00
Suprabh Shukla
f52c8ccbfc
Disabling the activate button when paused am: 8e08a9bb71 am: 08207f457d am: 1e9af33c41 am: 1370eb3d52 am: 616c84ccb0 -s ours
...
am: aedf7cdfdb
2017-08-16 19:48:33 +00:00
Suprabh Shukla
694ab09ff3
Disabling the activate button when paused am: de5df8b090 am: 779237e37f am: 24547155ea -s ours am: 889036189b -s ours am: 9acf640efd -s ours
...
am: 29c1777ca5
2017-08-16 19:48:32 +00:00
Suprabh Shukla
7bd8e120cb
Disabling the activate button when paused am: 9ffee0d534 am: d27e28eab7 am: 93a9e9f7f2 -s ours am: 78a9d598f1 -s ours
...
am: 0dba51f9f0
2017-08-16 19:47:06 +00:00
Suprabh Shukla
2e6cf5dcde
Disabling the activate button when paused am: af5d8b9b03 am: 26f4aceece am: ccad4a3621
...
am: 72beaddfd4
2017-08-16 19:46:49 +00:00
Suprabh Shukla
29c1777ca5
Disabling the activate button when paused am: de5df8b090 am: 779237e37f am: 24547155ea -s ours am: 889036189b -s ours
...
am: 9acf640efd
2017-08-16 19:44:31 +00:00
Suprabh Shukla
0dba51f9f0
Disabling the activate button when paused am: 9ffee0d534 am: d27e28eab7 am: 93a9e9f7f2 -s ours
...
am: 78a9d598f1
2017-08-16 19:43:31 +00:00
Suprabh Shukla
9acf640efd
Disabling the activate button when paused am: de5df8b090 am: 779237e37f am: 24547155ea -s ours
...
am: 889036189b
2017-08-16 19:40:32 +00:00
Suprabh Shukla
aedf7cdfdb
Disabling the activate button when paused am: 8e08a9bb71 am: 08207f457d am: 1e9af33c41 am: 1370eb3d52
...
am: 616c84ccb0
2017-08-16 19:40:30 +00:00
Suprabh Shukla
72beaddfd4
Disabling the activate button when paused am: af5d8b9b03 am: 26f4aceece
...
am: ccad4a3621
2017-08-16 19:39:49 +00:00
Suprabh Shukla
78a9d598f1
Disabling the activate button when paused am: 9ffee0d534 am: d27e28eab7
...
am: 93a9e9f7f2
2017-08-16 19:38:35 +00:00
Suprabh Shukla
889036189b
Disabling the activate button when paused am: de5df8b090 am: 779237e37f
...
am: 24547155ea
2017-08-16 19:37:01 +00:00
Suprabh Shukla
616c84ccb0
Disabling the activate button when paused am: 8e08a9bb71 am: 08207f457d am: 1e9af33c41
...
am: 1370eb3d52
2017-08-16 19:34:24 +00:00
Suprabh Shukla
ccad4a3621
Disabling the activate button when paused am: af5d8b9b03
...
am: 26f4aceece
2017-08-16 19:33:34 +00:00
Suprabh Shukla
93a9e9f7f2
Disabling the activate button when paused am: 9ffee0d534
...
am: d27e28eab7
2017-08-16 19:33:30 +00:00
Suprabh Shukla
24547155ea
Disabling the activate button when paused am: de5df8b090
...
am: 779237e37f
2017-08-16 19:32:31 +00:00
Suprabh Shukla
1370eb3d52
Disabling the activate button when paused am: 8e08a9bb71 am: 08207f457d
...
am: 1e9af33c41
2017-08-16 19:30:03 +00:00
Suprabh Shukla
d27e28eab7
Disabling the activate button when paused
...
am: 9ffee0d534
2017-08-16 19:27:40 +00:00
Suprabh Shukla
26f4aceece
Disabling the activate button when paused
...
am: af5d8b9b03
2017-08-16 19:26:00 +00:00
Suprabh Shukla
1e9af33c41
Disabling the activate button when paused am: 8e08a9bb71
...
am: 08207f457d
2017-08-16 19:25:59 +00:00
Suprabh Shukla
779237e37f
Disabling the activate button when paused
...
am: de5df8b090
2017-08-16 19:25:59 +00:00
Suprabh Shukla
08207f457d
Disabling the activate button when paused
...
am: 8e08a9bb71
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
2017-08-16 18:44:56 +00:00
Nick Desaulniers
e625c2f64e
Merge "DeviceInfoSettingsTest: test parsing llvm kernel" am: 33046b4ec2 -s ours
...
am: f25a418e24
2017-08-16 18:37:21 +00:00
Nick Desaulniers
f25a418e24
Merge "DeviceInfoSettingsTest: test parsing llvm kernel"
...
am: 33046b4ec2
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
2017-08-14 13:35:42 +00:00
Bill Yi
d8d29f2964
Revert "Import translations. DO NOT MERGE"
...
This reverts commit a2a4037f59
2017-08-14 13:32:35 +00:00
Bill Yi
d3f28537a4
Import translations. DO NOT MERGE
...
am: a2a4037f59
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
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
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
2017-08-10 06:04:30 +00:00
