Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
154,143 Commits 3 Branches 0 Tags
3367283946caafe3b22e178caa29fa4ce69d2ff7
Commit Graph

4539 Commits

Author SHA1 Message Date
George Mount
e8ba00771f am e770e3a1: am 202532da: am 48514832: Merge "Fix NPE when clicking "back" quickly." into lmp-dev 
* commit 'e770e3a196a252e14079b9708ddfad2db19f4d19':
  Fix NPE when clicking "back" quickly.
 2014-08-29 03:36:16 +00:00
Alan Viverette
9cc4bda235 am e9d79974: am 33f52f1e: am f104c2f9: Merge "Cancel the date picker dialog when BUTTON_NEGATIVE is clicked" into lmp-dev 
* commit 'e9d79974a26ffd49eea25eaf03627eecec914349':
  Cancel the date picker dialog when BUTTON_NEGATIVE is clicked
 2014-08-28 23:24:04 +00:00
George Mount
0f227c9a3d Merge "Fix NPE when clicking "back" quickly." into lmp-dev 2014-08-28 23:19:38 +00:00
George Mount
407d1fa52c Fix NPE when clicking "back" quickly. 
Bug 17319368

Change-Id: I8cf544aefa75bd5fe4f606e185f84977a36b0cdc
 2014-08-28 16:11:49 -07:00
Christopher Tate
3d9c6e4ae8 am 06ccf6f7: am a618e54a: am 2c85f54f: Merge "Correct misleading javadoc for BackupHelper" into lmp-dev 
* commit '06ccf6f7ff737239357133bda3fbc385707b43b0':
  Correct misleading javadoc for BackupHelper
 2014-08-28 22:58:31 +00:00
Alan Viverette
9adfa37cfe Merge "Cancel the date picker dialog when BUTTON_NEGATIVE is clicked" into lmp-dev 2014-08-28 22:39:27 +00:00
Christopher Tate
a43e2409ad Merge "Correct misleading javadoc for BackupHelper" into lmp-dev 2014-08-28 20:53:36 +00:00
Winson Chung
dd014e73bf am 4eade477: am ef390cca: am 62354353: Merge "Change API to return thumbnail size instead of individual dimensions. (Bug 17295512)" into lmp-dev 
* commit '4eade477fb2c2159afafe047e867007a986ad43c':
  Change API to return thumbnail size instead of individual dimensions. (Bug 17295512)
 2014-08-28 19:51:08 +00:00
Christoph Studer
23867c4303 am df5eb412: am a03d8335: am 6049c4b7: Merge "NoListener: Factor out ZEN mode API" into lmp-dev 
* commit 'df5eb41241872e641a199b7089894dac5c9c358c':
  NoListener: Factor out ZEN mode API
 2014-08-28 19:32:39 +00:00
Winson Chung
8bd5d69008 Merge "Change API to return thumbnail size instead of individual dimensions. (Bug 17295512)" into lmp-dev 2014-08-28 19:15:10 +00:00
Christoph Studer
45c0d5838f Merge "NoListener: Factor out ZEN mode API" into lmp-dev 2014-08-28 18:59:41 +00:00
George Mount
297a940edb am bc231f74: am fc83d404: am 077805bf: Merge "Call SharedElementListener#setSharedElementEnd on back." into lmp-dev 
* commit 'bc231f74ffb488a5b559c9d5603819273ea30898':
  Call SharedElementListener#setSharedElementEnd on back.
 2014-08-28 18:43:24 +00:00
George Mount
fbc0a6b385 am d91a4566: am 7ffe01f2: am b0333ac9: Merge "Allow arbitrarily-added shared elements." into lmp-dev 
* commit 'd91a4566b14eecd672194a6cbce813ae9f5c6ecb':
  Allow arbitrarily-added shared elements.
 2014-08-28 18:43:19 +00:00
Jose Lima
b420cd132a am 639df5f0: am 0cdcdf5c: am 61c45885: Merge "Renamed Activity.onVisibleBehindCancelled() to Activity.onVisibleBehindCanceled()" into lmp-dev 
* commit '639df5f03738f244d1d1ef10f099e5784ee1b3e8':
  Renamed Activity.onVisibleBehindCancelled() to Activity.onVisibleBehindCanceled()
 2014-08-28 18:30:34 +00:00
Alan Viverette
16a24bc435 Cancel the date picker dialog when BUTTON_NEGATIVE is clicked 
BUG: 17308290
Change-Id: I2cad1ece9eefc3c48e7574498ff9f79fe60c5f80
 2014-08-28 11:19:59 -07:00
George Mount
de18420aff Merge "Call SharedElementListener#setSharedElementEnd on back." into lmp-dev 2014-08-28 18:05:40 +00:00
George Mount
01abcaa295 Merge "Allow arbitrarily-added shared elements." into lmp-dev 2014-08-28 18:02:27 +00:00
Jose Lima
d3458a9c34 Merge "Renamed Activity.onVisibleBehindCancelled() to Activity.onVisibleBehindCanceled()" into lmp-dev 2014-08-28 17:49:32 +00:00
Christoph Studer
85a384b425 NoListener: Factor out ZEN mode API 
Bug: 17255109
Bug: 17295014
Change-Id: I7e1f6e29b8a23b8e59a8615a8012a86bd5dd22d7
 2014-08-28 19:28:12 +02:00
Winson Chung
48a10a56e9 Change API to return thumbnail size instead of individual dimensions. (Bug 17295512) 
- Fixing issue where we were pulling the thumbnail dimensions too early in AMS. (Bug 17286904)
- Simplifying the Recents code between start & configuration change

Change-Id: I6d667cbf37b844939e5fc466da613bb78ca05082
 2014-08-28 10:23:40 -07:00
Selim Cinek
bef1942fab am 06585ecf: am b6f60439: am 1bebe3c0: Added a warning when the profile has an owner 
* commit '06585ecfc7e33fad947bd073e27ec4f18d804713':
  Added a warning when the profile has an owner
 2014-08-28 14:01:41 +00:00
Selim Cinek
24ac55e658 Added a warning when the profile has an owner 
Also fixed a bug where a post in the QSFooter
was not always on the mainthread leading to a
crash.

Bug: 17066115
Change-Id: Iea9e1032973058ed5e63e70da4dc0bcf34fa59a3
 2014-08-28 15:09:28 +02:00
Esteban Talavera
09f0e2c125 am c1be5a52: am da3a8981: am f734047a: Renamed getUninstallBlocked to isUninstallBlocked 
* commit 'c1be5a52df1c8b3888dd911a882ecbcb88aa5abe':
  Renamed getUninstallBlocked to isUninstallBlocked
 2014-08-28 11:01:36 +00:00
Esteban Talavera
729b2a6c2f Renamed getUninstallBlocked to isUninstallBlocked 
As per API review.

Bug: 17297103
Change-Id: Icb4ceded317b0df4deb0f5221512541a632e150b
 2014-08-28 10:56:18 +01:00
Jose Lima
fcf7083eab Renamed Activity.onVisibleBehindCancelled() to Activity.onVisibleBehindCanceled() 
API review request.

Bug: 17288987
Change-Id: If63f847ce630a57e4aa1e5291befe2863cb7e0c7
 2014-08-27 23:09:05 -07:00
Christopher Tate
cd31d5d9ae Correct misleading javadoc for BackupHelper 
Change-Id: I3865cb3bd55f04baadedb55e9f84fc516eae75b4
 2014-08-27 18:49:37 -07:00
George Mount
ce725a47f6 Allow arbitrarily-added shared elements. 
Bug 17112782

This allows the application developer to set any view as
a shared element so that it will avoid the enter and/or exit
transition. This will allow it to be transitioned along with
the shared element transition as well. It will also allow
the called Activity to return different shared elements than
those passed in.

Change-Id: I7b1f4f029af50dc6e2d5f025062b5669486f6427
 2014-08-27 16:10:46 -07:00
Jim Miller
db72969e93 am 9c9d3c42: am 694a6bbc: am c5cabe2d: Merge "Hide trust agent whitelisting until new API is ready." into lmp-dev 
* commit '9c9d3c4257c1cbd4a7831b28378ff368566bb081':
  Hide trust agent whitelisting until new API is ready.
 2014-08-27 22:06:22 +00:00
Jim Miller
6979cd1e4d am 58c53113: am 56c0e1db: am 61043233: Merge "Change name of confirm credentials method after API review" into lmp-dev 
* commit '58c53113c4fb2cc13ac3e8f37d73fc0dad9b5799':
  Change name of confirm credentials method after API review
 2014-08-27 21:51:36 +00:00
Jim Miller
e193455ee2 Merge "Hide trust agent whitelisting until new API is ready." into lmp-dev 2014-08-27 21:29:12 +00:00
Jim Miller
b1474f4432 Hide trust agent whitelisting until new API is ready. 
Fixes bug 17008504

Change-Id: Ic93d52042e9b6d6f7d634f22aa04642f2da1af32
 2014-08-27 14:27:49 -07:00
Jim Miller
f88c2569e9 Merge "Change name of confirm credentials method after API review" into lmp-dev 2014-08-27 20:42:19 +00:00
Julia Reynolds
f1e13ba1a2 am f7f6b67d: am 68ddd6d9: am e21130fd: Merge "Limit the settings profile/device owners can update." into lmp-dev 
* commit 'f7f6b67dfc68404e9b18e944ff0ef8ae2c0465b0':
  Limit the settings profile/device owners can update.
 2014-08-27 17:28:28 +00:00
Sander Alewijnse
b6c0fc8625 am 12df8729: am 45fb047d: am eb3f4b1c: Merge "Provide lockdown of date/time device owners." into lmp-dev 
* commit '12df87292e529a13ae033cda7197abacdd68b9ee':
  Provide lockdown of date/time device owners.
 2014-08-27 17:05:48 +00:00
Julia Reynolds
19d431f330 Merge "Limit the settings profile/device owners can update." into lmp-dev 2014-08-27 16:49:46 +00:00
Julia Reynolds
9ed66da8df Limit the settings profile/device owners can update. 
Bug: 16351901
Change-Id: Id33a57ad651b5b7b58de0549eb90d5a1fe5c19c5
 2014-08-27 11:49:37 -04:00
Sander Alewijnse
ebaf5c70e9 Merge "Provide lockdown of date/time device owners." into lmp-dev 2014-08-27 14:25:35 +00:00
Dianne Hackborn
b1d1fd0e06 am 7e6e7230: am eb7a0e4e: am 0d006c60: Fix issue #17146552: system anr 
* commit '7e6e7230ebbc7085c2e0bb84741f5f1df0fc45e2':
  Fix issue #17146552: system anr
 2014-08-27 09:47:50 +00:00
Dianne Hackborn
14efe16be5 am e6495bb0: am bad701ee: am 61b7055e: Merge "Fix issue #17179314: Make recents limits consistent" into lmp-dev 
* commit 'e6495bb01be4af93f60dff947b66a8ef474ac2af':
  Fix issue #17179314: Make recents limits consistent
 2014-08-27 09:03:49 +00:00
Dianne Hackborn
5232271a41 Fix issue #17146552: system anr 
Add a safe path for Slog.wtf that doesn't acquire an activity manager
lock or block in any way.

Change-Id: I8fef8251a0cb85081442cae55d85063944248d15
 2014-08-26 22:55:47 -07:00
Jim Miller
d262f6941f am b4a5c851: am b0400d12: am 771ad8b7: Merge "Limit grantTrust() duration to DevicePolicy-imposed limit." into lmp-dev 
* commit 'b4a5c8511288c1a4e234120bbb3b32d0980c47e3':
  Limit grantTrust() duration to DevicePolicy-imposed limit.
 2014-08-27 05:00:45 +00:00
Adam Powell
c55fd9e225 am 3f9989e0: am f6925920: am 78f0a6e5: Merge "Adjust toolbar/action bar title handling" into lmp-dev 
* commit '3f9989e0e7fa5ce8a425bb95d1957126e2630459':
  Adjust toolbar/action bar title handling
 2014-08-27 05:00:30 +00:00
Christopher Tate
0cff332a68 am 569464bb: am 663c889c: am 7bd36619: Merge "Briefly log wallpaper restore outcomes" into lmp-dev 
* commit '569464bbdedb099616015351d1c8ee377f72d737':
  Briefly log wallpaper restore outcomes
 2014-08-27 04:33:58 +00:00
Dianne Hackborn
80e29b66c5 Merge "Fix issue #17179314: Make recents limits consistent" into lmp-dev 2014-08-27 04:31:26 +00:00
Dianne Hackborn
852975d537 Fix issue #17179314: Make recents limits consistent 
The max limit is now 100 (or 50 on svelte devices), and that is
what everyone used.

Re-arranged things so we have a big expensive "fix the world!"
function for recents that we go in to at only select points:
when first initializing the system, when external storage comes
and goes, and if we detect something wrong with the recents
structure.

With that, now getRecentTasks() and addRecentTaskLocked() are
generally much simpler, doing very little work in most cases.
This will help a lot with scaling up to many more recents
entries.

Change-Id: I7b5ae89edc06568f68c8af54a4420aff7635581c
 2014-08-26 21:24:42 -07:00
Jim Miller
d22a667731 Merge "Limit grantTrust() duration to DevicePolicy-imposed limit." into lmp-dev 2014-08-27 03:08:02 +00:00
Jim Miller
bde3d18dd5 Change name of confirm credentials method after API review 
Changed from getConfirmDeviceCredentialIntent to createConfirmDeviceCredentialIntent

Fixes bug 17288988

Change-Id: Iae9a997d9ea49ce23bdbbe38ad7b0763779b8f59
 2014-08-26 19:53:17 -07:00
Adam Powell
4902a89103 Merge "Adjust toolbar/action bar title handling" into lmp-dev 2014-08-27 01:31:18 +00:00
Adam Powell
af2d85973e Adjust toolbar/action bar title handling 
Treat activity title changes as window title changes when propagating
to action bars. This gives it lower priority if a "hard" title has
been set. Fix some lifecycle handling around this that previously
resulted in multiple calls.

Automatically detect the starting display options for a
ToolbarWidgetWrapper if we're not grabbing them from styles. This
prevents setTitle and friends from going totally out to lunch if
constructed around a Toolbar with no starting title.

Bug 17138048

Change-Id: I9f58a3d222546745c8aa873e996b8f0d52a0ad21
 2014-08-26 18:28:17 -07:00
Christopher Tate
1871b9352e Merge "Briefly log wallpaper restore outcomes" into lmp-dev 2014-08-27 00:56:19 +00:00