Chong Zhang
fdb5d2f7ce
Merge "Carry over app token when preserving window"
2015-09-29 21:11:36 +00:00
Chong Zhang
a8be1b99ec
Carry over app token when preserving window
...
Otherwise the token in the window's attr will be null after relaunch.
When this attr is updated with WindowManagerGlobal, setStoppedState()
will no longer find the view from the token.
bug: 24404382
Change-Id: Ib6935b03346a84dd023e224f72896041fda9dcd5
2015-09-29 13:58:46 -07:00
Abodunrinwa Toki
66e47b6aa1
Merge "FloatingToolbarEspressoUtils + more TextView selection by touch tests"
2015-09-29 18:44:41 +00:00
Wale Ogunwale
e5ec210bb1
Merge "Inform activity manager of stack/task rotation bounds changes in WM"
2015-09-29 18:14:08 +00:00
Alan Viverette
7141cba640
Merge "Clear stack trace from re-thrown inflater exceptions"
2015-09-29 16:25:42 +00:00
Alan Viverette
9dccff0878
Merge "Unhide PopupWindow.getMaxAvailableHeight(View, int, boolean)"
2015-09-29 16:24:42 +00:00
Abodunrinwa Toki
8a5e1ae2f4
FloatingToolbarEspressoUtils + more TextView selection by touch tests
...
Bug: 24102650
Change-Id: Idd7d8b29ad8cfdf10d75137762bb1cb677bda6b7
2015-09-29 15:27:11 +01:00
Nicolas Prévot
8392b394f2
Merge "Add more methods that take a userId to PackageManager."
2015-09-29 10:00:56 +00:00
Chris Tate
f7560a697c
Merge "Fix symlink handling during backup"
2015-09-29 00:16:51 +00:00
Fyodor Kupolov
76ce8473ca
Merge "Fixed VPN support for restricted profiles in split system user model"
2015-09-29 00:04:45 +00:00
Fyodor Kupolov
1c36315a36
Fixed VPN support for restricted profiles in split system user model
...
In a new split system user model, owner of a restricted profile is not limited
to just user0. restrictedProfileParentId field should be used to get an owner.
Bug: 22950929
Change-Id: I928319a9450e543972237a42267eb2404e117c83
2015-09-28 16:44:04 -07:00
Bill Rassieur
84b6bb1826
am 6e78bb42: am 2711eb4c: am 3de2d53a: am c25d5460: Merge "Fix jank: Don\'t write lockout deadline if not needed" into mnc-dr-dev
...
* commit '6e78bb42fc8af64f4f2208b48585451793e303c9':
Fix jank: Don't write lockout deadline if not needed
2015-09-28 23:30:29 +00:00
Bill Rassieur
6e78bb42fc
am 2711eb4c: am 3de2d53a: am c25d5460: Merge "Fix jank: Don\'t write lockout deadline if not needed" into mnc-dr-dev
...
* commit '2711eb4c3950ee0b5776c07957f0af3c31aa1c67':
Fix jank: Don't write lockout deadline if not needed
2015-09-28 23:19:32 +00:00
Bill Rassieur
3de2d53a75
am c25d5460: Merge "Fix jank: Don\'t write lockout deadline if not needed" into mnc-dr-dev
...
* commit 'c25d546050423845c42a5e8cc8e356caa1f4f71a':
Fix jank: Don't write lockout deadline if not needed
2015-09-28 23:09:10 +00:00
Bill Rassieur
c25d546050
Merge "Fix jank: Don't write lockout deadline if not needed" into mnc-dr-dev
2015-09-28 23:02:46 +00:00
Wale Ogunwale
1ed0d89e7e
Inform activity manager of stack/task rotation bounds changes in WM
...
Change-Id: I342093d8af1d397ab4894146f9b288bdfdc464f0
2015-09-28 15:58:37 -07:00
Jorim Jaggi
e3e6d56b94
Fix jank: Don't write lockout deadline if not needed
...
In the longterm, we should move these synchronous writes
off the main thread, but in the short term, avoiding an unnecessary
write is good enough for the main case.
Bug: 24471234
Change-Id: Id996ff29e61410cd077760a06d7868a413ae88da
2015-09-28 13:57:37 -07:00
Alan Viverette
b854d07a1a
Unhide PopupWindow.getMaxAvailableHeight(View, int, boolean)
...
Bug: 24394572
Change-Id: If66fa0178ed0d8c8d78e286a8b928ad88d6e90fa
2015-09-28 16:12:18 -04:00
Fyodor Kupolov
02cb6e773b
Added --restricted option for create-user command
...
Also moved restricted profile create/setup logic from Settings to
UMS.createRestrictedProfile.
Bug: 24212155
Bug: 24303609
Change-Id: I0346a3368de53f4bb4b6e054349f19adac959d7f
2015-09-28 10:01:54 -07:00
Adam Lesinski
f4a09907e9
am 983c6d4d: am b8126531: am d913782f: am d5f10154: Bump BatteryStats version
...
* commit '983c6d4d39265346a088174482f1f0dc55c0ca31':
Bump BatteryStats version
2015-09-28 07:19:32 +00:00
Adam Lesinski
983c6d4d39
am b8126531: am d913782f: am d5f10154: Bump BatteryStats version
...
* commit 'b8126531c4275b5caf0132930a2cfc14344c20ce':
Bump BatteryStats version
2015-09-28 07:12:49 +00:00
Adam Lesinski
d913782f1b
am d5f10154: Bump BatteryStats version
...
* commit 'd5f10154c772b925f6527e25aeb8461de8c710cd':
Bump BatteryStats version
2015-09-28 07:00:52 +00:00
Filip Gruszczynski
f77a6dbac6
Merge "Refactoring: Delete AppWindowToken.willBeHidden field."
2015-09-27 21:50:49 +00:00
Adam Lesinski
d5f10154c7
Bump BatteryStats version
...
Bug:24434303
Change-Id: I697deb30c211c77c36cdd810259507f965f3b93b
2015-09-27 21:28:43 +00:00
Bryce Lee
535570a7ce
am 979a22ea: am 6ad696c3: am f0740e0a: Merge "Add ThermalObserver system service to capture thermal state uevents." into cw-e-dev
...
* commit '979a22eaf9c62637c02ebd6f92ef6ea2888aa5be':
Add ThermalObserver system service to capture thermal state uevents.
2015-09-27 15:11:22 +00:00
Ned Burns
e061a5922a
am 99fa24ff: am 11b87b91: am 1b69fcbf: am f4e1d10c: Kill ActivityView\'s background thread when it\'s destroyed
...
* commit '99fa24ff71d93419fd9d922fa0b6bc64162e32be':
Kill ActivityView's background thread when it's destroyed
2015-09-27 15:10:58 +00:00
Filip Gruszczynski
8aafd3a81b
Refactoring: Delete AppWindowToken.willBeHidden field.
...
The only time AppWindowToken.willBeHidden is used is for determining
if the app should contribute to calculating orientation. In the same
check AppWindowToken.hiddenRequested will be or-ed with willBeHiden,
so it's enough that hiddenRequested to be set.
The only place where willBeHidden is set, is right before
WMS.setAppVisibility is called, which will set hiddenRequested.
Because of this willBeHidden is unnecessary.
Change-Id: Iea35f39f72e7f0dcd76205ef580f3a74cac72d08
2015-09-26 15:40:58 -07:00
Bryce Lee
979a22eaf9
am 6ad696c3: am f0740e0a: Merge "Add ThermalObserver system service to capture thermal state uevents." into cw-e-dev
...
* commit '6ad696c35b80f70f19de304b53bdbfc6f5a265d8':
Add ThermalObserver system service to capture thermal state uevents.
2015-09-26 06:55:22 +00:00
Ned Burns
99fa24ff71
am 11b87b91: am 1b69fcbf: am f4e1d10c: Kill ActivityView\'s background thread when it\'s destroyed
...
* commit '11b87b9109717b30729e2ce01ac5014ba91c1051':
Kill ActivityView's background thread when it's destroyed
2015-09-26 06:54:22 +00:00
Bart Sears
b1755d8b49
Merge "Revert "Added --restricted option for create-user command""
2015-09-26 02:02:15 +00:00
Bart Sears
9249a90977
Revert "Added --restricted option for create-user command"
...
This reverts commit 737b216b5c .
Change-Id: I4c43967933bb2e46cdb8ad6e643d7037d722cab2
2015-09-26 01:58:59 +00:00
Bryce Lee
f0740e0a2e
Merge "Add ThermalObserver system service to capture thermal state uevents." into cw-e-dev
2015-09-26 01:33:00 +00:00
Bryce Lee
bc58f59da6
Add ThermalObserver system service to capture thermal state uevents.
...
Bug: 21445745
Change-Id: I980d60b66ca51942a1fd62502d6cf1f09208fc3a
2015-09-25 16:43:01 -07:00
Todd Kennedy
f36f4f5845
Merge "resolved conflicts for 389bb7f5 to master"
2015-09-25 22:58:27 +00:00
Todd Kennedy
56ebb25708
resolved conflicts for 389bb7f5 to master
...
Change-Id: I9c3474577166cc91c50d32d225957fbd13c205bf
2015-09-25 15:57:11 -07:00
Fyodor Kupolov
9265189f77
Merge "Added --restricted option for create-user command"
2015-09-25 22:48:05 +00:00
Todd Kennedy
389bb7f509
am 9f860264: resolved conflicts for 7de7e0b0 to stage-aosp-master
...
* commit '9f8602644418ecfb1a5c9555792ceed285fa72bd':
Pass dexopt flags as integer
2015-09-25 22:17:06 +00:00
Todd Kennedy
9f86026444
resolved conflicts for 7de7e0b0 to stage-aosp-master
...
Change-Id: I4e45e5bbaebb98b0e740167eaf7517f99d917f30
2015-09-25 15:06:49 -07:00
Ned Burns
1b69fcbf81
am f4e1d10c: Kill ActivityView\'s background thread when it\'s destroyed
...
* commit 'f4e1d10cd35a4c1f87ec6dc3e59a9d08e562ffca':
Kill ActivityView's background thread when it's destroyed
2015-09-25 21:10:09 +00:00
Oren Blasberg
b8c7ef5eaf
Merge "Make context menus show as popup menus."
2015-09-25 21:09:18 +00:00
Todd Kennedy
fa54ab7950
Pass dexopt flags as integer
...
Instead of using a series of booleans, create a single flags integer
that contains all of the dexopt options.
Change-Id: Ia8fa968f64b164267f43dd29cea9dc0413058125
2015-09-25 13:52:33 -07:00
Alan Viverette
8f12481802
Clear stack trace from re-thrown inflater exceptions
...
We don't need intermediate stack traces for re-thrown inflater
exceptions. Yes, we care that you failed to inflate some class.
No, we don't care how many times you recursed in LayoutInflater
before you got there.
Change-Id: Ie9bba7cebab6cdf73ceead49f080dcf23e0a9f25
2015-09-25 15:17:05 -04:00
Oren Blasberg
ed3912692f
Make context menus show as popup menus.
...
This means that right-clicking/long pressing on a view that is registered for
context menu will show the context menu as a popup menu instead.
Bug: 20016398
Change-Id: I96fea60435fff2f981d288521f490f8ff24ada15
2015-09-25 12:01:01 -07:00
Gus Prevas
efca0aa919
am 3197cd36: am 41110261: am b17d1e5e: Merge "Adds an option to override RemoteViews transition." into cw-e-dev
...
* commit '3197cd36fef11b1fdd59bdd341f65f9f2364ed2a':
Adds an option to override RemoteViews transition.
2015-09-25 18:59:45 +00:00
Jorim Jaggi
fc832e3ef2
resolved conflicts for c594e935 to master
...
Change-Id: Ifaf8c6c2b80e5284e027278f5ff0437202439cf0
2015-09-25 11:54:05 -07:00
Fyodor Kupolov
737b216b5c
Added --restricted option for create-user command
...
Also moved restricted profile create/setup logic from Settings to
UMS.createRestrictedProfile.
Bug: 24212155
Bug: 24303609
Change-Id: I5f0d48bcbd3c0b51927926b874fd057c15ac5219
2015-09-25 11:22:13 -07:00
Gus Prevas
3197cd36fe
am 41110261: am b17d1e5e: Merge "Adds an option to override RemoteViews transition." into cw-e-dev
...
* commit '41110261bb4f9f733b579b3dc26d3d6de5642ef5':
Adds an option to override RemoteViews transition.
2015-09-25 18:09:41 +00:00
Jorim Jaggi
c594e9354a
am f9f9999d: am b7b9b31f: am ad26dc5f: Merge "Deliver camera launch source for analytics" into mnc-dr-dev
...
* commit 'f9f9999d3245dffc8463a1f3f5f74dc900aa0196':
Deliver camera launch source for analytics
2015-09-25 18:07:52 +00:00
Gus Prevas
b17d1e5e6a
Merge "Adds an option to override RemoteViews transition." into cw-e-dev
2015-09-25 17:17:44 +00:00
Gus Prevas
1ed322b123
Adds an option to override RemoteViews transition.
...
This change adds a configuration option,
"config_overrideRemoteViewsActivityTransition", which is false by
default and true on watches. If it's true, when a RemoteViews
is clicked, it will use a new attribute on the active window animation
style, "activityOpenRemoteViewsEnterAnimation", to determine
the entry transition to use, instead of the current hard-coded
default.
Bug: 23534750
Change-Id: I91e92804a663ab71a3e46c3430fa579b87cc7931
2015-09-25 13:10:52 -04:00