Commit Graph

80967 Commits

Author SHA1 Message Date
Mike Digman
460384f315 Merge "Add disable2 flag for rotate suggestions" into pi-dev am: bd24572e17
am: 05a3cfd4d5

Change-Id: I8e7ab1195b8b78a0959e55cca5e205504fe8969d
2018-03-19 18:33:17 +00:00
Mike Digman
05a3cfd4d5 Merge "Add disable2 flag for rotate suggestions" into pi-dev
am: bd24572e17

Change-Id: I4b5cd5aa47debaedb115bd78cdd19fdda2bba552
2018-03-19 18:08:29 +00:00
Mike Digman
bd24572e17 Merge "Add disable2 flag for rotate suggestions" into pi-dev 2018-03-19 17:13:30 +00:00
Bookatz
b16ae2cb26 Merge "StatsManager log lines should be in logcat" into pi-dev am: 781533dc32
am: abec9926d7

Change-Id: Ia100a1303edd55c31aa0f9098bdf7d38bec79968
2018-03-19 16:50:42 +00:00
Bookatz
abec9926d7 Merge "StatsManager log lines should be in logcat" into pi-dev
am: 781533dc32

Change-Id: I9b79b21a8588d4dd927a6d16bd2fb437aa69c720
2018-03-19 16:39:14 +00:00
TreeHugger Robot
781533dc32 Merge "StatsManager log lines should be in logcat" into pi-dev 2018-03-19 16:18:53 +00:00
Android Build Merger (Role)
3d64e8de3f Merge "Merge "Insert correct app transition events for recents anim" into pi-dev am: f8cb545afb am: 7431195ead" 2018-03-19 16:09:10 +00:00
Jorim Jaggi
dd61685602 Merge "Insert correct app transition events for recents anim" into pi-dev am: f8cb545afb
am: 7431195ead

Change-Id: Id36878e5e678ff35d1fb4d9bb70dec0ac02844fb
2018-03-19 16:07:49 +00:00
TreeHugger Robot
65cb1dbf7d Merge "Transfer Interpolator from TransitionSet to child Transitions" 2018-03-19 16:06:43 +00:00
Jorim Jaggi
7431195ead Merge "Insert correct app transition events for recents anim" into pi-dev
am: f8cb545afb

Change-Id: I573a25113afd6666c95ceedefb33e7c994624e0d
2018-03-19 15:51:32 +00:00
Makoto Onuki
f2252f562c Merge "Fix SyncResutl.delayUntil javadoc" into pi-dev am: 6b71daa0c2
am: aeba5ea921

Change-Id: I80f7425c025cc839ed17a045495c3f6ad6e61142
2018-03-19 15:37:14 +00:00
Jorim Jaggi
f8cb545afb Merge "Insert correct app transition events for recents anim" into pi-dev 2018-03-19 15:36:05 +00:00
Makoto Onuki
aeba5ea921 Merge "Fix SyncResutl.delayUntil javadoc" into pi-dev
am: 6b71daa0c2

Change-Id: Ie14b1bdf696ed3b67867f08d5f10800d2330eddf
2018-03-19 15:24:17 +00:00
Makoto Onuki
6b71daa0c2 Merge "Fix SyncResutl.delayUntil javadoc" into pi-dev 2018-03-19 15:12:36 +00:00
Jorim Jaggi
54cff64ec6 Insert correct app transition events for recents anim
The transition delay will be the latency until all the leashes
were created etc. Thus, the actual latency is going to be in
WINDOWS_DRAWN_DELAY.

Also fix an issue where we inadvertently started a transition,
and then the transition logger was hanging.

Bug: 72967764
Test: Swipe up from home button, observe eventlog
Change-Id: I2b1fb7d9d694a629a33653c1fa3d5ed47f53de6b
2018-03-19 14:55:41 +00:00
David Zeuthen
49ccdf5d06 Merge "ConfirmationDialog: Fail if accessibility services are running." into pi-dev am: b57365562d
am: f3f0683eeb

Change-Id: I3e936595bc91cf312a0abbcb1e68896e51cf4263
2018-03-19 14:52:59 +00:00
David Zeuthen
f3f0683eeb Merge "ConfirmationDialog: Fail if accessibility services are running." into pi-dev
am: b57365562d

Change-Id: I5cc4ac36d980a4a0b6c202ddcba4ffb5433cd149
2018-03-19 14:39:03 +00:00
TreeHugger Robot
b57365562d Merge "ConfirmationDialog: Fail if accessibility services are running." into pi-dev 2018-03-19 14:27:16 +00:00
Roshan Pius
b58bfc11c8 Settings: Remove unused bg scan throttle settings
Bug: 68987915
Test: Compiles
(cherry-picked from d8fa3c3bdf7a66681986dc52e7ba4f8f75061c9b)

Change-Id: Id878daa0f782ddc751e726ee19cdc1c8e5ea1bc2
2018-03-19 03:00:32 +00:00
Bookatz
1f63131425 StatsManager log lines should be in logcat
Change the Slog.d to Slog.w and enable them, so that we can see them.
They seem to represent important failure events when people call the
public API into StatsManager.

Bug: 74997752
Test: none
Change-Id: I1c577b32358158f73453a8a3066013e0f3733d87
2018-03-18 16:17:51 +00:00
Michael Kwan
d1457eea49 Merge "Modify time only mode flag into set of values instead of just one." into pi-dev am: c5d0ed9f3c
am: 74d615f1ac

Change-Id: I98aaa71b0988e96d079ed1813dbb777565c3d655
2018-03-17 22:39:28 +00:00
Michael Kwan
74d615f1ac Merge "Modify time only mode flag into set of values instead of just one." into pi-dev
am: c5d0ed9f3c

Change-Id: I4721197b1329a14aa51f1b49a05bdade1fb71ef8
2018-03-17 22:22:33 +00:00
Michael Kwan
c5d0ed9f3c Merge "Modify time only mode flag into set of values instead of just one." into pi-dev 2018-03-17 22:05:38 +00:00
TreeHugger Robot
685288127d Merge "Docstring Updates for applyTransportModeTransform" into pi-dev 2018-03-17 03:44:46 +00:00
Siyamed Sinir
4d696b3b5b Merge "Fix rounding error related to autoSize" 2018-03-17 03:24:55 +00:00
nharold
b411d0a89d Merge "Docstring Updates for applyTransportModeTransform" am: 00ef20e853 am: e3a6b678c3
am: a88433c216

Change-Id: I45f9a72d3c3b7079a35585efac10f66c1e0e753f
2018-03-17 02:46:16 +00:00
nharold
a88433c216 Merge "Docstring Updates for applyTransportModeTransform" am: 00ef20e853
am: e3a6b678c3

Change-Id: I58ab2b451ef1d0c20efe80d30a679e8870a39a8e
2018-03-17 02:16:38 +00:00
Julia Reynolds
50ef90645e Merge "Add new semantic Person fields" into pi-dev am: 6389e7bc44
am: 1e856ca8c3

Change-Id: Ia4d842aa30e48f72e8b8a97e47fe57673a02212a
2018-03-17 02:14:30 +00:00
nharold
e3a6b678c3 Merge "Docstring Updates for applyTransportModeTransform"
am: 00ef20e853

Change-Id: I2b59ebf0b751f7f404d175ad394a4dfdbf7169ff
2018-03-17 02:00:57 +00:00
Julia Reynolds
1e856ca8c3 Merge "Add new semantic Person fields" into pi-dev
am: 6389e7bc44

Change-Id: I316ff063efbe3c36a34e3e9e00a463ae4364c4bd
2018-03-17 01:50:45 +00:00
Julia Reynolds
6389e7bc44 Merge "Add new semantic Person fields" into pi-dev 2018-03-17 01:35:20 +00:00
Nathan Harold
7b7bea0485 Docstring Updates for applyTransportModeTransform
-Add anotations to usages of PolicyDirection for
 apply...() methods.
-Update the comments on DIRECTION_IN and DIRECTION_OUT
 to better reflect their current usage.
-Add a better explanation to the rekey procedure doc.
-Remove disused createTunnelInterface() stub.

Bug: 73751066
Test: make docs
Merged-In: I9f2ec864466148a18899f1e952c74a525902ccbc
Change-Id: I9f2ec864466148a18899f1e952c74a525902ccbc
(cherry picked from commit f4cdf25a90)
2018-03-16 17:46:05 -07:00
nharold
00ef20e853 Merge "Docstring Updates for applyTransportModeTransform" 2018-03-17 00:33:10 +00:00
Nathan Harold
f4cdf25a90 Docstring Updates for applyTransportModeTransform
-Add anotations to usages of PolicyDirection for
 apply...() methods.
-Update the comments on DIRECTION_IN and DIRECTION_OUT
 to better reflect their current usage.
-Add a better explanation to the rekey procedure doc.
-Remove disused createTunnelInterface() stub.

Bug: 73751066
Test: make docs
Change-Id: I9f2ec864466148a18899f1e952c74a525902ccbc
2018-03-16 17:29:45 -07:00
George Mount
a69609e124 Transfer Interpolator from TransitionSet to child Transitions
Bug: 74831546

TransitionSet interpolator was never being used in child
transitions. This transfers the interpolator by setting the
interpolator of the children as they are added or when the
interpolator is set. It also works for other settings:
epicenter, path motion, and propagation.

Test: Ie8ce23fe15e6193fdb2909606e442bd2912a4c5a
Change-Id: Ia9e35639f025d14c6497fa30abf75252ff3b1423
2018-03-16 16:30:04 -07:00
Amith Yamasani
ace2399673 Merge "App Time Limits API in UsageStats" into pi-dev am: a8bb9d255f
am: 0071ccea48

Change-Id: I9be474caba095e377c40b9153d4adbc444380a05
2018-03-16 23:19:57 +00:00
Amith Yamasani
0071ccea48 Merge "App Time Limits API in UsageStats" into pi-dev
am: a8bb9d255f

Change-Id: I77b6656d38701b76444c64be1d75c7b86e70e3bb
2018-03-16 23:08:42 +00:00
Aseem Kumar
183dcf30ba Merge "Unhide getKey() and importKey() and the whole class of RecoveryController. Added @RequiresPermission(android.permission.RECOVER_KEYSTORE) on all public APIs of RecoveryController." into pi-dev am: 3b0450d4a9
am: 12c26fc509

Change-Id: I46b57bd17237f75323f56c1bd690132872bb75f4
2018-03-16 23:05:10 +00:00
Aseem Kumar
12c26fc509 Merge "Unhide getKey() and importKey() and the whole class of RecoveryController. Added @RequiresPermission(android.permission.RECOVER_KEYSTORE) on all public APIs of RecoveryController." into pi-dev
am: 3b0450d4a9

Change-Id: I650b80562b8e19d5264ec897f30145b5b393e77b
2018-03-16 22:51:56 +00:00
TreeHugger Robot
a8bb9d255f Merge "App Time Limits API in UsageStats" into pi-dev 2018-03-16 22:40:46 +00:00
TreeHugger Robot
0f44c5de26 Merge changes from topics "niap-asym-write", "niap-asym-write-api"
* changes:
  Restore "Add "Unlocked device required" parameter to keys"
  Add "Unlocked device required" key API
2018-03-16 22:31:19 +00:00
Aseem Kumar
3b0450d4a9 Merge "Unhide getKey() and importKey() and the whole class of RecoveryController. Added @RequiresPermission(android.permission.RECOVER_KEYSTORE) on all public APIs of RecoveryController." into pi-dev 2018-03-16 22:27:37 +00:00
Brian Young
fd75c7232a Add "Unlocked device required" key API
This adds the API methods and values for keyguard-bound keys, but
contains none of the actual functionality.

Test: CTS tests in CtsKeystoreTestCases

Bug: 67752510
Change-Id: Iccd7dafd77258d903d11353e02ba3ab956050c40
2018-03-16 15:27:10 -07:00
Ruchi Kandoi
6fed97dc19 Merge "NfcAdapter.EXTRA_SE_NAME -> NfcAdapter.EXTRA_SECURE_ELEMENT_NAME" am: 01cef932c8 am: 7ad52283ab
am: a3180099bf

Change-Id: I51953254afcaed92aa13293392efa6b628eaa8a2
2018-03-16 22:07:09 +00:00
Siyamed Sinir
db86a6b047 Fix rounding error related to autoSize
setupAutoSize fills in the possible text sizes that can be generated
between a min and max value. In order to do that, it counts the number
of steps starting from minSize until maxSize. However, while counting
it rounds the initial value, which causes rounding error at the final
step.

Test: Change system font scale to 1.1 via
      adb shell settings put system font_scale 1.1
Test: atest android.widget.cts.TextViewTest

Bug: 73917559
Bug: 75266270
Change-Id: I61811db28ef01262bd48f5042d783d75c71c3614
2018-03-16 14:49:23 -07:00
Ruchi Kandoi
a3180099bf Merge "NfcAdapter.EXTRA_SE_NAME -> NfcAdapter.EXTRA_SECURE_ELEMENT_NAME" am: 01cef932c8
am: 7ad52283ab

Change-Id: I4cdeed1b3b55de95e58c8784e379ccfe9da7e4d8
2018-03-16 21:43:04 +00:00
Ruchi Kandoi
7ad52283ab Merge "NfcAdapter.EXTRA_SE_NAME -> NfcAdapter.EXTRA_SECURE_ELEMENT_NAME"
am: 01cef932c8

Change-Id: Ic8c8b5566a4278af7ecf745d4b3c8d18a1d848b7
2018-03-16 21:28:18 +00:00
Treehugger Robot
01cef932c8 Merge "NfcAdapter.EXTRA_SE_NAME -> NfcAdapter.EXTRA_SECURE_ELEMENT_NAME" 2018-03-16 20:12:04 +00:00
Aseem Kumar
c1742e5137 Unhide getKey() and importKey() and the whole class of RecoveryController.
Added @RequiresPermission(android.permission.RECOVER_KEYSTORE) on all
public APIs of RecoveryController.

Bug: 73900159
Test: adb shell am instrument -w -e package \
com.android.server.locksettings.recoverablekeystore \
com.android.frameworks.servicestests/android.support.test.runner.AndroidJUnitRunner

Change-Id: I1047c038603869307d7a2462a2e5635fcd1c94c2
2018-03-16 13:07:25 -07:00
Anthony Stange
44b04655e5 Merge "Add scan background mode to Settings.Global." am: 3aa064897e am: 4061a9f348
am: 5dd917de9f

Change-Id: Ib7fa9d8bafc273b6d455a15dd4d5a685010979b3
2018-03-16 20:06:24 +00:00