Suprabh Shukla
db19657051
Disabling the activate button when paused am: 8e08a9bb71 am: 08207f457d am: 1e9af33c41 am: 1370eb3d52 am: 616c84ccb0 -s ours am: aedf7cdfdb -s ours am: baf4375f01 -s ours
...
am: db8682996d
2017-08-16 20:21:13 +00:00
Suprabh Shukla
39f553782c
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
...
am: d0275e53eb
2017-08-16 20:03:35 +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
d0275e53eb
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
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
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
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
1370eb3d52
Disabling the activate button when paused am: 8e08a9bb71 am: 08207f457d
...
am: 1e9af33c41
2017-08-16 19:30:03 +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
08207f457d
Disabling the activate button when paused
...
am: 8e08a9bb71
2017-08-16 19:22:01 +00:00
Nick Desaulniers
9729edbb8a
Merge "DeviceInfoSettingsTest: test parsing llvm kernel" am: 33046b4ec2 -s ours am: f25a418e24 am: e625c2f64e
...
am: 4cdaebd0c4
2017-08-16 18:51:56 +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
Maurice Lam
4db65eab00
Merge "Use default primary color for choose lock screens" into oc-mr1-dev
...
am: 595627c630
2017-08-16 18:30:22 +00:00
Maurice Lam
595627c630
Merge "Use default primary color for choose lock screens" into oc-mr1-dev
2017-08-16 18:25:02 +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
Maurice Lam
2dad90da4b
Merge "Don't launch Choose Lock again if recreating" into oc-mr1-dev
...
am: 0ece5f2a06
2017-08-16 08:04:41 +00:00
TreeHugger Robot
0ece5f2a06
Merge "Don't launch Choose Lock again if recreating" into oc-mr1-dev
2017-08-16 07:51:27 +00:00
Maurice Lam
e9a6e8f1e5
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
2017-08-15 19:30:14 -07:00
Maurice Lam
2bb6238044
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
2017-08-15 16:26:05 -07: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
Jesse Evans
eee0e82fba
Merge "Change strings from Instant app account to setting" into oc-mr1-dev
...
am: 858ea46a3a
2017-08-15 01:37:07 +00:00
TreeHugger Robot
858ea46a3a
Merge "Change strings from Instant app account to setting" into oc-mr1-dev
2017-08-15 01:18:27 +00:00
Bill Yi
52744ebaf1
Revert "Import translations. DO NOT MERGE" am: d8d29f2964 -s ours
...
am: fdbe5d9f82
2017-08-14 13:49:45 +00:00
Bill Yi
ffded27909
Revert "Import translations. DO NOT MERGE" am: d8d29f2964 -s ours
...
am: 6ece6e96fb
2017-08-14 13:39:44 +00:00
Bill Yi
6ece6e96fb
Revert "Import translations. DO NOT MERGE"
...
am: d8d29f2964
2017-08-14 13:35:42 +00:00
Bill Yi
fdbe5d9f82
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
6b925ea6c9
Import translations. DO NOT MERGE am: a2a4037f59 -s ours
...
am: 8944eb96c8
2017-08-12 18:43:37 +00:00
Bill Yi
65dd906932
Import translations. DO NOT MERGE am: a2a4037f59 -s ours
...
am: d3f28537a4
2017-08-12 18:42:28 +00:00
Bill Yi
d3f28537a4
Import translations. DO NOT MERGE
...
am: a2a4037f59
2017-08-12 18:39:26 +00:00
Bill Yi
8944eb96c8
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
Jesse Evans
804b0daf49
Change strings from Instant app account to setting
...
Test: existing tests
Bug: 63762769
Change-Id: I5499f76b9f8b5f513813c4ee09a4fb00c96c3fd4
2017-08-11 18:12:42 -07:00
Maurice Lam
a773403cd2
Update strings for screen lock setup
...
am: 3eb4c8333e
2017-08-12 00:22:14 +00:00
Maurice Lam
3eb4c8333e
Update strings for screen lock setup
...
Test: Manual, existing tests pass
Bug: 64084524
Change-Id: Iff4b004aaf504ae3d574428e41bf91fd46a66f30
2017-08-11 13:12:20 -07:00
Kevin Chyn
5e8f4b6320
Merge "Reset fingerprint lockout upon successful unlock" into oc-mr1-dev
...
am: 2e7b65f74a
2017-08-11 17:34:35 +00:00
TreeHugger Robot
2e7b65f74a
Merge "Reset fingerprint lockout upon successful unlock" into oc-mr1-dev
2017-08-11 17:26:08 +00:00
Ajay Nadathur
aec29ee4be
Merge "Update strings for skip fingerprint setup" into oc-mr1-dev
...
am: 719d80e6e0
2017-08-11 17:21:24 +00:00
Ajay Nadathur
719d80e6e0
Merge "Update strings for skip fingerprint setup" into oc-mr1-dev
2017-08-11 17:12:26 +00:00
Kevin Chyn
e54e3de80c
Merge "Clean up AssistGesturePreferenceController" into oc-mr1-dev
...
am: 14450c5669
2017-08-11 03:06:19 +00:00
TreeHugger Robot
14450c5669
Merge "Clean up AssistGesturePreferenceController" into oc-mr1-dev
2017-08-11 03:01:33 +00:00
Kevin Chyn
bd947c7ba9
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
2017-08-11 00:58:09 +00:00
Ajay Nadathur
58c2da2d9e
Update strings for skip fingerprint setup
...
bug: 64092225
Test: Manually tested and verified updated strings used
Change-Id: I813f72abb8cb9fd2ba9ec952c0926ecd2f670ed0
2017-08-11 00:42:30 +00:00
Doris Ling
549ff2cddc
Initialize the volume seekbar preference max and progress. am: cbc231c545
...
am: cd4dc413f4
2017-08-10 22:36:27 +00:00
Doris Ling
f92ca61cca
Initialize the volume seekbar preference max and progress. am: cbc231c545
...
am: f9ff9b9f5c
2017-08-10 22:35:40 +00:00
Doris Ling
cd4dc413f4
Initialize the volume seekbar preference max and progress.
...
am: cbc231c545
2017-08-10 22:29:23 +00:00
