Wale Ogunwale
5fa84cde30
Merge "Include stack override configurations in onConfigurationChanged() call."
2015-02-10 16:54:03 +00:00
Wale Ogunwale
dea0bbbeea
Merge "Remove ContextImpl.mOverrideConfiguration to reduce code confusion."
2015-02-10 16:49:44 +00:00
Calin Juravle
399f8a6d17
am fd523efc: Merge "Get the instruction set that the libraries of secondary Abi is supported." automerge: d1e074a
...
automerge: 16df82d
* commit '16df82d7ace0dbe625211561ccec9b6faf81debb':
Get the instruction set that the libraries of secondary Abi is supported.
2015-02-10 16:30:46 +00:00
Calin Juravle
16df82d7ac
am fd523efc: Merge "Get the instruction set that the libraries of secondary Abi is supported."
...
automerge: d1e074a
2015-02-10 16:23:51 +00:00
Calin Juravle
fd523efcde
Merge "Get the instruction set that the libraries of secondary Abi is supported."
2015-02-10 16:13:30 +00:00
Jorim Jaggi
b10e33ff80
Split up android.policy into framework.jar and services.jar 1/3
...
Change-Id: Ifd69f1f3dd308a7e17a1442e2f3950da8b03cec4
2015-02-10 14:56:02 +01:00
Robin Lee
85bd63f461
DevicePolicy: clarify wipeData docstring
...
Wiping secondary users or profiles does not cause a reboot.
Bug: 19294240
Change-Id: I59179b6d19061067326ea8ef1a730cc21f52ea53
2015-02-10 11:51:00 +00:00
Wale Ogunwale
b740537044
Remove ContextImpl.mOverrideConfiguration to reduce code confusion.
...
It is not used.
Change-Id: Ie944df17fbc834c54604ea8ff292b6ba0f202690
2015-02-09 16:35:10 -08:00
Wale Ogunwale
c2607b4ece
Include stack override configurations in onConfigurationChanged() call.
...
Important for activities that handle configuration changes.
Change-Id: I4d1612026f293fbb99e1abc17e663f0215658ae6
2015-02-09 16:22:04 -08:00
Dianne Hackborn
28fbf95fc2
Merge "First quick implementation of auto assist data."
2015-02-06 18:45:05 +00:00
Dianne Hackborn
a7bb6fbeab
First quick implementation of auto assist data.
...
Introduce new AssistData class that contains all data
the framework automatically generates for assist. Currently
populated with a very simple tree structure representing
the app's view hierarchy.
Reworked how we populate the class name for accessibility
info, so this is provided through a new method call on View
that subclasses can override. This method is also used
to populate the class name in AssistData.
Change-Id: Ibd0acdc8354727d4291473283b5e4b70894905dc
2015-02-06 10:42:44 -08:00
Kenny Guy
d22517a708
am b6332fd2: am 70fb0ab4: am 8debf213: Merge "Fix mangled javadoc for setPermittedInputMethods." into lmp-mr1-dev
...
automerge: afca061
2015-02-06 16:44:42 +00:00
Kenny Guy
afca06105c
am b6332fd2: am 70fb0ab4: am 8debf213: Merge "Fix mangled javadoc for setPermittedInputMethods." into lmp-mr1-dev
...
* commit 'b6332fd21a97b846015693684cee9e2af3381f0a':
Fix mangled javadoc for setPermittedInputMethods.
2015-02-06 16:37:11 +00:00
Kenny Guy
b6332fd21a
am 70fb0ab4: am 8debf213: Merge "Fix mangled javadoc for setPermittedInputMethods." into lmp-mr1-dev
...
* commit '70fb0ab44e1b8d56f2cbe33d73afd3897c7584d1':
Fix mangled javadoc for setPermittedInputMethods.
2015-02-06 15:37:53 +00:00
Filip Gruszczynski
fe7712e758
am 7acd679c: Merge "Add wallpaper controlling system apis." into lmp-mr1-modular-dev
...
automerge: 96f3462
2015-02-06 00:16:41 +00:00
Filip Gruszczynski
96f3462958
am 7acd679c: Merge "Add wallpaper controlling system apis." into lmp-mr1-modular-dev
...
* commit '7acd679cb3f3c543ad71aaeb1057bcbef3a880e5':
Add wallpaper controlling system apis.
2015-02-06 00:09:41 +00:00
Filip Gruszczynski
9fedc72a0b
Add wallpaper controlling system apis.
...
Change-Id: Ibaa8009e9b9d2e58254a4d9107a316c7f1de2211
2015-02-05 12:29:42 -08:00
Kenny Guy
74a7024af0
Fix mangled javadoc for setPermittedInputMethods.
...
Fix java doc for setPermittedInputMethods.
Bug: 19276777
Change-Id: Iecd670b35cd675ff9dd4654c9876697801eb20ac
2015-02-05 19:48:38 +00:00
Ruben Brunk
35fa2bc2e4
Merge "Add ProcessInfoService to activity manager."
2015-02-03 20:23:04 +00:00
Wale Ogunwale
9d3de4cfb4
Support for activity to opt-in/out of resizeable/multi-window support.
...
Bug: 19178148
Change-Id: I5819a71cdc48e0af4add11a6d4a503ec5cbe5d63
2015-02-02 16:06:55 -08:00
Scott Kennedy
144ea46ce1
Merge "Add some @Nullable annotations to SharedPreferences"
2015-02-02 20:38:10 +00:00
Julia Reynolds
a9ec70ba17
Add skip encryption constants for device owner provisioning.
...
Bug: 19228730
Change-Id: Id5022f2f669cf0dfc1b1523190da52c77238a02c
2015-02-02 12:42:18 -05:00
Ruben Brunk
a27eef432a
Add ProcessInfoService to activity manager.
...
- Adds a new AIDL interface for querying process
information from activity manager.
Bug: 19186859
Change-Id: Ic08858f346d6b66e7bfc9da6faa2c6e38d9b2e82
2015-01-30 16:58:14 -08:00
Scott Kennedy
2333e3406c
Add some @Nullable annotations to SharedPreferences
...
Change-Id: I26e7a02a18d802902fca6892bed77b4f98ccf3ee
2015-01-30 15:37:45 -08:00
Fyodor Kupolov
babdb0dc36
Merge "Removed userHandle from setXXX methods"
2015-01-30 19:21:10 +00:00
Winson Chung
0e0b7310a8
Merge "Adding some debug controls to test multi-window."
2015-01-30 18:43:19 +00:00
Fyodor Kupolov
bdc58c66af
Removed userHandle from setXXX methods
...
User handle is now extracted from UID of the calling process.
Previously setXXX methods may not work properly, if userHandle parameter
was different from a user of the calling process. In practice, this wouldn't
have happened because setters were always called with a userHandle of the
caller process.
Bug:17202572
Change-Id: I1c08c54c975a04b8c54719a1e280ad3cfaff2e67
2015-01-29 17:54:06 -08:00
Winson Chung
d16c565a60
Adding some debug controls to test multi-window.
...
Adding some preliminary controls to mirror the currently exposed api
to create new activity stacks, resize stacks, and to move tasks
between stacks.
Change-Id: I3fb51c248f53a1d4c4eb23ca9fb3a76888def1de
2015-01-29 15:56:58 -08:00
Zhen Yu Song
72c85bbdf8
Merge "+ Add CarExtender to Notification Bug: 18316420"
2015-01-29 22:54:29 +00:00
Zhen Yu Song
9d5528ba9f
+ Add CarExtender to Notification
...
Bug: 18316420
Change-Id: Idd7a06c2271d62c603014038fbe5a0bbacb0ed78
2015-01-29 14:27:28 -08:00
Jose Lima
43181fb72d
am 4a40f7cc: Merge "Fix crash caused by disabling the Options panel on TVs" into lmp-mr1-dev automerge: 1f81973
...
automerge: 485f6a6
2015-01-28 21:32:37 +00:00
Jose Lima
485f6a60e0
am 4a40f7cc: Merge "Fix crash caused by disabling the Options panel on TVs" into lmp-mr1-dev automerge: 1f81973
...
* commit '4a40f7cc90d8f908527d2cfff32376ee51259250':
Fix crash caused by disabling the Options panel on TVs
2015-01-28 21:27:33 +00:00
Jose Lima
bd769a15ab
Fix crash caused by disabling the Options panel on TVs
...
Address more cases where calls to getPanelState may cause a crash when the
options panel is disabled on a platform.
Bug: 19178531
Bug: 18780696
Change-Id: Ib72bb8483e636181788ed3919c4cb9e99a94b7b1
2015-01-28 10:46:39 -08:00
George Mount
206db8a70f
am fff84a23: Merge "Activity Transition: fix quick back after enter." into lmp-mr1-dev automerge: aa6945a
...
automerge: 5c25f5b
2015-01-27 23:30:18 +00:00
Wale Ogunwale
783f28691e
Merge "Support activities in the same process having different resources."
2015-01-27 22:24:15 +00:00
Jose Lima
ceba619e36
am 445768bd: am 3fd8a433: Merge "Allow disabling the Options Pannel feature for TVs" into lmp-mr1-dev
...
automerge: 69fbcf1
2015-01-27 17:57:04 +00:00
Wale Ogunwale
60454dbc4d
Support activities in the same process having different resources.
...
Activities can be of various sizes in a multi-window environment.
This change allows them to have override configurations that allows
different resources to the loaded if needed.
Bug: 19002213
Change-Id: Ib2c7be0b427f5ce05e7a362bcdd496ddbc9164f0
2015-01-27 07:50:58 -08:00
George Mount
5c25f5b0a7
am fff84a23: Merge "Activity Transition: fix quick back after enter." into lmp-mr1-dev automerge: aa6945a
...
* commit 'fff84a232a964a8587eabee4e34cc38344309593':
Activity Transition: fix quick back after enter.
2015-01-27 15:21:23 +00:00
George Mount
aa6945ac79
Merge "Activity Transition: fix quick back after enter." into lmp-mr1-dev
2015-01-27 15:13:32 +00:00
Jose Lima
69fbcf1f10
am 445768bd: am 3fd8a433: Merge "Allow disabling the Options Pannel feature for TVs" into lmp-mr1-dev
...
* commit '445768bddf00256195a46b78ed35ea3722df7c92':
Allow disabling the Options Pannel feature for TVs
2015-01-27 03:10:28 +00:00
Jose Lima
7a22fc62d3
Allow disabling the Options Pannel feature for TVs
...
- Added a config entry in velues-television to disable the options panel
feature for TVs.
- Fixed parts of the code in PhoneWindow that assumed this feature is supposed
to always be available, which was causing exceptions when it was turned off.
Bug: 18780696
Change-Id: I923bd4b5019d634e5352a6e893005133edb475f6
2015-01-26 17:39:49 -08:00
George Mount
fbd459642f
Activity Transition: fix quick back after enter.
...
Bug 19105460
When an Activity Transition was receiving an exit call
immediately after the enter, the transition for the enter
was still in progress. TransitionManager does not allow
multiple transitions to work at once, so the enter transition
would run, but the exit did not. This CL detects when the
enter transition is still pending and tells the
ActivityTransitionState to delay one frame so that the
enter can finish its required work prior to starting the
exit transition.
Change-Id: I1b40f1e41d61a67da3fd672419ea321e7d0496da
2015-01-26 15:59:42 -08:00
Jim Miller
8abb6d5e9f
am 0ac8dfa3: Merge "Clarify getTrustAgentConfiguration() documentation." into lmp-mr1-dev automerge: ffd1a49
...
automerge: 54dbd1f
2015-01-22 02:50:25 +00:00
Jim Miller
54dbd1fd43
am 0ac8dfa3: Merge "Clarify getTrustAgentConfiguration() documentation." into lmp-mr1-dev automerge: ffd1a49
...
* commit '0ac8dfa37bf089ade3760a8d703c6a79d98f5ca2':
Clarify getTrustAgentConfiguration() documentation.
2015-01-22 02:45:16 +00:00
Dianne Hackborn
4da9bbbbd9
Merge "Bring back voice interaction APIs."
2015-01-21 23:45:55 +00:00
Dianne Hackborn
4e106cedfe
Bring back voice interaction APIs.
...
Change-Id: I6039d7c0b188ac342441c56f7d19994b9a80ba17
2015-01-21 15:07:20 -08:00
Craig Mautner
7b15552692
Merge "Refactor removeApp and removeTask for last removals."
2015-01-21 22:19:25 +00:00
Craig Mautner
e3119b7d35
Refactor removeApp and removeTask for last removals.
...
Move app token removal to the AppWindowToken class so cleanup can
be done locally. Move task removal to the Task class so cleanup can
be done locally. Call task removal when the last app is removed.
Merge actions done prior to method calls into methods.
Fixes bug 18088522 item #12 .
Change-Id: I5ce85d2bb309ceb82bd7404e27a56a7c31cd7359
2015-01-21 13:57:24 -08:00
Jim Miller
b5db57a27d
Clarify getTrustAgentConfiguration() documentation.
...
Fixes bug 18983802
Change-Id: I2f6e208cdd4fac95d1d0228bec3de8199baafa57
2015-01-21 21:01:02 +00:00
Dianne Hackborn
4b94649ce3
Merge "Work on issue #18201239 : ANRs in com.google.process.gapps:" into lmp-mr1-dev automerge: 2132695 automerge: 5346a21
...
automerge: f6b4b1a#18201239 : ANRs in com.google.process.gapps:
2015-01-21 19:00:55 +00:00
