OSDN Git Service

android-x86/packages-apps-Settings.git
6 years agoImport translations. DO NOT MERGE
Bill Yi [Thu, 24 Aug 2017 07:37:10 +0000 (07:37 +0000)]
Import translations. DO NOT MERGE
am: 683fdb8177  -s ours

Change-Id: I5b3d3ae77cbda9a3badd40e678034f4ee157b7be

6 years agoImport translations. DO NOT MERGE
Bill Yi [Thu, 24 Aug 2017 05:15:37 +0000 (22:15 -0700)]
Import translations. DO NOT MERGE

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

Bug: 64712476
Change-Id: I452434cbf7282ba20233b9345b75ebdf9251ef98

6 years agoMerge "Change to not cache user entered apn type as user may change it." am: 54eeafa0...
Amit Mahajan [Tue, 22 Aug 2017 23:47:07 +0000 (23:47 +0000)]
Merge "Change to not cache user entered apn type as user may change it." am: 54eeafa052 am: b2498bc422
am: f70f53473a

Change-Id: Id3fd20f5156e233b4e0fe41c6a30f89f08b038db

6 years agoMerge changes from topic "Read dun APNs from apn db" am: f9390ce1fb am: b87acf6837
TreeHugger Robot [Tue, 22 Aug 2017 23:31:10 +0000 (23:31 +0000)]
Merge changes from topic "Read dun APNs from apn db" am: f9390ce1fb am: b87acf6837
am: a81a339c1d  -s ours

Change-Id: Ic593111485af94e822cf2644d7e5bf5348287f1a

6 years agoMerge "Change to not cache user entered apn type as user may change it." am: 54eeafa052
Amit Mahajan [Tue, 22 Aug 2017 21:19:52 +0000 (21:19 +0000)]
Merge "Change to not cache user entered apn type as user may change it." am: 54eeafa052
am: b2498bc422

Change-Id: I78ab5bbe68ada65f8691cda55fc6b1db0f708aac

6 years agoMerge "Change to not cache user entered apn type as user may change it."
Amit Mahajan [Tue, 22 Aug 2017 21:09:12 +0000 (21:09 +0000)]
Merge "Change to not cache user entered apn type as user may change it."
am: 54eeafa052

Change-Id: I33e32ee2d4a9e09f1fb6c383eb7e1d7e8a081c2c

6 years agoMerge "Change to not cache user entered apn type as user may change it."
Treehugger Robot [Tue, 22 Aug 2017 21:02:03 +0000 (21:02 +0000)]
Merge "Change to not cache user entered apn type as user may change it."

6 years agoMerge changes from topic "Read dun APNs from apn db" am: f9390ce1fb
TreeHugger Robot [Tue, 22 Aug 2017 20:20:19 +0000 (20:20 +0000)]
Merge changes from topic "Read dun APNs from apn db" am: f9390ce1fb
am: b87acf6837

Change-Id: I477a4d7bc1002f01c610f232778067e3beb9c9cf

6 years agoMerge changes from topic "Read dun APNs from apn db"
TreeHugger Robot [Tue, 22 Aug 2017 20:03:24 +0000 (20:03 +0000)]
Merge changes from topic "Read dun APNs from apn db"
am: f9390ce1fb

Change-Id: I1dd0a753bb08f7db6f36a7162b9f7f81a1c0406c

6 years agoMerge changes from topic "Read dun APNs from apn db"
Treehugger Robot [Tue, 22 Aug 2017 19:52:21 +0000 (19:52 +0000)]
Merge changes from topic "Read dun APNs from apn db"

* changes:
  Change empty apn type in user entered APN to non-read-only types.
  Check for null mReadOnlyApnTypes.
  Disallow adding/editing dun APNs unless allowed by carrier.

6 years agoChange to not cache user entered apn type as user may change it.
Amit Mahajan [Wed, 2 Aug 2017 16:59:03 +0000 (09:59 -0700)]
Change to not cache user entered apn type as user may change it.

Test: manual
Bug: 64263412
Change-Id: Idc49109926e123eddec7f6553f3c493b1ed22212

6 years agoChange empty apn type in user entered APN to non-read-only types.
TreeHugger Robot [Mon, 19 Jun 2017 23:21:12 +0000 (23:21 +0000)]
Change empty apn type in user entered APN to non-read-only types.

Test: Manually added APN and verified read-only and non-wildcardable
types are not included
Bug: 38186417

Change-Id: I07bcf1c2a950a1257446f0a7beb602fed79423b3

6 years agoCheck for null mReadOnlyApnTypes.
Amit Mahajan [Thu, 1 Jun 2017 23:39:40 +0000 (16:39 -0700)]
Check for null mReadOnlyApnTypes.

Test: none
Bug: 62247121
Change-Id: I6866bf2df8d4cb46dd75b94ab88c1e62e65ddda7

6 years agoDisallow adding/editing dun APNs unless allowed by carrier.
Amit Mahajan [Wed, 10 May 2017 05:31:13 +0000 (22:31 -0700)]
Disallow adding/editing dun APNs unless allowed by carrier.

Test: WIP
Bug: 38186417
Change-Id: If1cc34ad979659a56a3886da2a02fdbf642739ac

6 years agoImport translations. DO NOT MERGE am: 4ced4787ce -s ours
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

6 years agoImport translations. DO NOT MERGE
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

6 years agoImport translations. DO NOT MERGE
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

6 years agoDisabling the activate button when paused am: de5df8b090 am: 779237e37f am: 24547155e...
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

6 years agoDisabling the activate button when paused am: 9ffee0d534 am: d27e28eab7 am: 93a9e9f7f...
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

6 years agoDisabling the activate button when paused am: af5d8b9b03 am: 26f4aceece am: ccad4a362...
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

6 years agoDisabling the activate button when paused am: de5df8b090 am: 779237e37f am: 24547155e...
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

6 years agoDisabling the activate button when paused am: 9ffee0d534 am: d27e28eab7 am: 93a9e9f7f...
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

6 years agoDisabling the activate button when paused am: af5d8b9b03 am: 26f4aceece am: ccad4a362...
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

6 years agoDisabling the activate button when paused am: de5df8b090 am: 779237e37f am: 24547155e...
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

6 years agoDisabling the activate button when paused am: 9ffee0d534 am: d27e28eab7 am: 93a9e9f7f...
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

6 years agoDisabling the activate button when paused am: af5d8b9b03 am: 26f4aceece am: ccad4a362...
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

6 years agoDisabling the activate button when paused am: de5df8b090 am: 779237e37f am: 24547155e...
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

6 years agoDisabling the activate button when paused am: 9ffee0d534 am: d27e28eab7 am: 93a9e9f7f...
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

6 years agoDisabling the activate button when paused am: af5d8b9b03 am: 26f4aceece am: ccad4a362...
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

6 years agoDisabling the activate button when paused am: de5df8b090 am: 779237e37f am: 24547155e...
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

6 years agoDisabling the activate button when paused am: 9ffee0d534 am: d27e28eab7 am: 93a9e9f7f...
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

6 years agoDisabling the activate button when paused am: af5d8b9b03 am: 26f4aceece am: ccad4a362...
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

6 years agoDisabling the activate button when paused am: de5df8b090 am: 779237e37f am: 24547155e...
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

6 years agoDisabling the activate button when paused am: 9ffee0d534 am: d27e28eab7 am: 93a9e9f7f...
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

6 years agoDisabling the activate button when paused am: de5df8b090 am: 779237e37f am: 24547155e...
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

6 years agoDisabling the activate button when paused am: af5d8b9b03 am: 26f4aceece am: ccad4a362...
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

6 years agoDisabling the activate button when paused am: de5df8b090 am: 779237e37f am: 24547155e...
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

6 years agoDisabling the activate button when paused am: de5df8b090 am: 779237e37f am: 24547155e...
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

6 years agoDisabling the activate button when paused am: 9ffee0d534 am: d27e28eab7 am: 93a9e9f7f...
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

6 years agoDisabling the activate button when paused am: af5d8b9b03 am: 26f4aceece am: ccad4a362...
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

6 years agoDisabling the activate button when paused am: de5df8b090 am: 779237e37f am: 24547155e...
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

6 years agoDisabling the activate button when paused am: 9ffee0d534 am: d27e28eab7 am: 93a9e9f7f...
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

6 years agoDisabling the activate button when paused am: af5d8b9b03 am: 26f4aceece am: ccad4a362...
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

6 years agoDisabling the activate button when paused am: de5df8b090 am: 779237e37f am: 24547155e...
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

6 years agoDisabling the activate button when paused am: 9ffee0d534 am: d27e28eab7 am: 93a9e9f7f...
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

6 years agoDisabling the activate button when paused am: de5df8b090 am: 779237e37f am: 24547155e...
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

6 years agoDisabling the activate button when paused am: af5d8b9b03 am: 26f4aceece am: ccad4a362...
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

6 years agoDisabling the activate button when paused am: de5df8b090 am: 779237e37f am: 24547155e...
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

6 years agoDisabling the activate button when paused am: 9ffee0d534 am: d27e28eab7 am: 93a9e9f7f...
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

6 years agoMerge "Disabling the activate button when paused am: 8e08a9bb71 am: 08207f457d am...
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

6 years agoDisabling the activate button when paused am: 8e08a9bb71 am: 08207f457d am: 1e9af33c4...
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

6 years agoDisabling the activate button when paused am: 8e08a9bb71 am: 08207f457d am: 1e9af33c4...
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

6 years agoDisabling the activate button when paused am: 9ffee0d534 am: d27e28eab7 am: 93a9e9f7f...
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

6 years agoDisabling the activate button when paused am: 8e08a9bb71 am: 08207f457d am: 1e9af33c4...
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

6 years agoDisabling the activate button when paused am: 8e08a9bb71 am: 08207f457d am: 1e9af33c4...
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

6 years agoDisabling the activate button when paused am: de5df8b090 am: 779237e37f am: 24547155e...
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

6 years agoDisabling the activate button when paused am: 9ffee0d534 am: d27e28eab7 am: 93a9e9f7f...
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

6 years agoDisabling the activate button when paused am: af5d8b9b03 am: 26f4aceece am: ccad4a3621
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

6 years agoDisabling the activate button when paused am: de5df8b090 am: 779237e37f am: 24547155e...
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

6 years agoDisabling the activate button when paused am: 9ffee0d534 am: d27e28eab7 am: 93a9e9f7f...
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

6 years agoDisabling the activate button when paused am: de5df8b090 am: 779237e37f am: 24547155e...
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

6 years agoDisabling the activate button when paused am: 8e08a9bb71 am: 08207f457d am: 1e9af33c4...
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

6 years agoDisabling the activate button when paused am: af5d8b9b03 am: 26f4aceece
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

6 years agoDisabling the activate button when paused am: 9ffee0d534 am: d27e28eab7
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

6 years agoDisabling the activate button when paused am: de5df8b090 am: 779237e37f
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

6 years agoDisabling the activate button when paused am: 8e08a9bb71 am: 08207f457d am: 1e9af33c41
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

6 years agoDisabling the activate button when paused am: af5d8b9b03
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

6 years agoDisabling the activate button when paused am: 9ffee0d534
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

6 years agoDisabling the activate button when paused am: de5df8b090
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

6 years agoDisabling the activate button when paused am: 8e08a9bb71 am: 08207f457d
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

6 years agoDisabling the activate button when paused
Suprabh Shukla [Wed, 16 Aug 2017 19:27:40 +0000 (19:27 +0000)]
Disabling the activate button when paused
am: 9ffee0d534

Change-Id: I76f0f749ad159b50520e6f95d9bfaf2d8cca3429

6 years agoDisabling the activate button when paused
Suprabh Shukla [Wed, 16 Aug 2017 19:26:00 +0000 (19:26 +0000)]
Disabling the activate button when paused
am: af5d8b9b03

Change-Id: Icf4cd1c4ff5a520a72f9deedf85c486e892da250

6 years agoDisabling the activate button when paused am: 8e08a9bb71
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

6 years agoDisabling the activate button when paused
Suprabh Shukla [Wed, 16 Aug 2017 19:25:59 +0000 (19:25 +0000)]
Disabling the activate button when paused
am: de5df8b090

Change-Id: I7878f3f3addbb0f47f3c145a34977a9ebb62a055

6 years agoDisabling the activate button when paused
Suprabh Shukla [Wed, 16 Aug 2017 19:22:01 +0000 (19:22 +0000)]
Disabling the activate button when paused
am: 8e08a9bb71

Change-Id: I9b9ccd0bd849d34343ff0a6d6b579274d02264c6

6 years agoMerge "DeviceInfoSettingsTest: test parsing llvm kernel" am: 33046b4ec2 -s ours...
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

6 years agoMerge "DeviceInfoSettingsTest: test parsing llvm kernel" am: 33046b4ec2 -s ours
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

6 years agoMerge "DeviceInfoSettingsTest: test parsing llvm kernel"
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

6 years agoMerge "DeviceInfoSettingsTest: test parsing llvm kernel"
Treehugger Robot [Wed, 16 Aug 2017 18:00:44 +0000 (18:00 +0000)]
Merge "DeviceInfoSettingsTest: test parsing llvm kernel"

6 years agoDeviceInfoSettingsTest: test parsing llvm kernel
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

6 years agoDisabling the activate button when paused
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

6 years agoDisabling the activate button when paused
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

6 years agoDisabling the activate button when paused
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

6 years agoDisabling the activate button when paused
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

6 years agoRevert "Import translations. DO NOT MERGE"
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

6 years agoRevert "Import translations. DO NOT MERGE"
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

6 years agoImport translations. DO NOT MERGE
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

6 years agoImport translations. DO NOT MERGE
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

7 years agoInitialize the volume seekbar preference max and progress.
Doris Ling [Thu, 10 Aug 2017 22:29:23 +0000 (22:29 +0000)]
Initialize the volume seekbar preference max and progress.
am: cbc231c545

Change-Id: Ifd70d6362064f640dfd899d4437d582d853ed7a7

7 years agoInitialize the volume seekbar preference max and progress.
Doris Ling [Tue, 8 Aug 2017 23:52:42 +0000 (16:52 -0700)]
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 b7490bea28cb28d301fe4ec0275cef7129621206)

7 years agoMerge "Stay discoverable in Bluetooth settings and pairing pages" into oc-dr1-dev
Antony Sargent [Thu, 10 Aug 2017 07:25:52 +0000 (07:25 +0000)]
Merge "Stay discoverable in Bluetooth settings and pairing pages" into oc-dr1-dev
am: 49cd8f2327

Change-Id: I02c6056ab8efb238cb8ba97ea4d4ea6de247c13d

7 years agoMerge "Stay discoverable in Bluetooth settings and pairing pages" into oc-dr1-dev
TreeHugger Robot [Thu, 10 Aug 2017 07:23:29 +0000 (07:23 +0000)]
Merge "Stay discoverable in Bluetooth settings and pairing pages" into oc-dr1-dev

7 years agoMerge "Do not translate "Wi-Fi calling" for VF DE" into oc-dr1-dev
Jayachandran Chinnakkannu [Thu, 10 Aug 2017 06:04:30 +0000 (06:04 +0000)]
Merge "Do not translate "Wi-Fi calling" for VF DE" into oc-dr1-dev
am: 9476e824be

Change-Id: I7aa611840a3e14476f7f637be866920b5723d39c

7 years agoMerge "Do not translate "Wi-Fi calling" for VF DE" into oc-dr1-dev
Jayachandran Chinnakkannu [Thu, 10 Aug 2017 06:00:29 +0000 (06:00 +0000)]
Merge "Do not translate "Wi-Fi calling" for VF DE" into oc-dr1-dev

7 years agoStay discoverable in Bluetooth settings and pairing pages
Antony Sargent [Wed, 9 Aug 2017 22:57:17 +0000 (15:57 -0700)]
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

7 years agoDO NOT MERGE - Ask device owner for master clear in demo mode
Justin Klaassen [Thu, 10 Aug 2017 00:23:52 +0000 (00:23 +0000)]
DO NOT MERGE - Ask device owner for master clear in demo mode
am: a22c8345fa

Change-Id: Idf0f52476201a55c6d3a8051158e0ea3a7f555b0

7 years agoDo not translate "Wi-Fi calling" for VF DE
Jayachandran C [Tue, 8 Aug 2017 20:06:51 +0000 (13:06 -0700)]
Do not translate "Wi-Fi calling" for VF DE

Test: Validated it by mimicking using T-Mobile SIM

Bug: 64139042
Change-Id: Iad3a6b9b7a47af140b14adebae55babfe31a4c26

7 years agoDO NOT MERGE - Ask device owner for master clear in demo mode
Justin Klaassen [Wed, 9 Aug 2017 04:58:05 +0000 (21:58 -0700)]
DO NOT MERGE - Ask device owner for master clear in demo mode

Bug: 62712426
Test: make RunSettingsRoboTests -j19
Change-Id: I29f92ff1062590f2c5eb7713e5969da7870fc582

7 years agoMerge "Settings: Fix NPE in ChannelNotificationSettings" into oc-dr1-dev
qqzhou [Wed, 9 Aug 2017 21:07:36 +0000 (21:07 +0000)]
Merge "Settings: Fix NPE in ChannelNotificationSettings" into oc-dr1-dev
am: 2c2b6b48de

Change-Id: I4255d1eea7583a448172dbfaba5fdec1eb168c28

7 years agoMerge "Settings: Fix NPE in ChannelNotificationSettings" into oc-dr1-dev
TreeHugger Robot [Wed, 9 Aug 2017 20:57:50 +0000 (20:57 +0000)]
Merge "Settings: Fix NPE in ChannelNotificationSettings" into oc-dr1-dev