Commit Graph

67008 Commits

Author SHA1 Message Date
Ian Rogers
a7f834f1ce Fix SuppressWarnings typo.
As Error Prone states:
Suppressing "deprecated" is probably a typo for "deprecation"
Bug: 27723540

Change-Id: Iedc8ef3b876f5238cc0e2d89d57138eafd5bf91f
2016-05-27 14:31:19 -07:00
The Android Automerger
6f2f02e4ae Merge commit '93c1d3aa6e20b52a37548af0bf9f9a66948a7611'
* commit '93c1d3aa6e20b52a37548af0bf9f9a66948a7611':
  docs: Refinements for testing
  Fix toast with accessibility and app pinning
  Updated link to material design page.
  Change overdraw test to use windowbackground
  Prevent callbacks during DrawableContainer child initialization
  Fixing crash in SysUI due to invalid group.
  Cherry pick: docs: Edited "Features Reference" section in "<uses-feature>" page.
  Fix Activity Transition mess-up.
  Time to #NameAndroidN!
  Prevent use of a null sCallbackObj by Hardware FLP
  Fixed the relative time spoken with accessibility
  Use backstop timeouts on asynchronous countdown during preflight
2016-05-27 20:05:56 +00:00
Christine Hallstrom
f44d5bcf4f Merge "Properly check if BT is off when shutting down radios" into nyc-mr1-dev am: 0f760e0815
am: fa72d4caff

* commit 'fa72d4caffce6f1b7adf5e04f8643fc8e2ebb243':
  Properly check if BT is off when shutting down radios

Change-Id: I16d921e8aac53b21c4007e697dc4d5e2f2a4fa4f
2016-05-27 19:17:03 +00:00
Fyodor Kupolov
2d8583e0e4 Merge "Remove ActivityManager calls with PM.mInstallLock held" into nyc-dev am: a4dbdaf5e9 am: 5d531e4f6c
am: f6816ad3c5

* commit 'f6816ad3c5b4062ebe8cdb810aee70e9c9a34314':
  Remove ActivityManager calls with PM.mInstallLock held

Change-Id: I98ea0d1c547c5f044bf7fc9c231e7f19b6c39c95
2016-05-27 17:50:31 +00:00
Paul Jensen
b569d8bbf9 Merge "Don\'t pass URL path and username/password to PAC scripts" into klp-dev am: af0b4466ff am: 8940d2b0ff am: bb27626141 am: 6c35cf2434 am: 42a5983364 am: 75095e6f02 am: 7c625e1938 am: 54a62d5feb am: a5a2c88fb3 am: 7ff57eaff9 am: 94c8855da6 am: 50615e498e am: fdc53e96d3
am: 257c5b2e9c

* commit '257c5b2e9ce5969e22c88d84213f394953740c64':
  Don't pass URL path and username/password to PAC scripts

Change-Id: If9f1006bd7d4ab2acc3ce3e75a0746f6ca44b01a
2016-05-27 17:42:22 +00:00
Tenghui Zhu
09cd5ea578 Merge "Merge "Update the light center when the root view\'s layout changed" into nyc-dev am: e78ba24c17 am: 56d4dae9ec" into nyc-mr1-dev-plus-aosp
am: d09ad72e82

* commit 'd09ad72e82c9ca66eea4e2409589813e20d9a8bf':
  Update the light center when the root view's layout changed

Change-Id: Ifb58bf9a0a0e3b11d9c59d2c04218d63c294f0ae
2016-05-27 17:24:49 +00:00
Jeff Sharkey
9b34b66b66 resolve merge conflicts of 58db550 to master
Change-Id: I39f7760c008af1d4a107b6b929b44c79d2f463be
2016-05-27 10:12:55 -06:00
Selim Cinek
b0f1031ae3 Merge "Fixed the relative time spoken with accessibility" into nyc-dev am: 38b5946fae
am: 828d701667

* commit '828d70166742f11740f9a953164f984a32db5fa8':
  Fixed the relative time spoken with accessibility

Change-Id: I717e571849e293093e626a99e07ca307abee8f96
2016-05-27 03:44:44 +00:00
Wyatt Riley
a1ad1996a8 Merge "Prevent use of a null sCallbackObj by Hardware FLP" into nyc-dev am: 793ac34219
am: 8453136b8e

* commit '8453136b8ee7ba361d4180df75328466292c9610':
  Fix Activity Transition mess-up.

Change-Id: I3904d1d8782c07f0a869243802c1e1dc8d6e49b1
2016-05-27 03:29:22 +00:00
Jeff Sharkey
977450135c Merge "Merge "Delay PACKAGE_RESTARTED until after data cleared." into nyc-dev am: d6ee899397" into nyc-mr1-dev
am: 56f7a36c46

* commit '56f7a36c46678f596f870fbef41252eedc812150':
  Time to #NameAndroidN!

Change-Id: Iec0ae063378200965d8a153308afac4edcfc9a8d
2016-05-27 03:28:50 +00:00
Selim Cinek
828d701667 Merge "Fixed the relative time spoken with accessibility" into nyc-dev
am: 38b5946fae

* commit '38b5946fae50d4e9e8f32c985983d03a4437910d':
  Fixed the relative time spoken with accessibility

Change-Id: I51bbe71d2b86cfb8f050882b072092a015573fdb
2016-05-27 03:27:43 +00:00
George Mount
8453136b8e Merge "Fix Activity Transition mess-up." into nyc-dev
am: bd34103c5d

* commit 'bd34103c5defbfd180be6a387eb5aa82d4b97eac':
  Fix Activity Transition mess-up.

Change-Id: I62457d504583e1865ceeace2918d81b4ef223b12
2016-05-27 03:24:06 +00:00
Christine Hallstrom
fa72d4caff Merge "Properly check if BT is off when shutting down radios" into nyc-mr1-dev
am: 0f760e0815

* commit '0f760e081570cb7fe3ac7dd6a86125a8f79e5b34':
  Properly check if BT is off when shutting down radios

Change-Id: I7d3b2d40664115555db897b46b3debc5b2c04f8d
2016-05-27 03:16:59 +00:00
Fyodor Kupolov
f6816ad3c5 Merge "Remove ActivityManager calls with PM.mInstallLock held" into nyc-dev am: a4dbdaf5e9
am: 5d531e4f6c

* commit '5d531e4f6caedbcc2b6a9c7a549b83e37d694c7d':
  Remove ActivityManager calls with PM.mInstallLock held

Change-Id: I17c8e62b0c65afe3fe58490d8e5634d9442e6821
2016-05-27 03:14:39 +00:00
Paul Jensen
257c5b2e9c Merge "Don\'t pass URL path and username/password to PAC scripts" into klp-dev am: af0b4466ff am: 8940d2b0ff am: bb27626141 am: 6c35cf2434 am: 42a5983364 am: 75095e6f02 am: 7c625e1938 am: 54a62d5feb am: a5a2c88fb3 am: 7ff57eaff9 am: 94c8855da6 am: 50615e498e
am: fdc53e96d3

* commit 'fdc53e96d3e99f4b5b5a9406e1c59b5e32bfc96c':
  Don't pass URL path and username/password to PAC scripts

Change-Id: I75e1b139492cac12bf73fa68894f2e7ae7deb701
2016-05-27 03:14:22 +00:00
Android Build Merger (Role)
56f7a36c46 Merge "Merge "Time to #NameAndroidN!" into nyc-dev am: 45caebe035" into nyc-mr1-dev 2016-05-27 03:14:19 +00:00
Dan Sandler
f64660d551 Merge "Time to #NameAndroidN!" into nyc-dev
am: 45caebe035

* commit '45caebe035a67db18d06c4f4e4f124246fb5321d':
  Time to #NameAndroidN!

Change-Id: Iecedefbae64d4a6ffb67971be0f9da5eb746b1ed
2016-05-27 03:12:50 +00:00
TreeHugger Robot
0f760e0815 Merge "Properly check if BT is off when shutting down radios" into nyc-mr1-dev 2016-05-27 03:08:38 +00:00
Fyodor Kupolov
5d531e4f6c Merge "Remove ActivityManager calls with PM.mInstallLock held" into nyc-dev
am: a4dbdaf5e9

* commit 'a4dbdaf5e96273dccd474e31700d84a1ad907503':
  Remove ActivityManager calls with PM.mInstallLock held

Change-Id: I3be800fc5de9fa3c06f0bf6158a0dbf2a05b165e
2016-05-27 03:05:20 +00:00
Paul Jensen
fdc53e96d3 Merge "Don\'t pass URL path and username/password to PAC scripts" into klp-dev am: af0b4466ff am: 8940d2b0ff am: bb27626141 am: 6c35cf2434 am: 42a5983364 am: 75095e6f02 am: 7c625e1938 am: 54a62d5feb am: a5a2c88fb3 am: 7ff57eaff9 am: 94c8855da6
am: 50615e498e

* commit '50615e498e11f356ef582af0f9616945d04faa80':
  Don't pass URL path and username/password to PAC scripts

Change-Id: I2197af29029456780438123c59214c3d8c58a6ef
2016-05-27 03:04:34 +00:00
Tenghui Zhu
2f86522d7d Merge "Update the light center when the root view\'s layout changed" into nyc-dev am: e78ba24c17
am: 56d4dae9ec

* commit '56d4dae9ec7503660bdd762e2e04f267d7f2704c':
  Update the light center when the root view's layout changed

Change-Id: Ifedcb88adb38eb23ad82b7836c5de5f738c80c10
2016-05-27 03:02:14 +00:00
Jeff Sharkey
58db5505c7 Merge "Cache IMountService for isUserKeyUnlocked() calls." into nyc-dev am: 36cbf5ca37
am: bda14dd987

* commit 'bda14dd987498d4c75dcbbe7b4bba73db165c1c8':
  Cache IMountService for isUserKeyUnlocked() calls.

Change-Id: Ic5577c55324a52e761919febc0cab9af0e18e919
2016-05-27 02:58:50 +00:00
Teng-Hui Zhu
56d4dae9ec Merge "Update the light center when the root view\'s layout changed" into nyc-dev
am: e78ba24c17

* commit 'e78ba24c176fd6a0c54eaf7e52be545952ba1ab7':
  Update the light center when the root view's layout changed

Change-Id: Ic973b9b47df6550c5170c2248c7e0f2ab25c6a57
2016-05-27 02:50:14 +00:00
Jeff Sharkey
bda14dd987 Merge "Cache IMountService for isUserKeyUnlocked() calls." into nyc-dev
am: 36cbf5ca37

* commit '36cbf5ca378523bfa4f5394e39f5fcff2b2461de':
  Cache IMountService for isUserKeyUnlocked() calls.

Change-Id: I1ad2d1eba64a89e7a22dc86c7241f6f85a5f2a0b
2016-05-27 02:42:44 +00:00
Fyodor Kupolov
63cd09dfb4 Merge "Clean up demo dir when leaving demo mode" into nyc-mr1-dev am: 2c5cbd4012
am: 0ebf3cc47c

* commit '0ebf3cc47c9d20613f02ca263a2394d80455a09a':
  Clean up demo dir when leaving demo mode

Change-Id: Ib3338a18e75f04e15a1d77a82e5ac1aba246a5bb
2016-05-27 01:02:29 +00:00
Fyodor Kupolov
0ebf3cc47c Merge "Clean up demo dir when leaving demo mode" into nyc-mr1-dev
am: 2c5cbd4012

* commit '2c5cbd4012aef736c94a7afc84a778623c639d10':
  Clean up demo dir when leaving demo mode

Change-Id: Ia7891f8e5106130d669a1daa7fcc691db1f5e4c7
2016-05-27 00:54:20 +00:00
Fyodor Kupolov
2c5cbd4012 Merge "Clean up demo dir when leaving demo mode" into nyc-mr1-dev 2016-05-27 00:48:38 +00:00
Selim Cinek
38b5946fae Merge "Fixed the relative time spoken with accessibility" into nyc-dev 2016-05-26 22:33:51 +00:00
George Mount
bd34103c5d Merge "Fix Activity Transition mess-up." into nyc-dev 2016-05-26 22:15:32 +00:00
Doris Liu
f143417bab Merge "Handle hidden RT VectorDrawable animators" 2016-05-26 20:45:33 +00:00
Christine Hallstrom
995c90aa18 Properly check if BT is off when shutting down radios
Use BluetoothAdapter#getState() instead of
BluetoothAdapter#isEnabled() when checking if Bluetooth has turned
off, as isEnabled() is set to false early in the shutdown process
and getState() provides a better indication of the state of BT.

Bug: 27354612
Change-Id: Ic7828f0726491d49c9a14ba5d654b24f66743662
2016-05-26 13:20:56 -07:00
Daniel Sandler
45caebe035 Merge "Time to #NameAndroidN!" into nyc-dev 2016-05-26 20:07:09 +00:00
Fyodor Kupolov
a4dbdaf5e9 Merge "Remove ActivityManager calls with PM.mInstallLock held" into nyc-dev 2016-05-26 18:20:36 +00:00
Doris Liu
67ce99b66e Handle hidden RT VectorDrawable animators
This CL changes the target of VD specific animators to VectorDrawable,
instead of RenderNode. The benefit of doing so is that animators can
now detect whether the animation is meaningful by checking whether
their VD target is in the display list. If not, that means the VD is
not drawing for the current frame, in which case we can be smarter
and more power efficient by removing the animator from the list and
posting a delayed onFinished listener callback.

By setting VD as the animation target, when an ImageView decides to
update its drawable from one AVD to something else, we'll be able
to detect that the previous AVD is no longer in the display list,
and stop providing animation pulse to the stale AVD, which is
something we couldn't do previously.  This change also
handles the case where one AVD instance could be drawn in two
different views.

Bug: 27441375
Change-Id: Id4b3b37f28274c917cb9beb9dcd3d1e6991b5c5d
2016-05-26 11:13:19 -07:00
Paul Jensen
50615e498e Merge "Don\'t pass URL path and username/password to PAC scripts" into klp-dev am: af0b4466ff am: 8940d2b0ff am: bb27626141 am: 6c35cf2434 am: 42a5983364 am: 75095e6f02 am: 7c625e1938 am: 54a62d5feb am: a5a2c88fb3 am: 7ff57eaff9
am: 94c8855da6

* commit '94c8855da6c1e5800723d1eaeceb1cba841bea6b':
  Don't pass URL path and username/password to PAC scripts

Change-Id: Ic91dc5c4a0a283bcd177daac8cced12a668bf0d9
2016-05-26 17:59:23 +00:00
Tenghui Zhu
e78ba24c17 Merge "Update the light center when the root view's layout changed" into nyc-dev 2016-05-26 17:48:49 +00:00
George Mount
f43ea5d4d2 Fix Activity Transition mess-up.
Bug 28610520

isTopOfTask() was returns false in onResume always because
it wasn't being made visible until after onResume. The visibility
of the window is not important for this method (older versions
didn't check it at all), so that was removed.

Change-Id: I45e506e72356cc3808e2e9340739726c99da7d97
2016-05-26 10:06:35 -07:00
TreeHugger Robot
36cbf5ca37 Merge "Cache IMountService for isUserKeyUnlocked() calls." into nyc-dev 2016-05-26 16:49:51 +00:00
Dan Sandler
1b1edde9ee Time to #NameAndroidN!
Bug: 27376882
Change-Id: I32397e634039a64b86669662908fab2effb367a7
2016-05-26 12:47:25 -04:00
Ji Yang
811d0411f3 Merge "Rename carrier messaging API constant." into nyc-dev am: f7375b46ff am: e6c6ca417d
am: 54b280ba66

* commit '54b280ba66d8f92d73711df4d02add1140eb416f':
  Rename carrier messaging API constant.

Change-Id: Ib94ec913651d3b0c92e43927cb8a091732319777
2016-05-26 16:31:58 +00:00
Ji Yang
54b280ba66 Merge "Rename carrier messaging API constant." into nyc-dev am: f7375b46ff
am: e6c6ca417d

* commit 'e6c6ca417da6f62de4bdebd7b380f12b751a08b7':
  Rename carrier messaging API constant.

Change-Id: I9e2d1c3572a6e7658e6ba66a7d4c01fd4a4c805a
2016-05-26 16:12:55 +00:00
Ji Yang
e6c6ca417d Merge "Rename carrier messaging API constant." into nyc-dev
am: f7375b46ff

* commit 'f7375b46ff9848feba0a9632669d07384954d69e':
  Rename carrier messaging API constant.

Change-Id: I476b10118136b13a49b1d55864bbef8e568d6c7e
2016-05-26 15:54:38 +00:00
Ji Yang
f8969b233c Merge "Rename carrier messaging API constant." into nyc-dev
am: f7375b46ff

* commit 'f7375b46ff9848feba0a9632669d07384954d69e':
  Rename carrier messaging API constant.

Change-Id: I0e6713e07899cde7780b433c0f3053e344e6d327
2016-05-26 15:54:27 +00:00
Ji Yang
f7375b46ff Merge "Rename carrier messaging API constant." into nyc-dev 2016-05-26 15:40:12 +00:00
Jeff Sharkey
4815ed4500 Cache IMountService for isUserKeyUnlocked() calls.
This avoids doing a ServiceManager lookup for every call through
this hot code-path.

Bug: 28946245
Change-Id: I210ce34b33e5b40a5ab4e92ddce87fc5e9964be2
2016-05-26 09:31:06 -06:00
Paul Jensen
94c8855da6 Merge "Don\'t pass URL path and username/password to PAC scripts" into klp-dev am: af0b4466ff am: 8940d2b0ff am: bb27626141 am: 6c35cf2434 am: 42a5983364 am: 75095e6f02 am: 7c625e1938 am: 54a62d5feb am: a5a2c88fb3
am: 7ff57eaff9

* commit '7ff57eaff95fd4cdb3cc80f8e420b469f0656bb8':
  Don't pass URL path and username/password to PAC scripts

Change-Id: I80187f003e437678786f0740f23e76543890b9bc
2016-05-26 15:22:55 +00:00
Paul Jensen
7ff57eaff9 Merge "Don\'t pass URL path and username/password to PAC scripts" into klp-dev am: af0b4466ff am: 8940d2b0ff am: bb27626141 am: 6c35cf2434 am: 42a5983364 am: 75095e6f02 am: 7c625e1938 am: 54a62d5feb
am: a5a2c88fb3

* commit 'a5a2c88fb3ac43315575de94696c837cb6b88c35':
  Don't pass URL path and username/password to PAC scripts

Change-Id: Ia33d40ae5d4b6ee0cd3cfcdc8587d6002603f128
2016-05-26 15:13:07 +00:00
Paul Jensen
a5a2c88fb3 Merge "Don\'t pass URL path and username/password to PAC scripts" into klp-dev am: af0b4466ff am: 8940d2b0ff am: bb27626141 am: 6c35cf2434 am: 42a5983364 am: 75095e6f02 am: 7c625e1938
am: 54a62d5feb

* commit '54a62d5febc8771f65221db3dd5c6e08f3288eb8':
  Don't pass URL path and username/password to PAC scripts

Change-Id: I1da24c02fbf85a7f0fd3ea7a86ad3a34389000e8
2016-05-26 15:02:46 +00:00
Michael Wright
5944e07e99 Merge "DO NOT MERGE Remove Pointer Capture API" into nyc-dev am: c396f0f70e
am: 4f6ae7bbaa

* commit '4f6ae7bbaa4654e14d70e9fa503ceb713c90c342':
  DO NOT MERGE Remove Pointer Capture API

Change-Id: Ieceb1c9248bfc618ed1c70821d4cf746128bc679
2016-05-26 14:51:30 +00:00
Ricky Wai
f7a58e292c Merge "Merge "Add resetKeyStore() in LockSettingsService" into nyc-dev am: 1cb6f9d8a4 am: 754ddca748" into nyc-mr1-dev-plus-aosp
am: 1db5fc9810

* commit '1db5fc9810c412aafcfe430285943c6797e8e3fc':
  Add resetKeyStore() in LockSettingsService

Change-Id: Ia3a5c7156fd7774bffa8e4b5ad4d81b36e408923
2016-05-26 14:51:20 +00:00