Fan Zhang
179fd476ed
Merge "Set device credential's Window flag to be SECURE." into mnc-dev am: 8bffdc2613
am: cd66862b08
am: 769e1e31f5
am: b4db530aa5
-s ours am: 0c0728a947
-s ours am: 4d9e11990d
-s ours am: 3d94477fb8
-s ours am: 9d865d0c3e
-s ours am: 7da421a293
-s ours am: 76f30a360c
-s ours am: 1b1204be64
-s ours am: ceeb88e6a4
-s ours
...
am: 97a271f6fb
-s ours
Change-Id: If3ae7993ac38d465c58d5f51072499d729a02620
2017-11-01 01:28:30 +00:00
TreeHugger Robot
baaea544a5
Merge "Convert EncryptionAndCredential into DashboardFragment"
2017-11-01 00:32:31 +00:00
Fan Zhang
97a271f6fb
Merge "Set device credential's Window flag to be SECURE." into mnc-dev am: 8bffdc2613
am: cd66862b08
am: 769e1e31f5
am: b4db530aa5
-s ours am: 0c0728a947
-s ours am: 4d9e11990d
-s ours am: 3d94477fb8
-s ours am: 9d865d0c3e
-s ours am: 7da421a293
-s ours am: 76f30a360c
-s ours am: 1b1204be64
-s ours
...
am: ceeb88e6a4
-s ours
Change-Id: I124dc166f29f4016c958720c627ee9c1afc21328
2017-10-31 23:22:50 +00:00
Fan Zhang
ceeb88e6a4
Merge "Set device credential's Window flag to be SECURE." into mnc-dev am: 8bffdc2613
am: cd66862b08
am: 769e1e31f5
am: b4db530aa5
-s ours am: 0c0728a947
-s ours am: 4d9e11990d
-s ours am: 3d94477fb8
-s ours am: 9d865d0c3e
-s ours am: 7da421a293
-s ours am: 76f30a360c
-s ours
...
am: 1b1204be64
-s ours
Change-Id: Ia7f4a3d972633cb1cb976550f8cbbd819a8aab3c
2017-10-31 23:18:42 +00:00
Fan Zhang
1b1204be64
Merge "Set device credential's Window flag to be SECURE." into mnc-dev am: 8bffdc2613
am: cd66862b08
am: 769e1e31f5
am: b4db530aa5
-s ours am: 0c0728a947
-s ours am: 4d9e11990d
-s ours am: 3d94477fb8
-s ours am: 9d865d0c3e
-s ours am: 7da421a293
-s ours
...
am: 76f30a360c
-s ours
Change-Id: Ib2f57e3bd9adc14be453af9fc510613d210ffe23
2017-10-31 23:15:37 +00:00
Fan Zhang
76f30a360c
Merge "Set device credential's Window flag to be SECURE." into mnc-dev am: 8bffdc2613
am: cd66862b08
am: 769e1e31f5
am: b4db530aa5
-s ours am: 0c0728a947
-s ours am: 4d9e11990d
-s ours am: 3d94477fb8
-s ours am: 9d865d0c3e
-s ours
...
am: 7da421a293
-s ours
Change-Id: Ia717917794165cb2846f0836c9e42350028a3095
2017-10-31 23:11:55 +00:00
Fan Zhang
7da421a293
Merge "Set device credential's Window flag to be SECURE." into mnc-dev am: 8bffdc2613
am: cd66862b08
am: 769e1e31f5
am: b4db530aa5
-s ours am: 0c0728a947
-s ours am: 4d9e11990d
-s ours am: 3d94477fb8
-s ours
...
am: 9d865d0c3e
-s ours
Change-Id: Ic2de72b09edc9f4a1a2c5be6ae9b12099eb9ae62
2017-10-31 23:08:25 +00:00
Fan Zhang
9d865d0c3e
Merge "Set device credential's Window flag to be SECURE." into mnc-dev am: 8bffdc2613
am: cd66862b08
am: 769e1e31f5
am: b4db530aa5
-s ours am: 0c0728a947
-s ours am: 4d9e11990d
-s ours
...
am: 3d94477fb8
-s ours
Change-Id: If5fd35415471ddb7a07899d7fff170fe63dd7dca
2017-10-31 23:04:53 +00:00
Fan Zhang
3d94477fb8
Merge "Set device credential's Window flag to be SECURE." into mnc-dev am: 8bffdc2613
am: cd66862b08
am: 769e1e31f5
am: b4db530aa5
-s ours am: 0c0728a947
-s ours
...
am: 4d9e11990d
-s ours
Change-Id: Ic7eec070d6a3f352b15b6a6e9b82af93fcbf4403
2017-10-31 23:02:45 +00:00
Fan Zhang
4d9e11990d
Merge "Set device credential's Window flag to be SECURE." into mnc-dev am: 8bffdc2613
am: cd66862b08
am: 769e1e31f5
am: b4db530aa5
-s ours
...
am: 0c0728a947
-s ours
Change-Id: Ia44221b7d0e556ce26b3e50a91d68b90b6453228
2017-10-31 23:00:42 +00:00
TreeHugger Robot
ef7eb162cf
Merge "Mark core unit tests for Presubmit"
2017-10-31 22:59:59 +00:00
Fan Zhang
0c0728a947
Merge "Set device credential's Window flag to be SECURE." into mnc-dev am: 8bffdc2613
am: cd66862b08
am: 769e1e31f5
...
am: b4db530aa5
-s ours
Change-Id: Ia9e4b612cfe9efffbad24a8a123b48dbcb6bb13d
2017-10-31 22:59:07 +00:00
Fan Zhang
b4db530aa5
Merge "Set device credential's Window flag to be SECURE." into mnc-dev am: 8bffdc2613
am: cd66862b08
...
am: 769e1e31f5
Change-Id: Ie3cf781e84803ef5e602e8885fe018a2bba993e4
2017-10-31 22:57:12 +00:00
Fan Zhang
769e1e31f5
Merge "Set device credential's Window flag to be SECURE." into mnc-dev am: 8bffdc2613
...
am: cd66862b08
Change-Id: I46830f9d58174aafa138bee67b60e52d0578594b
2017-10-31 22:54:07 +00:00
Fan Zhang
cd66862b08
Merge "Set device credential's Window flag to be SECURE." into mnc-dev
...
am: 8bffdc2613
Change-Id: Ie06476c8e34cbf17f4538a477894b7bca1bdfcbd
2017-10-31 22:50:43 +00:00
Fan Zhang
8bffdc2613
Merge "Set device credential's Window flag to be SECURE." into mnc-dev
2017-10-31 22:47:13 +00:00
TreeHugger Robot
fa82854344
Merge "Switch to use ThreadUtils.postOnMainThread"
2017-10-31 22:23:02 +00:00
TreeHugger Robot
0955bd7e51
Merge "Vibrate when fingerprint error text is shown"
2017-10-31 21:54:02 +00:00
TreeHugger Robot
134b4237c1
Merge "Implement the missing PreferenceControllerMixin interface"
2017-10-31 21:46:04 +00:00
Fan Zhang
5c424c0805
Merge "Set device credential's Window flag to be SECURE." into nyc-dev am: e69c4dcb8f
am: e79c26a9da
am: 80af194f8b
am: adabc7561b
am: 0c59dca90d
-s ours am: 96cc88e218
-s ours am: 4aec1cee4e
-s ours am: 9c79a61f95
-s ours
...
am: c583d803af
-s ours
Change-Id: I558c2d2d75865c7965d20339d481de6f38a38d16
2017-10-31 21:43:50 +00:00
Fan Zhang
9679dba668
Convert EncryptionAndCredential into DashboardFragment
...
The logic still lives in fragment for now. They will be moved into
PrefControllers in follow-up changes.
Bug: 32953042
Test: RoboTests
Change-Id: I2b03d26b5f4e6bbb37b42f9dc83a9464eb169868
2017-10-31 14:39:52 -07:00
Fan Zhang
c583d803af
Merge "Set device credential's Window flag to be SECURE." into nyc-dev am: e69c4dcb8f
am: e79c26a9da
am: 80af194f8b
am: adabc7561b
am: 0c59dca90d
-s ours am: 96cc88e218
-s ours am: 4aec1cee4e
-s ours
...
am: 9c79a61f95
-s ours
Change-Id: Ibaa13379d6b0ed9bd69d66f80989ae7d534efcbf
2017-10-31 21:38:07 +00:00
Fan Zhang
9c79a61f95
Merge "Set device credential's Window flag to be SECURE." into nyc-dev am: e69c4dcb8f
am: e79c26a9da
am: 80af194f8b
am: adabc7561b
am: 0c59dca90d
-s ours am: 96cc88e218
-s ours
...
am: 4aec1cee4e
-s ours
Change-Id: Id74bf2c46e0454e030e9fc0c4ee231450241aa79
2017-10-31 21:33:53 +00:00
Fan Zhang
4aec1cee4e
Merge "Set device credential's Window flag to be SECURE." into nyc-dev am: e69c4dcb8f
am: e79c26a9da
am: 80af194f8b
am: adabc7561b
am: 0c59dca90d
-s ours
...
am: 96cc88e218
-s ours
Change-Id: Ic182e3df1a283123d0d53c13499af1ed7501767e
2017-10-31 21:29:53 +00:00
Fan Zhang
96cc88e218
Merge "Set device credential's Window flag to be SECURE." into nyc-dev am: e69c4dcb8f
am: e79c26a9da
am: 80af194f8b
am: adabc7561b
...
am: 0c59dca90d
-s ours
Change-Id: I10ea3abe4e4a04fa779cd51cee141cb80cb76acf
2017-10-31 21:25:58 +00:00
Fan Zhang
0c59dca90d
Merge "Set device credential's Window flag to be SECURE." into nyc-dev am: e69c4dcb8f
am: e79c26a9da
am: 80af194f8b
...
am: adabc7561b
Change-Id: I58bf359a98fc0b6ceb06cf4a5e83cedabfa6a0f3
2017-10-31 21:23:57 +00:00
Fan Zhang
adabc7561b
Merge "Set device credential's Window flag to be SECURE." into nyc-dev am: e69c4dcb8f
am: e79c26a9da
...
am: 80af194f8b
Change-Id: Iecfc5f05f9ede225800d12416508d71f7aeb46c0
2017-10-31 21:21:53 +00:00
TreeHugger Robot
f8091755e7
Merge "Switch to use new activity title handling."
2017-10-31 21:16:44 +00:00
Fan Zhang
80af194f8b
Merge "Set device credential's Window flag to be SECURE." into nyc-dev am: e69c4dcb8f
...
am: e79c26a9da
Change-Id: I3652f6f77479a339b9acc387a49ee96fe70921ff
2017-10-31 21:16:32 +00:00
Fan Zhang
e79c26a9da
Merge "Set device credential's Window flag to be SECURE." into nyc-dev
...
am: e69c4dcb8f
Change-Id: I30a0d2578343a7635da63a52cfc81f1427aab23b
2017-10-31 21:11:26 +00:00
Fan Zhang
6438ee5466
Mark core unit tests for Presubmit
...
Bug: 68716631
Bug: 68720368
Test: rerun test
Change-Id: Ia8cca6aede824928fc358b005172bbe2ed670c8f
2017-10-31 14:09:31 -07:00
Fan Zhang
5c1a1363c7
Set device credential's Window flag to be SECURE.
...
This prevents showing any pattern/pin in recent list.
Change-Id: Ie56f725bf245961d61a66eae8a82b728600cb650
Fixes: 64339515
Bug: 38258991
Merged-In: Ife33131004d66092bfa57aa57a9bb856800ce28d
Merged-In: Ia9935ef710cf1795d9ce464e0a9edff75be9c0c3
Merged-In: I99c283dd4a1f2d579f565ccf5839a705e75ed6fc
Merged-In: Ibe781a3a1e1483a8c6fde4c7cc5dffbf54bdba59
Test: manual
2017-10-31 21:03:52 +00:00
Fan Zhang
e69c4dcb8f
Merge "Set device credential's Window flag to be SECURE." into nyc-dev
2017-10-31 21:03:08 +00:00
TreeHugger Robot
e717a5fdd1
Merge "Move search querying into a single API"
2017-10-31 20:42:33 +00:00
Fan Zhang
a7f135596d
Switch to use ThreadUtils.postOnMainThread
...
Change-Id: I344d25a1a667de9c0b23d6d528d905b4da3a4c40
Fixes: 63896139
Test: rerun tests
2017-10-31 13:27:41 -07:00
Maurice Lam
4f41dea738
Vibrate when fingerprint error text is shown
...
Some users block the screen when enrolling the fingerprint. Vibrate
the phone to prompt the user to look at the screen in case they get
stuck.
Test: cd tests/robotests && mma
Bug: 67664182
Change-Id: I70dc5a5a566f2e764f8109fb2be25ec6d7c48da9
2017-10-31 13:19:25 -07:00
Fan Zhang
e261535192
Implement the missing PreferenceControllerMixin interface
...
Change-Id: I0bb28cf9d2ec24629485a754778faddcbc8f9fdb
Fixes: 68716631
Test: atest PreferenceControllerContractTest
2017-10-31 13:17:13 -07:00
Fan Zhang
1cc50ae190
Set device credential's Window flag to be SECURE.
...
This prevents showing any pattern/pin in recent list.
Change-Id: Ife33131004d66092bfa57aa57a9bb856800ce28d
Fixes: 64339515
Bug: 38258991
Merged-In: Ia9935ef710cf1795d9ce464e0a9edff75be9c0c3
Merged-In: I99c283dd4a1f2d579f565ccf5839a705e75ed6fc
Merged-In: Ibe781a3a1e1483a8c6fde4c7cc5dffbf54bdba59
Test: manual
2017-10-31 19:38:07 +00:00
Fan Zhang
374b295da8
Merge "Set device credential's Window flag to be SECURE." into oc-dev am: e3d0bbcc80
-s ours am: 9bb4e0b794
-s ours am: fddccf0838
-s ours
...
am: c519347aee
-s ours
Change-Id: If6fd76c0dfb1980c4f0098c6fa6c6757e4dc84ac
2017-10-31 19:35:39 +00:00
Doris Ling
ac8cb35208
Switch to use new activity title handling.
...
Bug: 64564191
Test: make RunSettingsRoboTests
Change-Id: I66894c1541ea483ab4fe4b1b68ba5f94b9a5e210
2017-10-31 12:27:50 -07:00
Fan Zhang
c519347aee
Merge "Set device credential's Window flag to be SECURE." into oc-dev am: e3d0bbcc80
-s ours am: 9bb4e0b794
-s ours
...
am: fddccf0838
-s ours
Change-Id: I2a7a57a4b63b5ed34e65801f27582f26b3eb1baf
2017-10-31 19:08:16 +00:00
Fan Zhang
fddccf0838
Merge "Set device credential's Window flag to be SECURE." into oc-dev am: e3d0bbcc80
-s ours
...
am: 9bb4e0b794
-s ours
Change-Id: I139f18df764f1d888cc6d7687aba5a23ab30053f
2017-10-31 18:47:59 +00:00
Fan Zhang
9bb4e0b794
Merge "Set device credential's Window flag to be SECURE." into oc-dev
...
am: e3d0bbcc80
-s ours
Change-Id: I8be390dc1e5190029be41a55c014c9e2705c7aef
2017-10-31 18:36:12 +00:00
Fan Zhang
e3d0bbcc80
Merge "Set device credential's Window flag to be SECURE." into oc-dev
2017-10-31 18:25:36 +00:00
TreeHugger Robot
f60c99af53
Merge "Display network name in status bar"
2017-10-31 17:52:47 +00:00
TreeHugger Robot
9138de153c
Merge "Add a dialog when turning off oem unlock dialog."
2017-10-31 17:11:30 +00:00
Yoshinori Hirano
53cfd11793
Display network name in status bar
...
When config_showOperatorNameInStatusBar is true, "Network name" setting
is displayed in Settings app (Settings > Display).
The user can turn on/off the feature to display the network name in the
status bar from Settings app.
Fixes: 67620513
Test: manual - go to Settings > Display and turn on/off Network name.
Change-Id: I43f1d9cbea363527250639ce6146f1c5c6c8a482
2017-10-31 09:08:06 -07:00
Bill Yi
d1530813da
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am: a68a0f0463
-s ours am: 9a983dd72f
-s ours
...
am: 2e841fd17e
-s ours
Change-Id: I422bdfa795c7cc91ac736c1e7eb0e8e254078034
2017-10-31 03:55:26 +00:00
Bill Yi
d90d7c5193
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev am: 89688902b8
-s ours
...
am: d3528de4c9
-s ours
Change-Id: I05bcb32b3c013d15a76939a3a974f88d36d94aeb
2017-10-31 03:54:53 +00:00
Bill Yi
2e841fd17e
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am: a68a0f0463
-s ours
...
am: 9a983dd72f
-s ours
Change-Id: I072b7f8f6e320f2339b1b134193aabc2c654604c
2017-10-31 03:46:08 +00:00