19733 Commits

Author SHA1 Message Date
Winson Chung
44950c094e Merge "Fixing issue incorrect resources being used with docked windows." 2015-09-25 21:05:17 +00:00
Winson
6aa91e6357 Removing unused resources.
Change-Id: Ie013b164892eaccaaab7b8c2bcdd3cb5ac51a485
2015-09-25 20:13:25 +00:00
Blazej Magnowski
c8433b60a7 Merge "Integration into other unlock mechanisms" 2015-09-25 19:42:07 +00:00
Blazej Magnowski
6dc59b48c0 Integration into other unlock mechanisms
Replaces all the older falsing thresholds unless the
HumanInteractionClassifier is disabled.

Change-Id: Idfc3cb1b6bc0bbdbc792cd75499f0c3b4f1b7142
2015-09-25 12:36:25 -07:00
Jorim Jaggi
fc832e3ef2 resolved conflicts for c594e935 to master
Change-Id: Ifaf8c6c2b80e5284e027278f5ff0437202439cf0
2015-09-25 11:54:05 -07:00
Winson
b200d05e2f Fixing issue incorrect resources being used with docked windows. 2015-09-25 11:39:47 -07:00
Jorim Jaggi
c594e9354a am f9f9999d: am b7b9b31f: am ad26dc5f: Merge "Deliver camera launch source for analytics" into mnc-dr-dev
* commit 'f9f9999d3245dffc8463a1f3f5f74dc900aa0196':
  Deliver camera launch source for analytics
2015-09-25 18:07:52 +00:00
Ben Kwa
6fd4f7f7c3 Merge "Activate selection mode when selecting via mouse." 2015-09-25 14:58:42 +00:00
Ben Kwa
bd7da4c44e Activate selection mode when selecting via mouse.
Modify the MultiSelectManager so that toggling selection on an item
notifies listeners of selection changes, if necessary.  This fixes a bug
where notifySelectionChanged wasn't getting called when the selection
changed.

BUG=23944862

Change-Id: I3aef41cc92c560dc15bdc0fe310c340bdb3005f6
2015-09-25 07:47:56 -07:00
Steve McKay
ecfbd3edcf Merge "Move State to a separate file." 2015-09-25 04:59:31 +00:00
Jorim Jaggi
f9f9999d32 am b7b9b31f: am ad26dc5f: Merge "Deliver camera launch source for analytics" into mnc-dr-dev
* commit 'b7b9b31f6969dc48174757ec236622f8d49222d0':
  Deliver camera launch source for analytics
2015-09-25 01:38:07 +00:00
Jorim Jaggi
b7b9b31f69 am ad26dc5f: Merge "Deliver camera launch source for analytics" into mnc-dr-dev
* commit 'ad26dc5f15d6ac13741ad8724c25ef8c58e73e81':
  Deliver camera launch source for analytics
2015-09-25 01:30:43 +00:00
Jorim Jaggi
40aa8811bc Deliver camera launch source for analytics
Bug: 24304031
Change-Id: I606bccf4b62b651e17c6e6d9472648deeab703da
2015-09-24 16:32:09 -07:00
Steve McKay
2fbe728069 Merge "Show empty roots except for content pickers." 2015-09-24 23:18:26 +00:00
Steve McKay
0200e34637 Show empty roots except for content pickers.
Bug: 24140864

Change-Id: I9fae80a1e3d413e97ee099bee9c59f81f713cf27
2015-09-24 16:16:43 -07:00
Ben Kwa
32a5776039 Merge "Fix a crash when deleting documents." 2015-09-24 23:13:42 +00:00
Ben Kwa
8923911c69 Fix a crash when deleting documents.
Deleting (and moving) documents invalidates previous selections, as
items change position.  Exit selection mode *before* actually deleting
anything, otherwise we end up trying to unselect potentially deleted
documents.

BUG=24338150

Change-Id: I79fb0c156142b78987be68560c78306f2678c521
2015-09-24 16:01:13 -07:00
Winson Chung
885291318b Merge "Removing unused debug overlay code." 2015-09-24 22:58:39 +00:00
Winson
dab26488b4 Removing unused debug overlay code.
Change-Id: I80d98b38001ca37bf5017b1631038fb574c324af
2015-09-24 15:56:10 -07:00
Ben Kwa
437c507085 Merge "DocumentsUI: Add an error screen to DirectoryFragment." 2015-09-24 22:28:08 +00:00
Ben Kwa
91bec536ac DocumentsUI: Add an error screen to DirectoryFragment.
- Reorganize the directory fragment.
- Repurpose the "empty" view to hold a message and a button.
- Message is set to the "No items" message if a directory is empty.
- Message is set to the error message if a query error occurs.
- Don't close DocumentsUI when a query error occurs.

Change-Id: I4e1e96f23040606b410ac746252dcb0ab9286f04
2015-09-24 15:06:14 -07:00
Blazej Magnowski
329d20d5e0 Merge "added Classifiers and Evaluators" 2015-09-24 17:43:02 +00:00
Elliott Hughes
434a481b21 am ea1831d2: am b57dd722: resolved conflicts for a884d81e to stage-aosp-master
* commit 'ea1831d211ea0e6b2d161c714bb0786369ef2df5':
  constify JNINativeMethod function pointer tables
2015-09-24 17:23:00 +00:00
Elliott Hughes
ea1831d211 am b57dd722: resolved conflicts for a884d81e to stage-aosp-master
* commit 'b57dd722f1dc0663417da37d3a82f8283ad3c982':
  constify JNINativeMethod function pointer tables
2015-09-24 17:14:10 +00:00
Elliott Hughes
b57dd722f1 resolved conflicts for a884d81e to stage-aosp-master
Change-Id: Ice485967fa96f13786024b6939b826638e906ff0
2015-09-24 10:01:32 -07:00
Jorim Jaggi
aeaddadb0e am 8ba8c543: am b278ea0c: am 27f26df6: am 05b11bf3: Merge "Update message in SIM PIN view when configuration changes" into mnc-dr-dev
* commit '8ba8c543f77eb8d5abad2653c5a6ebaeccc3a241':
  Update message in SIM PIN view when configuration changes
2015-09-24 04:18:01 +00:00
Jorim Jaggi
8ba8c543f7 am b278ea0c: am 27f26df6: am 05b11bf3: Merge "Update message in SIM PIN view when configuration changes" into mnc-dr-dev
* commit 'b278ea0cab555f16d0d8278ee3eadf75c6266920':
  Update message in SIM PIN view when configuration changes
2015-09-24 02:41:36 +00:00
Jorim Jaggi
b278ea0cab am 27f26df6: am 05b11bf3: Merge "Update message in SIM PIN view when configuration changes" into mnc-dr-dev
* commit '27f26df629e7a5c2ea87ad46708dc4678c11d27a':
  Update message in SIM PIN view when configuration changes
2015-09-24 02:29:01 +00:00
Jorim Jaggi
27f26df629 am 05b11bf3: Merge "Update message in SIM PIN view when configuration changes" into mnc-dr-dev
* commit '05b11bf357be9546a2cbdd3f37c32fc9567f4767':
  Update message in SIM PIN view when configuration changes
2015-09-24 02:20:37 +00:00
Blazej Magnowski
af4e36122a Merge "Add HistoryEvaluator" 2015-09-24 01:28:51 +00:00
Jorim Jaggi
05b11bf357 Merge "Update message in SIM PIN view when configuration changes" into mnc-dr-dev 2015-09-24 00:23:47 +00:00
Steve McKay
7a3b88cf56 Move State to a separate file.
Update remaining local DEBUG definitions to use Shared.DEBUG.

Change-Id: I3ed4d4b184836da161adff14bd3d9ca01b435847
2015-09-23 17:22:28 -07:00
Steve McKay
b0a3cc16f8 Merge "Merge BROWSE and BROWSE_ALL actions." 2015-09-23 22:41:49 +00:00
Winson Chung
cd3ba3c0a3 Merge "Fixing crash in configuration change for secondary users." 2015-09-23 20:00:01 +00:00
Jorim Jaggi
86f868dc32 am 93d1a17b: am 1af3c6f4: am 1bcb3472: am 6a15d528: Do not go over handler to dispatch keyguard visibility
* commit '93d1a17bafd51daaf6ed7fc56c7c3e84c5c119df':
  Do not go over handler to dispatch keyguard visibility
2015-09-23 19:53:00 +00:00
Winson
94a148594d Fixing crash in configuration change for secondary users.
- The crash is a regression caused by ag/773159.
2015-09-23 19:51:16 +00:00
Blazej Magnowski
68d0c9b1e9 added Classifiers and Evaluators
Change-Id: I9054c30cde665546de453e64572da619b1f6a799
2015-09-23 12:32:07 -07:00
Steve McKay
83df8c072d Merge BROWSE and BROWSE_ALL actions.
Open Files app when exploring from settings.
Force visibility of file size in this mode.
Don't hide empty media providers.

Bug: 24136618, 24140864
Change-Id: I6f238586725f9b6255812e3082bb8d8655219a7d
2015-09-23 12:25:13 -07:00
Jorim Jaggi
93d1a17baf am 1af3c6f4: am 1bcb3472: am 6a15d528: Do not go over handler to dispatch keyguard visibility
* commit '1af3c6f401da0ab8c4ddefd3e1776f9be50a1389':
  Do not go over handler to dispatch keyguard visibility
2015-09-23 19:12:41 +00:00
Jan Nordqvist
ca30939346 Merge "Hotspot 2.0 relase 2 first cut." 2015-09-23 19:05:53 +00:00
Jorim Jaggi
1af3c6f401 am 1bcb3472: am 6a15d528: Do not go over handler to dispatch keyguard visibility
* commit '1bcb3472669529edc991a31e6cbf7866a385383e':
  Do not go over handler to dispatch keyguard visibility
2015-09-23 19:03:26 +00:00
Blazej Magnowski
9f01c5bfa5 Add HistoryEvaluator
Adds the possibility to store the evaluations for previous strokes and gestures.
Also and enables to take the history into account when classifying current
interatcions.

Change-Id: Ia8fa54a00daa80b4e5aebf11b11b568ed23165d4
2015-09-23 12:00:36 -07:00
Jorim Jaggi
1bcb347266 am 6a15d528: Do not go over handler to dispatch keyguard visibility
* commit '6a15d528c0a4501389008ef945dec38b5ca6919a':
  Do not go over handler to dispatch keyguard visibility
2015-09-23 18:55:38 +00:00
Jorim Jaggi
ad371b2e22 Update message in SIM PIN view when configuration changes
Bug: 24273807
Change-Id: I497fcd2ee527ec22d14ff1b6c30be4ef9a878980
2015-09-23 11:52:12 -07:00
Xiaohui Chen
e4de5a0d3b Cleanup OWNER references.
Bug: 19913735
Change-Id: I2150c6baaab80fe11312e4401394a2a8da52e595
2015-09-23 18:50:11 +00:00
Jorim Jaggi
6a15d528c0 Do not go over handler to dispatch keyguard visibility
When going over the handler, it could happen with a bad interleaving
we thought that Keyguard was not showing when getting the
onFinishedGoingToSleep message, so we stopped fingerprint
authentication. For some reason our state machine for canceling
/restarting authentication didn't work correctly so the fingerprint
listening state was not correct.

Bug: 24178814
Change-Id: I2a4731f195982395244c12e4d33b2b7d561c5671
2015-09-23 18:44:20 +00:00
Steve McKay
bf5d95da0d Merge "Eliminate bad type parameterization." 2015-09-23 15:53:52 +00:00
Steve McKay
72ae6e0444 Eliminate bad type parameterization.
Change-Id: Id886098926f3c62583f34cfbcc04953bb2f4e8c3
2015-09-23 08:42:39 -07:00
Jason Monk
bb8346e790 Merge "Always show full strength for wifi quick toggle" 2015-09-23 15:21:32 +00:00
Jason Monk
f117961c96 Always show full strength for wifi quick toggle
Don't show status like connection strength and activity for the
wifi quick toggle.

Change-Id: Ifb104627c516d054862b432b6c6d6d4e114b4ade
2015-09-23 11:11:00 -04:00