Commit Graph

44883 Commits

Author SHA1 Message Date
Michael Wright
17f7fa5cfe am f7898245: am d0f6975b: Merge "Change constant to PowerManager#FLAG_WAIT_FOR_DISTANT_PROXIMITY" into lmp-dev
* commit 'f7898245a265106672ff29f35289c703ed50c7ce':
  Change constant to PowerManager#FLAG_WAIT_FOR_DISTANT_PROXIMITY
2014-08-28 03:38:00 +00:00
Filip Gruszczynski
bbc0f67195 am 2a81e91f: am 21187a7a: Merge "Allowing isRound and outsetBottom properties to be passed to ActivityView." into lmp-dev
* commit '2a81e91f63c14ddf04c82a124096553c36924344':
  Allowing isRound and outsetBottom properties to be passed to ActivityView.
2014-08-28 03:37:54 +00:00
Christopher Tate
cd31d5d9ae Correct misleading javadoc for BackupHelper
Change-Id: I3865cb3bd55f04baadedb55e9f84fc516eae75b4
2014-08-27 18:49:37 -07:00
Selim Gurun
d576bf310b Merge "Address API Feedback" into lmp-dev 2014-08-28 01:47:31 +00:00
John Reck
4c5a27b5f6 Merge "Animator stuff" into lmp-dev 2014-08-28 01:38:58 +00:00
Svetoslav
040a7f0526 Merge "Fix live region updates." into lmp-dev 2014-08-28 01:37:43 +00:00
Dianne Hackborn
7d9eefd871 Fix issue #16953886: History and batterystats checkin summary...
...start timestamps are in 1970s

Look for the wall clock time being very small, and try to update
it to a better value if we see one.

Also handle time change events to update the current time we a re
tracking.

Change-Id: Ifbae2b8c43ab5baa75ee4f672a752a542e23b52d
2014-08-27 18:30:31 -07:00
Selim Gurun
17d1adb183 Address API Feedback
Bug: 17253647

This is Part I of API feedback. It does not address portions
of the feedback that is still pending a response from API council.

Change-Id: I6ae250c6455a5545912623aeb34332d564fffde7
2014-08-27 17:56:08 -07:00
John Reck
119907cd25 Animator stuff
Bug: 17228458

Change-Id: Id884a429a512f9cd2be0ed16dbd0f10e92b4440d
2014-08-27 17:44:25 -07:00
Yorke Lee
fe7c3bc082 Merge "Update value of EXTRA_CALL_TYPE_FILTER" into lmp-dev 2014-08-28 00:16:27 +00:00
Eino-Ville Talvala
c346bbf748 Camera2: Make sure aborting captures on an idle device works.
Check if device is already idle, and if so, don't actually flush,
just fire the busy/idle callbacks to the session.

Bug: 17306157
Change-Id: I7ba416c6014c7bc1edcad07910aa0aff232af8b0
2014-08-27 17:05:29 -07:00
Michael Wright
b4558af745 Merge "Change constant to PowerManager#FLAG_WAIT_FOR_DISTANT_PROXIMITY" into lmp-dev 2014-08-28 00:00:56 +00:00
Ian Rogers
d8e34a6a0d Make a field final.
Make a field that can be final, final.

Change-Id: I597ef43bad5045a63e7e9fe6eedd8e0f0a637ca4
2014-08-27 16:32:57 -07:00
Yorke Lee
52e7750184 Update value of EXTRA_CALL_TYPE_FILTER
Bug: 17253963
Change-Id: I1e98fc2a25b0bc807b0b4d1af2941da6660e09e0
2014-08-27 16:28:12 -07:00
Filip Gruszczynski
30a480bcfc Merge "Allowing isRound and outsetBottom properties to be passed to ActivityView." into lmp-dev 2014-08-27 23:22:29 +00: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
Filip Gruszczynski
f14d924cd7 Allowing isRound and outsetBottom properties to be passed to ActivityView.
We remove requirement for having display id == 0 or allow circumventing it
through a flag.

Change-Id: Ia4671614b51894393d47e681cc72718d394230f6
2014-08-27 15:38:24 -07:00
Michael Wright
219857b900 Change constant to PowerManager#FLAG_WAIT_FOR_DISTANT_PROXIMITY
Also add docs to PowerManager.WakeLock#release(int)

Bug: 17290118
Change-Id: Ibcbc4279efdd0f275808042356e6ff843958e23f
2014-08-27 15:37:27 -07:00
Jeff Sharkey
5b836f29a3 Define EXTRA_SIZE for ContentProviders.
Also make Size and SizeF parcelable.

Bug: 17205016
Change-Id: Ide397b84864f6cad7f8d89e66b6c8697a3ad335b
2014-08-27 15:13:57 -07:00
Jim Miller
21219ffcce am 694a6bbc: am c5cabe2d: Merge "Hide trust agent whitelisting until new API is ready." into lmp-dev
* commit '694a6bbcc6c49a76fae440fdadab16879556c7bf':
  Hide trust agent whitelisting until new API is ready.
2014-08-27 21:52:59 +00:00
Robert Greenwalt
fc0c6890c6 Clean up Connectivity Logging.
bug:17285109
Change-Id: I61b98aa636996f8d4915fd954d49a22c20cfe9ab
2014-08-27 14:49:14 -07:00
Jim Miller
bb22e2a7a4 am 56c0e1db: am 61043233: Merge "Change name of confirm credentials method after API review" into lmp-dev
* commit '56c0e1db523779ee7856ac196b7370b7433142b3':
  Change name of confirm credentials method after API review
2014-08-27 21:36:53 +00:00
Eino-Ville Talvala
bf8a6d77b0 am 4046697e: am 579442e8: Merge "Camera2: Correct error handling" into lmp-dev
* commit '4046697e3a6b409e8bcd76a06b3d457814c8f444':
  Camera2: Correct error handling
2014-08-27 21:35:42 +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
Jae Seo
cfd861ec15 Add android.software.live_tv feature
This feature will be listed by Android TV devices that allow displaying
contents from TV inputs implemented with the
android.media.tv.TvInputService API. (Note that not all leanback devices
support this feature.)

Bug: 17284986
Change-Id: Ic1f23f6f5955866e9f1db9229693d370576066a3
2014-08-27 14:02:15 -07:00
Craig Mautner
85b764e22b Update window always on convertTo/FromTranslucent
Previously we would only update the window if the activity's
translucency was changed. That meant that if the window was
opaque for a translucent activity, transitioning to translucent
would not change the window to translucent. This change forces
the window to follow the convertToTranslucent and
convertFromTranslucent calls.

Also fix for setting background on enter and exit transitions.

Partial fix for 16215650.

Change-Id: I86ea68e4bbf604d0cc60cc6e34bf8090199525d6
2014-08-27 13:45:10 -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
Yigit Boyar
6490644b4d Use a weak observable in AutoCompleteTextView
If adapter has longer life span than AutoCompleteTextView, it may leak
the View. This change prevents it by using a static observer with a
weak reference to the actual TextView.

Bug: 11287688
Change-Id: I2c9db94dfa1be3b3f5368406e557f3e8e34bbce9
2014-08-27 13:31:24 -07:00
Julia Reynolds
b53453fae0 Audio/Micrphone user restriction/multiuser updates.
1. Persist microphone mute state.
2. Set mute state for correct user.
3. Check for settings restrictions as the correct user.

Bug: 17177502
Bug: 16701642
Change-Id: Id8b6cd90c5caceb67fbec862f90aac7ec7a00b3c
2014-08-27 16:25:00 -04:00
Adam Lesinski
c5bf108e70 Make UsageStats API comply with API Council
- Fix documentation to mention units of time in APIs.
- Return a Map instead of an ArrayMap

Bug:17289531
Change-Id: I8b07a5328a01a0f490b62bc5d9b83c959a3e79c7
2014-08-27 11:57:46 -07:00
Eino-Ville Talvala
acc0095bc8 Camera2: Correct error handling
- Report capture failures from service to application
- Only go to error state for device-level errors
- Adjust binder interface method names to match the service side names
- Reduce failed session creation logging
- Don't fire CaptureSession.onActive for CameraDevice.onBusy
- Check with session to determine capture failure reason

Bug: 17160301
Bug: 15524101
Bug: 14448494
Bug: 11272459

Change-Id: I9dd606004fd7845910dc865738fbe17f1640f07d
2014-08-27 11:08:18 -07:00
Sandeep Siddhartha
ee16bdc33d Address API review comments
- Make Callback an abstract class
- Split manage intents into 3 different methods
- Remove RECOGNITION_FLAGS_NONE

Bug: 17255602
Change-Id: I1329f889bb2ab35938f42d2ecfe755d2b17ec542
2014-08-27 10:23:35 -07:00
Julia Reynolds
cf24b10343 am 68ddd6d9: am e21130fd: Merge "Limit the settings profile/device owners can update." into lmp-dev
* commit '68ddd6d92d3b09b4f6ecdb9621b7997414d501e2':
  Limit the settings profile/device owners can update.
2014-08-27 17:13:04 +00:00
Makoto Onuki
42f8a09c81 am 1a8674f1: am d37368bf: Address API review comments:
* commit '1a8674f1025336fb6ae1bc28a70fcdfd597a6f15':
  Address API review comments:
2014-08-27 16:53:14 +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
Makoto Onuki
0e917336a2 Address API review comments:
- Rename isCorpContactId() to isEnterpriseContactId().
- Update EXTRA_* constant values.
- Update javadoc on NAME_VERIFIED.

Bug 17253963

Change-Id: I1bef3adbb4125b39129c77cca29c4b8089e1f8cc
2014-08-27 16:29:40 +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
c3b7c6693b am 45fb047d: am eb3f4b1c: Merge "Provide lockdown of date/time device owners." into lmp-dev
* commit '45fb047dab5a96a9ec72c6cf6aa168f80b115d5c':
  Provide lockdown of date/time device owners.
2014-08-27 14:43:10 +00:00
Sander Alewijnse
ebaf5c70e9 Merge "Provide lockdown of date/time device owners." into lmp-dev 2014-08-27 14:25:35 +00:00
Russell Brenner
ac7334d4fd am c04b259a: am d1d4a28a: Merge branch \'lmp-dev\' of https://googleplex-android.googlesource.com/_direct/platform/frameworks/base into lmp-dev
* commit 'c04b259aa962616089994c8cf225ff396feb1c83':
  Print services setting changes not handled for managed profiles.
2014-08-27 06:32:14 +00:00
Dianne Hackborn
940434def1 am eb7a0e4e: am 0d006c60: Fix issue #17146552: system anr
* commit 'eb7a0e4e9bcb6a18655c4f349c90216011406d75':
  Fix issue #17146552: system anr
2014-08-27 06:20:11 +00:00
Svetoslav
948397a453 Merge "Print services setting changes not handled for managed profiles." into lmp-dev 2014-08-27 06:13:23 +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
Dianne Hackborn
3cc8dbb87e am bad701ee: am 61b7055e: Merge "Fix issue #17179314: Make recents limits consistent" into lmp-dev
* commit 'bad701ee645948d92982bad90e4d4cfc868e6816':
  Fix issue #17179314: Make recents limits consistent
2014-08-27 04:53:23 +00:00
Jim Miller
bdc2da026f am b0400d12: am 771ad8b7: Merge "Limit grantTrust() duration to DevicePolicy-imposed limit." into lmp-dev
* commit 'b0400d12f8f2dd4ad8088fef9c13dcf37bcb9837':
  Limit grantTrust() duration to DevicePolicy-imposed limit.
2014-08-27 04:46:25 +00:00
Adam Powell
a80c4a2296 am f6925920: am 78f0a6e5: Merge "Adjust toolbar/action bar title handling" into lmp-dev
* commit 'f692592004f011759d9a79824c156b51ab10da13':
  Adjust toolbar/action bar title handling
2014-08-27 04:46:11 +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
Christopher Tate
584cce1ce9 am 663c889c: am 7bd36619: Merge "Briefly log wallpaper restore outcomes" into lmp-dev
* commit '663c889c750023e6c7109a57f33034a96432fd35':
  Briefly log wallpaper restore outcomes
2014-08-27 04:20:12 +00:00