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

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

Bill Yi [Fri, 18 Aug 2017 01:55:29 +0000 (01:55 +0000)]

Import translations. DO NOT MERGE am: 4ced4787ce -s ours am: 5b9b88cc5b -s ours
am: 95a797f5fc -s ours

Change-Id: I2c7b0637f98ffaebbd2dd80e582e47078d3c28b4

commit | commitdiff | tree

Bill Yi [Fri, 18 Aug 2017 01:50:29 +0000 (01:50 +0000)]

Import translations. DO NOT MERGE am: 4ced4787ce -s ours
am: 5b9b88cc5b -s ours

Change-Id: I40b762159141b73056cc04ceb18e084d49e53723

commit | commitdiff | tree

Bill Yi [Fri, 18 Aug 2017 01:45:26 +0000 (01:45 +0000)]

Import translations. DO NOT MERGE
am: 4ced4787ce -s ours

Change-Id: Ie0c11be879fc1d31d8053de2b73f578143df7d7f

commit | commitdiff | tree

Bill Yi [Thu, 17 Aug 2017 23:57:35 +0000 (16:57 -0700)]

Import translations. DO NOT MERGE

Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import

Bug: 64086495
Change-Id: I4e5c4860eae1b41fea7a34a88b53630d86745e8e

commit | commitdiff | tree

Bill Yi [Thu, 17 Aug 2017 15:40:43 +0000 (15:40 +0000)]

Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
am: 682ff5562c -s ours

Change-Id: I862ac0ee9e44ab52838a797892d5cfe28a576a15

commit | commitdiff | tree

TreeHugger Robot [Thu, 17 Aug 2017 15:33:39 +0000 (15:33 +0000)]

Merge "Import translations. DO NOT MERGE" into oc-mr1-dev

commit | commitdiff | tree

Fan Zhang [Thu, 17 Aug 2017 01:29:44 +0000 (01:29 +0000)]

Merge "Suppress some search results" into oc-mr1-dev
am: f51b4a580f

Change-Id: Id8f2ae517afbfef10bce9e6811178b2772a56f07

commit | commitdiff | tree

Maurice Lam [Thu, 17 Aug 2017 01:23:19 +0000 (01:23 +0000)]

Merge "Add fingerprint illustration image" into oc-mr1-dev
am: 89c2adf420

Change-Id: I44edca5a3310e476dd68e25e0e16560bb5a31b5f

commit | commitdiff | tree

Antony Sargent [Thu, 17 Aug 2017 01:22:27 +0000 (01:22 +0000)]

Merge "Fix rotation bug in Bluetooth pairing PIN dialog" into oc-mr1-dev
am: 53a77a2452

Change-Id: I5d750adc4623eacf704a12577b34f3434108b28f

commit | commitdiff | tree

Ruchi Kandoi [Thu, 17 Aug 2017 01:21:51 +0000 (01:21 +0000)]

Merge "Nfc Payment Preference check if the dialog is non-null before dismissing" into oc-mr1-dev
am: 7a5e42f3db

Change-Id: Ib4477e392d4f7fd2d647ddaef3088be934d31210

commit | commitdiff | tree

Maurice Lam [Thu, 17 Aug 2017 01:21:10 +0000 (01:21 +0000)]

Merge "Fix bad string reference" into oc-mr1-dev
am: f4716e89c0

Change-Id: I8f0a632761f30aff990dad51cff99f0a7907b94c

commit | commitdiff | tree

TreeHugger Robot [Thu, 17 Aug 2017 01:20:42 +0000 (01:20 +0000)]

Merge "Suppress some search results" into oc-mr1-dev

commit | commitdiff | tree

Fan Zhang [Thu, 17 Aug 2017 01:20:19 +0000 (01:20 +0000)]

Merge "Remove gibberish summary in search when query is "lock"" into oc-mr1-dev
am: 9a03b951d2

Change-Id: If754d6e11ef3d39d716b41a3219a5d30c48fc218

commit | commitdiff | tree

TreeHugger Robot [Thu, 17 Aug 2017 00:49:00 +0000 (00:49 +0000)]

Merge "Add fingerprint illustration image" into oc-mr1-dev

commit | commitdiff | tree

TreeHugger Robot [Thu, 17 Aug 2017 00:38:40 +0000 (00:38 +0000)]

Merge "Fix rotation bug in Bluetooth pairing PIN dialog" into oc-mr1-dev

commit | commitdiff | tree

TreeHugger Robot [Thu, 17 Aug 2017 00:32:40 +0000 (00:32 +0000)]

Merge "Nfc Payment Preference check if the dialog is non-null before dismissing" into oc-mr1-dev

commit | commitdiff | tree

Maurice Lam [Wed, 16 Aug 2017 23:33:43 +0000 (23:33 +0000)]

Merge "Fix bad string reference" into oc-mr1-dev

commit | commitdiff | tree

TreeHugger Robot [Wed, 16 Aug 2017 22:57:24 +0000 (22:57 +0000)]

Merge "Remove gibberish summary in search when query is "lock"" into oc-mr1-dev

commit | commitdiff | tree

Fan Zhang [Fri, 11 Aug 2017 01:15:37 +0000 (18:15 -0700)]

Suppress some search results

Fixes: 62137086
Test: reindex search
Test: robotests
Change-Id: I12e873edade80e4c0007d10352fb037b3230c643

commit | commitdiff | tree

Antony Sargent [Tue, 15 Aug 2017 16:31:31 +0000 (09:31 -0700)]

Fix rotation bug in Bluetooth pairing PIN dialog

BluetoothPairingDialogFragment has code that makes the OK button on the
dialog disabled until the user has entered at least one character into
the PIN field. However it didn't properly handle the case where the user
had entered some text and then rotated the screen - because it always
marked the OK button as disabled during onShow even if it already had
some content. This CL fixes that by looking at the text content and only
disabling the OK button if the content is empty.

Bug: 36514895
Test: make RunSettingsRoboTests
Change-Id: I4e8e70089a862e67b20ff614bbaa64fc2b641fd4

commit | commitdiff | tree

Fan Zhang [Wed, 16 Aug 2017 19:45:22 +0000 (12:45 -0700)]

Remove gibberish summary in search when query is "lock"

Fixes: 64165687
Test: visual for search
Test: rerun robotest for securitysettings
Change-Id: I5c44e351a767c7ce3037a81d0932d9bd6b59635e

commit | commitdiff | tree

Suprabh Shukla [Wed, 16 Aug 2017 21:44:04 +0000 (21:44 +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: a5e4dd2b5e -s ours

Change-Id: Ib3e70037756d54388ea19efa6ed7f17b04156cbd

commit | commitdiff | tree

Suprabh Shukla [Wed, 16 Aug 2017 21:43:05 +0000 (21:43 +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: 7b59fe50a7 -s ours

Change-Id: I977732759c2e6935e71c2dba247b2a2393352c15

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:20:30 +0000 (21:20 +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: I5bad4c775a8bd9cb30c428006369335f9da8dd9f

commit | commitdiff | tree

Suprabh Shukla [Wed, 16 Aug 2017 21:19:30 +0000 (21:19 +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: I87f9269d525a63210c55b70e347a693fa8c65ed2

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

Ruchi Kandoi [Wed, 16 Aug 2017 20:24:14 +0000 (13:24 -0700)]

Nfc Payment Preference check if the dialog is non-null before dismissing

Test: monkey test
Bug: 64758793
Change-Id: I3905096889b2dc6ef468afc76e9767f63b4163ad

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

Maurice Lam [Wed, 16 Aug 2017 20:39:12 +0000 (13:39 -0700)]

Fix bad string reference

The source string was removed but there are still references to it.
Updating the references as well in this CL.

Test: mma with ANDROID_AAPT_IGNORE on locale files
Bug: 64763091
Change-Id: I43ef63207e884cbaa92ff3853b0f1fd690cf05f8

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)]

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)]

commit | commitdiff | tree

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

commit | commitdiff | tree

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

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)]

commit | commitdiff | tree

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

commit | commitdiff | tree

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

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)]

commit | commitdiff | tree

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

commit | commitdiff | tree

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

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)]

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

Maurice Lam [Wed, 16 Aug 2017 18:44:19 +0000 (11:44 -0700)]

Add fingerprint illustration image

Test: Manual
Bug: 38210310
Change-Id: I95b4940792c172cf866f71c0fef9859e69d60074

packages/apps/Settings

RSS Atom

About OSDN

Find Software

Develop Software

Help