git.osdn.net Git - android-x86/packages-apps-Settings.git/log

OSDN Git Service

(root) / android-x86 / packages-apps-Settings.git / log

summary | shortlog | log | commit | commitdiff | tree
first ⋅ prev ⋅ next

commit | commitdiff | tree

Suprabh Shukla [Wed, 16 Aug 2017 21:42:10 +0000 (21:42 +0000)]

Disabling the activate button when paused am: af5d8b9b03 am: 26f4aceece am: ccad4a3621 am: 72beaddfd4 -s ours am: 2e6cf5dcde -s ours am: 817c35056c -s ours am: 6d7bb4c4d0 -s ours am: 3dd026d5dc -s ours am: 142433924f -s ours am: 0e22588ed0 -s ours am: bbe3047d1d -s ours
am: 832dde9768 -s ours

Change-Id: Ia03490a922bbb07832e36ced78a53b889249a647

commit | commitdiff | tree

Suprabh Shukla [Wed, 16 Aug 2017 21:38:28 +0000 (21:38 +0000)]

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 -s ours am: 3ce6d3ee87 -s ours am: 202970aa92 -s ours am: 81ba0cc873 -s ours am: 82afc6c5fd -s ours am: 23e185adf8 -s ours am: 5d4a2bb844 -s ours am: b4678ce1d2 -s ours am: 9a416573d7 -s ours
am: 7d1286299e -s ours

Change-Id: Ic87fffce35084c46b561c0d062742d31e12bbafc

commit | commitdiff | tree

Suprabh Shukla [Wed, 16 Aug 2017 21:37:34 +0000 (21:37 +0000)]

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 -s ours am: b2f5566de5 -s ours am: 05fec2162a -s ours am: df39274478 -s ours am: a6b4e032c8 -s ours am: 28f6dd01bc -s ours am: 8fe20711fa -s ours
am: 1b3f6d0e47 -s ours

Change-Id: I4c2572f2631dfe51747967c30b664d91685c72f0

commit | commitdiff | tree

Suprabh Shukla [Wed, 16 Aug 2017 21:36:57 +0000 (21:36 +0000)]

Disabling the activate button when paused am: af5d8b9b03 am: 26f4aceece am: ccad4a3621 am: 72beaddfd4 -s ours am: 2e6cf5dcde -s ours am: 817c35056c -s ours am: 6d7bb4c4d0 -s ours am: 3dd026d5dc -s ours am: 142433924f -s ours am: 0e22588ed0 -s ours am: bbe3047d1d -s ours
am: 3691da8b51 -s ours

Change-Id: I4ee423a6c5aa9e3a8ec2a302c630cb344dbf034a

commit | commitdiff | tree

Suprabh Shukla [Wed, 16 Aug 2017 21:36:04 +0000 (21:36 +0000)]

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 -s ours am: 3ce6d3ee87 -s ours am: 202970aa92 -s ours am: 81ba0cc873 -s ours am: 82afc6c5fd -s ours am: 23e185adf8 -s ours am: 5d4a2bb844 -s ours am: b4678ce1d2 -s ours am: d430178ba4 -s ours
am: e237bdb4e2 -s ours

Change-Id: Ida7b640695307c1af1e958c7ca8889457e347dc7

commit | commitdiff | tree

Suprabh Shukla [Wed, 16 Aug 2017 21:35:11 +0000 (21:35 +0000)]

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 -s ours am: b2f5566de5 -s ours am: 05fec2162a -s ours am: df39274478 -s ours am: a6b4e032c8 -s ours am: 28f6dd01bc -s ours am: c62f6f30bc -s ours
am: c180be3468 -s ours

Change-Id: I8355b54dca629d528c899ebf9c241eaf4ee50014

commit | commitdiff | tree

Suprabh Shukla [Wed, 16 Aug 2017 21:33:51 +0000 (21:33 +0000)]

Disabling the activate button when paused am: af5d8b9b03 am: 26f4aceece am: ccad4a3621 am: 72beaddfd4 -s ours am: 2e6cf5dcde -s ours am: 817c35056c -s ours am: 6d7bb4c4d0 -s ours am: 3dd026d5dc -s ours am: 142433924f -s ours am: 0e22588ed0 -s ours am: 5575d285db -s ours
am: 8024f41ec1 -s ours

Change-Id: Ic6deaf9e015e4f88156510ca8cccf27f9d115295

commit | commitdiff | tree

Suprabh Shukla [Wed, 16 Aug 2017 21:24:02 +0000 (21:24 +0000)]

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 -s ours am: 3ce6d3ee87 -s ours am: 202970aa92 -s ours am: 81ba0cc873 -s ours am: 82afc6c5fd -s ours am: 23e185adf8 -s ours am: 5d4a2bb844 -s ours am: b4678ce1d2 -s ours
am: 9a416573d7 -s ours

Change-Id: I2a81249795e44842ebe8ef3ff5f4aab62ff3e6cc

commit | commitdiff | tree

Suprabh Shukla [Wed, 16 Aug 2017 21:23:05 +0000 (21:23 +0000)]

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 -s ours am: b2f5566de5 -s ours am: 05fec2162a -s ours am: df39274478 -s ours am: a6b4e032c8 -s ours am: 28f6dd01bc -s ours
am: 8fe20711fa -s ours

Change-Id: I3448fc6d16584807cefbcdca45be0efe022702c8

commit | commitdiff | tree

Suprabh Shukla [Wed, 16 Aug 2017 21:22:17 +0000 (21:22 +0000)]

Disabling the activate button when paused am: af5d8b9b03 am: 26f4aceece am: ccad4a3621 am: 72beaddfd4 -s ours am: 2e6cf5dcde -s ours am: 817c35056c -s ours am: 6d7bb4c4d0 -s ours am: 3dd026d5dc -s ours am: 142433924f -s ours am: 0e22588ed0 -s ours
am: bbe3047d1d -s ours

Change-Id: I7233624570a758b4e7e8dfc6410401cfbde11df8

commit | commitdiff | tree

Suprabh Shukla [Wed, 16 Aug 2017 21:17:28 +0000 (21:17 +0000)]

Disabling the activate button when paused am: af5d8b9b03 am: 26f4aceece am: ccad4a3621 am: 72beaddfd4 -s ours am: 2e6cf5dcde -s ours am: 817c35056c -s ours am: 6d7bb4c4d0 -s ours am: 3dd026d5dc -s ours am: 142433924f -s ours am: 0e22588ed0 -s ours
am: bbe3047d1d -s ours

Change-Id: If2bd687791fccfd3b5aea601053f6038be1d6577

commit | commitdiff | tree

Suprabh Shukla [Wed, 16 Aug 2017 20:51:19 +0000 (20:51 +0000)]

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 -s ours am: 3ce6d3ee87 -s ours am: 202970aa92 -s ours am: 81ba0cc873 -s ours am: 82afc6c5fd -s ours am: 23e185adf8 -s ours am: 5d4a2bb844 -s ours am: b4678ce1d2 -s ours
am: d430178ba4 -s ours

Change-Id: If72ef8b01ef6a90c4752710b5568eeea2bb63796

commit | commitdiff | tree

Suprabh Shukla [Wed, 16 Aug 2017 20:50:39 +0000 (20:50 +0000)]

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 -s ours am: b2f5566de5 -s ours am: 05fec2162a -s ours am: df39274478 -s ours am: a6b4e032c8 -s ours am: 28f6dd01bc -s ours
am: c62f6f30bc -s ours

Change-Id: Iabba05d1d43a40d35e0ce198879d91410440d7b1

commit | commitdiff | tree

Suprabh Shukla [Wed, 16 Aug 2017 20:48:07 +0000 (20:48 +0000)]

Disabling the activate button when paused am: af5d8b9b03 am: 26f4aceece am: ccad4a3621 am: 72beaddfd4 -s ours am: 2e6cf5dcde -s ours am: 817c35056c -s ours am: 6d7bb4c4d0 -s ours am: 3dd026d5dc -s ours am: 142433924f -s ours am: 0e22588ed0 -s ours
am: 5575d285db -s ours

Change-Id: I6f5163890c6a333d9c1dba9ed2c63c364acb6cce

commit | commitdiff | tree

Suprabh Shukla [Wed, 16 Aug 2017 20:42:38 +0000 (20:42 +0000)]

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 -s ours am: 3ce6d3ee87 -s ours am: 202970aa92 -s ours am: 81ba0cc873 -s ours am: 82afc6c5fd -s ours am: 23e185adf8 -s ours am: 5d4a2bb844 -s ours
am: b4678ce1d2 -s ours

Change-Id: I199cfbc0ec36904483c35aa9712ab471cf5b4ec2

commit | commitdiff | tree

Suprabh Shukla [Wed, 16 Aug 2017 20:41:48 +0000 (20:41 +0000)]

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 -s ours am: b2f5566de5 -s ours am: 05fec2162a -s ours am: df39274478 -s ours am: a6b4e032c8 -s ours
am: 28f6dd01bc -s ours

Change-Id: If16f17e144156b08dc9fea587178cad18dc370e7

commit | commitdiff | tree

Suprabh Shukla [Wed, 16 Aug 2017 20:40:59 +0000 (20:40 +0000)]

Disabling the activate button when paused am: af5d8b9b03 am: 26f4aceece am: ccad4a3621 am: 72beaddfd4 -s ours am: 2e6cf5dcde -s ours am: 817c35056c -s ours am: 6d7bb4c4d0 -s ours am: 3dd026d5dc -s ours am: 142433924f -s ours
am: 0e22588ed0 -s ours

Change-Id: I7243a50b7d64e1ee63d85e4ce5467217c76d7bce

commit | commitdiff | tree

Suprabh Shukla [Wed, 16 Aug 2017 20:39:42 +0000 (20:39 +0000)]

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 -s ours am: 3ce6d3ee87 -s ours am: 202970aa92 -s ours am: 81ba0cc873 -s ours am: 82afc6c5fd -s ours am: 23e185adf8 -s ours am: 5d4a2bb844 -s ours
am: b4678ce1d2 -s ours

Change-Id: I350b04feb64b26fddbf366cd31d42d30ef0e02aa

commit | commitdiff | tree

Suprabh Shukla [Wed, 16 Aug 2017 20:38:24 +0000 (20:38 +0000)]

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 -s ours am: b2f5566de5 -s ours am: 05fec2162a -s ours am: df39274478 -s ours am: a6b4e032c8 -s ours
am: 28f6dd01bc -s ours

Change-Id: Ia95e462a6e007f0e87cfddb75b13f8ee7a89971a

commit | commitdiff | tree

Suprabh Shukla [Wed, 16 Aug 2017 20:37:36 +0000 (20:37 +0000)]

Disabling the activate button when paused am: af5d8b9b03 am: 26f4aceece am: ccad4a3621 am: 72beaddfd4 -s ours am: 2e6cf5dcde -s ours am: 817c35056c -s ours am: 6d7bb4c4d0 -s ours am: 3dd026d5dc -s ours am: 142433924f -s ours
am: 0e22588ed0 -s ours

Change-Id: I8025d40c5c1b3b6992d759a7f6a5355207236dff

commit | commitdiff | tree

Suprabh Shukla [Wed, 16 Aug 2017 20:25:12 +0000 (20:25 +0000)]

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 -s ours am: 3ce6d3ee87 -s ours am: 202970aa92 -s ours am: 81ba0cc873 -s ours am: 82afc6c5fd -s ours am: 23e185adf8 -s ours
am: 5d4a2bb844 -s ours

Change-Id: I949bed4c34aeea91e85eae01ffbf812e486ac5d8

commit | commitdiff | tree

Suprabh Shukla [Wed, 16 Aug 2017 20:24:28 +0000 (20:24 +0000)]

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 -s ours am: b2f5566de5 -s ours am: 05fec2162a -s ours am: df39274478 -s ours
am: a6b4e032c8 -s ours

Change-Id: I141ba4edaa9fa21b95d7f8d353764db26d9a5b6a

commit | commitdiff | tree

Suprabh Shukla [Wed, 16 Aug 2017 20:23:41 +0000 (20:23 +0000)]

Disabling the activate button when paused am: af5d8b9b03 am: 26f4aceece am: ccad4a3621 am: 72beaddfd4 -s ours am: 2e6cf5dcde -s ours am: 817c35056c -s ours am: 6d7bb4c4d0 -s ours am: 3dd026d5dc -s ours
am: 142433924f -s ours

Change-Id: Id62e3af77aba546d3a83a8467dc60af88fbf6083

commit | commitdiff | tree

Suprabh Shukla [Wed, 16 Aug 2017 20:22:36 +0000 (20:22 +0000)]

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 -s ours am: 3ce6d3ee87 -s ours am: 202970aa92 -s ours am: 81ba0cc873 -s ours am: 82afc6c5fd -s ours
am: 23e185adf8 -s ours

Change-Id: I28fb4049f4c3a51d163cc77b60358736d082604e

commit | commitdiff | tree

Suprabh Shukla [Wed, 16 Aug 2017 20:21:50 +0000 (20:21 +0000)]

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
am: 910f4fb003 -s ours

Change-Id: I93e8414e389d054a537ae87f482bfdb0623a4a1e

commit | commitdiff | tree

Suprabh Shukla [Wed, 16 Aug 2017 20:21:13 +0000 (20:21 +0000)]

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 -s ours

Change-Id: Ic463b15f7575d5f89bef764e81a72119b45d73ae

commit | commitdiff | tree

Suprabh Shukla [Wed, 16 Aug 2017 20:18:15 +0000 (20:18 +0000)]

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 -s ours am: b2f5566de5 -s ours am: 05fec2162a -s ours
am: df39274478 -s ours

Change-Id: I487f45dcd45eecbc587af45bdc748c842d6414d6

commit | commitdiff | tree

Suprabh Shukla [Wed, 16 Aug 2017 20:17:34 +0000 (20:17 +0000)]

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 -s ours am: 3ce6d3ee87 -s ours am: 202970aa92 -s ours am: 81ba0cc873 -s ours
am: 82afc6c5fd -s ours

Change-Id: If3e96fdcd076bfe522b32726d05bef5f5a605d6a

commit | commitdiff | tree

Suprabh Shukla [Wed, 16 Aug 2017 20:17:28 +0000 (20:17 +0000)]

Disabling the activate button when paused am: af5d8b9b03 am: 26f4aceece am: ccad4a3621 am: 72beaddfd4 -s ours am: 2e6cf5dcde -s ours am: 817c35056c -s ours am: 6d7bb4c4d0 -s ours
am: 3dd026d5dc -s ours

Change-Id: I55000b3f1b300a833bb643816413a83d65ebedec

commit | commitdiff | tree

Suprabh Shukla [Wed, 16 Aug 2017 20:14:42 +0000 (20:14 +0000)]

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 -s ours am: 3ce6d3ee87 -s ours am: 202970aa92 -s ours
am: 81ba0cc873 -s ours

Change-Id: I53467a6c6802c65bf458afa8fd800954bc91f99b

commit | commitdiff | tree

Suprabh Shukla [Wed, 16 Aug 2017 20:10:37 +0000 (20:10 +0000)]

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 -s ours am: 3ce6d3ee87 -s ours
am: 202970aa92 -s ours

Change-Id: Ic1b3450cc4d3cf70cf95b6f80e0b5fd82ff61446

commit | commitdiff | tree

Suprabh Shukla [Wed, 16 Aug 2017 20:09:35 +0000 (20:09 +0000)]

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 -s ours am: b2f5566de5 -s ours
am: 05fec2162a -s ours

Change-Id: I75623b15f15658930e459710fb46cc2f55d788e8

commit | commitdiff | tree

Suprabh Shukla [Wed, 16 Aug 2017 20:08:56 +0000 (20:08 +0000)]

Disabling the activate button when paused am: af5d8b9b03 am: 26f4aceece am: ccad4a3621 am: 72beaddfd4 -s ours am: 2e6cf5dcde -s ours am: 817c35056c -s ours
am: 6d7bb4c4d0 -s ours

Change-Id: I3e042c60b170bf709b0848bc2746f0cba6afbbcf

commit | commitdiff | tree

Suprabh Shukla [Wed, 16 Aug 2017 20:06:04 +0000 (20:06 +0000)]

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 -s ours
am: 3ce6d3ee87 -s ours

Change-Id: I8afbb6a39eb1cffe0cafc94a4b3c98629afce27c

commit | commitdiff | tree

Suprabh Shukla [Wed, 16 Aug 2017 20:04:24 +0000 (20:04 +0000)]

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 -s ours
am: b2f5566de5 -s ours

Change-Id: I12e7f9916aafaadb653e85c0af3de506b3a652a7

commit | commitdiff | tree

Suprabh Shukla [Wed, 16 Aug 2017 20:03:35 +0000 (20:03 +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
am: d0275e53eb -s ours

Change-Id: Icc99f47b9ccb35207f6420ec50840e133bd402eb

commit | commitdiff | tree

Suprabh Shukla [Wed, 16 Aug 2017 20:03:34 +0000 (20:03 +0000)]

Disabling the activate button when paused am: af5d8b9b03 am: 26f4aceece am: ccad4a3621 am: 72beaddfd4 -s ours am: 2e6cf5dcde -s ours
am: 817c35056c -s ours

Change-Id: I6ab3c67db3726cd15ca3114b0edb41d0ae248a3f

commit | commitdiff | tree

Suprabh Shukla [Wed, 16 Aug 2017 20:02:33 +0000 (20:02 +0000)]

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 -s ours

Change-Id: If3daaffd53e0ee3743f6f4a1608c5114cfa498b7

commit | commitdiff | tree

Suprabh Shukla [Wed, 16 Aug 2017 19:59:04 +0000 (19:59 +0000)]

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 -s ours

Change-Id: I991cd251a7f54d16dff7df676aff5fed265a07d3

commit | commitdiff | tree

Suprabh Shukla [Wed, 16 Aug 2017 19:59:04 +0000 (19:59 +0000)]

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

Change-Id: I050ec3b9ce32d4a91add1447bab7845163348485

commit | commitdiff | tree

Suprabh Shukla [Wed, 16 Aug 2017 19:55:14 +0000 (19:55 +0000)]

Disabling the activate button when paused am: af5d8b9b03 am: 26f4aceece am: ccad4a3621 am: 72beaddfd4 -s ours
am: 2e6cf5dcde -s ours

Change-Id: I490c9f78edd2a1d87ba3b669ea24ac962b91cb61

commit | commitdiff | tree

Suprabh Shukla [Wed, 16 Aug 2017 19:55:02 +0000 (19:55 +0000)]

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

Change-Id: Ib0587f73a715928275159027c09286127d063684

commit | commitdiff | tree

Suprabh Shukla [Wed, 16 Aug 2017 19:55:01 +0000 (19:55 +0000)]

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

Change-Id: I953f903e7298541160ed8c17f274a832618c152e

commit | commitdiff | tree

Android Build Merger (Role) [Wed, 16 Aug 2017 19:51:50 +0000 (19:51 +0000)]

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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: baf4375f01 -s ours

Change-Id: I530a1f23f0a1804786fe3645a115176b53102a9b

commit | commitdiff | tree

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: I22a9fd9d0713277fa591b5a0ef7f6958931588b9

commit | commitdiff | tree

Suprabh Shukla [Wed, 16 Aug 2017 19:51:02 +0000 (19:51 +0000)]

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

Change-Id: I2f06097aaaa7e312a0b066e2f92536968d31003f

commit | commitdiff | tree

Suprabh Shukla [Wed, 16 Aug 2017 19:49:08 +0000 (19:49 +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: I0a6af74c670ecfde23b1d5217f67ebccb14c0080

commit | commitdiff | tree

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

commit | commitdiff | tree

Suprabh Shukla [Wed, 16 Aug 2017 19:48:32 +0000 (19:48 +0000)]

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

Change-Id: I31830a5e46544e1f939a05482f46a03970e4b197

commit | commitdiff | tree

Suprabh Shukla [Wed, 16 Aug 2017 19:47:06 +0000 (19:47 +0000)]

Disabling the activate button when paused am: 9ffee0d534 am: d27e28eab7 am: 93a9e9f7f2 -s ours am: 78a9d598f1 -s ours
am: 0dba51f9f0 -s ours

Change-Id: Ife5e67db0c3866b3bae77d1d0f476bc7f30bf389

commit | commitdiff | tree

Suprabh Shukla [Wed, 16 Aug 2017 19:46:49 +0000 (19:46 +0000)]

Disabling the activate button when paused am: af5d8b9b03 am: 26f4aceece am: ccad4a3621
am: 72beaddfd4 -s ours

Change-Id: I10ef6e273e8fb369d86d01d441c1ae419fe3a5b1

commit | commitdiff | tree

Suprabh Shukla [Wed, 16 Aug 2017 19:44:31 +0000 (19:44 +0000)]

Disabling the activate button when paused am: de5df8b090 am: 779237e37f am: 24547155ea -s ours am: 889036189b -s ours
am: 9acf640efd -s ours

Change-Id: I3ad55685aaddb775a1991d5251fc01aa69c3a7f0

commit | commitdiff | tree

Suprabh Shukla [Wed, 16 Aug 2017 19:43:31 +0000 (19:43 +0000)]

Disabling the activate button when paused am: 9ffee0d534 am: d27e28eab7 am: 93a9e9f7f2 -s ours
am: 78a9d598f1 -s ours

Change-Id: Id94c32bb309dfe9808b30a19fbd42334f3f9f19b

commit | commitdiff | tree

Suprabh Shukla [Wed, 16 Aug 2017 19:40:32 +0000 (19:40 +0000)]

Disabling the activate button when paused am: de5df8b090 am: 779237e37f am: 24547155ea -s ours
am: 889036189b -s ours

Change-Id: I594f94b86435f6e5f1d4f487b276ac42fef4f994

commit | commitdiff | tree

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

commit | commitdiff | tree

Suprabh Shukla [Wed, 16 Aug 2017 19:39:49 +0000 (19:39 +0000)]

Disabling the activate button when paused am: af5d8b9b03 am: 26f4aceece
am: ccad4a3621

Change-Id: I3cfe350f7c6f3ded761681b8f4062e32e833d94f

commit | commitdiff | tree

Suprabh Shukla [Wed, 16 Aug 2017 19:38:35 +0000 (19:38 +0000)]

Disabling the activate button when paused am: 9ffee0d534 am: d27e28eab7
am: 93a9e9f7f2 -s ours

Change-Id: If5bfd68d2a899813edb2ab550d8a2c0ed2db8d63

commit | commitdiff | tree

Suprabh Shukla [Wed, 16 Aug 2017 19:37:01 +0000 (19:37 +0000)]

Disabling the activate button when paused am: de5df8b090 am: 779237e37f
am: 24547155ea -s ours

Change-Id: Ic61623b7affc9599126b915d5a0e2a1471a58ea2

commit | commitdiff | tree

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

commit | commitdiff | tree

Suprabh Shukla [Wed, 16 Aug 2017 19:33:34 +0000 (19:33 +0000)]

Disabling the activate button when paused am: af5d8b9b03
am: 26f4aceece

Change-Id: If2a4dfdbe01e5bf1f2cfc6b2a61afc95f6f2addd

commit | commitdiff | tree

Suprabh Shukla [Wed, 16 Aug 2017 19:33:30 +0000 (19:33 +0000)]

Disabling the activate button when paused am: 9ffee0d534
am: d27e28eab7

Change-Id: I975f6132333510ac6b40bf9683296885bdc54f05

commit | commitdiff | tree

Suprabh Shukla [Wed, 16 Aug 2017 19:32:31 +0000 (19:32 +0000)]

Disabling the activate button when paused am: de5df8b090
am: 779237e37f

Change-Id: I43d2f39fc179380a169fb1d04be8e473eedcadfb

commit | commitdiff | tree

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

commit | commitdiff | tree

Suprabh Shukla [Wed, 16 Aug 2017 19:27:40 +0000 (19:27 +0000)]

Disabling the activate button when paused
am: 9ffee0d534

Change-Id: I76f0f749ad159b50520e6f95d9bfaf2d8cca3429

commit | commitdiff | tree

Suprabh Shukla [Wed, 16 Aug 2017 19:26:00 +0000 (19:26 +0000)]

Disabling the activate button when paused
am: af5d8b9b03

Change-Id: Icf4cd1c4ff5a520a72f9deedf85c486e892da250

commit | commitdiff | tree

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

commit | commitdiff | tree

Suprabh Shukla [Wed, 16 Aug 2017 19:25:59 +0000 (19:25 +0000)]

Disabling the activate button when paused
am: de5df8b090

Change-Id: I7878f3f3addbb0f47f3c145a34977a9ebb62a055

commit | commitdiff | tree

Suprabh Shukla [Wed, 16 Aug 2017 19:22:01 +0000 (19:22 +0000)]

Disabling the activate button when paused
am: 8e08a9bb71

Change-Id: I9b9ccd0bd849d34343ff0a6d6b579274d02264c6

commit | commitdiff | tree

Nick Desaulniers [Wed, 16 Aug 2017 18:51:56 +0000 (18:51 +0000)]

Merge "DeviceInfoSettingsTest: test parsing llvm kernel" am: 33046b4ec2 -s ours am: f25a418e24 am: e625c2f64e
am: 4cdaebd0c4

Change-Id: Id52b16b39b337b52065c5a3828286170ee4f1c66

commit | commitdiff | tree

Nick Desaulniers [Wed, 16 Aug 2017 18:44:56 +0000 (18:44 +0000)]

Merge "DeviceInfoSettingsTest: test parsing llvm kernel" am: 33046b4ec2 -s ours am: f25a418e24
am: e625c2f64e

Change-Id: If659955e693b8bae1aae5118fa7122fa2d287b3b

commit | commitdiff | tree

Nick Desaulniers [Wed, 16 Aug 2017 18:37:21 +0000 (18:37 +0000)]

Merge "DeviceInfoSettingsTest: test parsing llvm kernel" am: 33046b4ec2 -s ours
am: f25a418e24

Change-Id: I3e1b36b906f137b9960b25c8c6de61e31f751804

commit | commitdiff | tree

Nick Desaulniers [Wed, 16 Aug 2017 18:34:27 +0000 (18:34 +0000)]

Merge "DeviceInfoSettingsTest: test parsing llvm kernel"
am: 33046b4ec2 -s ours

Change-Id: I1f83d7375246e2b84bb3a0f911dfdc5980da76f9

commit | commitdiff | tree

Maurice Lam [Wed, 16 Aug 2017 18:30:22 +0000 (18:30 +0000)]

Merge "Use default primary color for choose lock screens" into oc-mr1-dev
am: 595627c630

Change-Id: I09fc05b21e993352b4e6402032ca636ae18535e4

commit | commitdiff | tree

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

commit | commitdiff | tree

Treehugger Robot [Wed, 16 Aug 2017 18:00:44 +0000 (18:00 +0000)]

Merge "DeviceInfoSettingsTest: test parsing llvm kernel"

commit | commitdiff | tree

Nick Desaulniers [Sun, 30 Oct 2016 21:48:08 +0000 (14:48 -0700)]

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

commit | commitdiff | tree

Maurice Lam [Wed, 16 Aug 2017 08:04:41 +0000 (08:04 +0000)]

Merge "Don't launch Choose Lock again if recreating" into oc-mr1-dev
am: 0ece5f2a06

Change-Id: Ib00277edf9edc35fbb0c279f1e103c02c0e508fc

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Suprabh Shukla [Tue, 15 Aug 2017 02:22:17 +0000 (02:22 +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.

Bug: 35056974
Change-Id: I292a44e713ea4a4b0305ca3b3b21f1c82fd73c2b
Merged-In: I292a44e713ea4a4b0305ca3b3b21f1c82fd73c2b

commit | commitdiff | tree

Suprabh Shukla [Tue, 15 Aug 2017 02:11:26 +0000 (02:11 +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.

Bug: 35056974
Change-Id: I292a44e713ea4a4b0305ca3b3b21f1c82fd73c2b
Merged-In: I292a44e713ea4a4b0305ca3b3b21f1c82fd73c2b

commit | commitdiff | tree

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

commit | commitdiff | tree

Suprabh Shukla [Tue, 15 Aug 2017 02:34:05 +0000 (02:34 +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

commit | commitdiff | tree

Jesse Evans [Tue, 15 Aug 2017 01:37:07 +0000 (01:37 +0000)]

Merge "Change strings from Instant app account to setting" into oc-mr1-dev
am: 858ea46a3a

Change-Id: I22fb4b6d3ee5456a591f8dfa8f78d9f6d6da82dd

commit | commitdiff | tree

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

commit | commitdiff | tree

Bill Yi [Mon, 14 Aug 2017 13:49:45 +0000 (13:49 +0000)]

Revert "Import translations. DO NOT MERGE" am: d8d29f2964 -s ours
am: fdbe5d9f82 -s ours

Change-Id: I3ba9ad28e11f9ef58d78b255434c3a8173829984

commit | commitdiff | tree

Bill Yi [Mon, 14 Aug 2017 13:39:44 +0000 (13:39 +0000)]

Revert "Import translations. DO NOT MERGE" am: d8d29f2964 -s ours
am: 6ece6e96fb -s ours

Change-Id: I0b39167d3a80e650d55104a6f8b1d19a3c4a52f9

commit | commitdiff | tree

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: I6f29a8cc9f7667aa5209638e3caf1441216ea319

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Bill Yi [Sat, 12 Aug 2017 18:43:37 +0000 (18:43 +0000)]

Import translations. DO NOT MERGE am: a2a4037f59 -s ours
am: 8944eb96c8 -s ours

Change-Id: If0e4af025f0831b132cab08155731d40ac150bdd

commit | commitdiff | tree

Bill Yi [Sat, 12 Aug 2017 18:42:28 +0000 (18:42 +0000)]

Import translations. DO NOT MERGE am: a2a4037f59 -s ours
am: d3f28537a4 -s ours

Change-Id: Ib8f0bd25e6c6a1b803b225da833393507c56003a

commit | commitdiff | tree

Bill Yi [Sat, 12 Aug 2017 18:39:26 +0000 (18:39 +0000)]

Import translations. DO NOT MERGE
am: a2a4037f59 -s ours

Change-Id: I5702da8e0a51efa1ab4ad1e262e53f720a36b96a

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Maurice Lam [Sat, 12 Aug 2017 00:22:14 +0000 (00:22 +0000)]

Update strings for screen lock setup
am: 3eb4c8333e

Change-Id: If48e98edbdc3eb7266ca951e23994942f31c2ef4

packages/apps/Settings

About OSDN

Find Software

Develop Software

Help

Copyright ©OSDN Corporation All rights reserved.