Craig Mautner
deba7bb0ca
am 798adeff: Don\'t use transient states for wallpaper animation.
...
* commit '798adeffb0b9c22707b493895453e7dd2f608b75':
Don't use transient states for wallpaper animation.
2013-10-22 14:58:12 -07:00
Craig Mautner
798adeffb0
Don't use transient states for wallpaper animation.
...
The WindowManagerService member mLowerWallpaperTarget is not stable
throughout an app transition. Relying on it to be stable causes the
intra-wallpaper animation to start out right but after the windows
have been relayed out there is no longer a lower wallpaper target.
This causes the wallpaper to start tracking the animation of the
current wallpaper target rather than remain stable.
Switching to a new variable that saves the state of wallpaper
animation at the start of the animation fixes bug 11240590.
Change-Id: I336a59c47665fcf61019f567b8663956ff0e4940
2013-10-22 14:50:52 -07:00
Costin Manolache
ec1bd6e5b2
Merge "Remove the warning if the caller gets the insecure variant and add hostname verification (SNI)"
2013-10-22 20:24:26 +00:00
Craig Mautner
dd2399a0d9
am 74897f07: am d37d1859: am 40006309: Merge "Check for home activity when switching focus." into klp-dev
...
* commit '74897f07491078e14282b30174cf14c9815d8dc0':
Check for home activity when switching focus.
2013-10-22 13:09:22 -07:00
Craig Mautner
74897f0749
am d37d1859: am 40006309: Merge "Check for home activity when switching focus." into klp-dev
...
* commit 'd37d1859794e72ea6f9b98f83bf004a4364b4b2d':
Check for home activity when switching focus.
2013-10-22 13:07:00 -07:00
Craig Mautner
d37d185979
am 40006309: Merge "Check for home activity when switching focus." into klp-dev
...
* commit '40006309990c40f5b4b26646b98df222d8d27922':
Check for home activity when switching focus.
2013-10-22 13:04:07 -07:00
Craig Mautner
4000630999
Merge "Check for home activity when switching focus." into klp-dev
2013-10-22 20:01:12 +00:00
Baligh Uddin
52c2365cb7
am 9dd9445a: (-s ours) am b1c3072c: (-s ours) am d94b7ffc: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
...
* commit '9dd9445a365f77e1b45af39218e31df764238f32':
Import translations. DO NOT MERGE
2013-10-22 12:57:14 -07:00
Baligh Uddin
ea4ad2dba8
am f04e6695: (-s ours) am 501633dd: (-s ours) am f56d8694: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
...
* commit 'f04e66953b8d6f694b4cc2e80cb8cc0212d31443':
Import translations. DO NOT MERGE
2013-10-22 12:57:09 -07:00
Baligh Uddin
9dd9445a36
am b1c3072c: (-s ours) am d94b7ffc: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
...
* commit 'b1c3072ca3cf6835b43d2e7152b284d00bdcdadf':
Import translations. DO NOT MERGE
2013-10-22 12:55:18 -07:00
Baligh Uddin
f04e66953b
am 501633dd: (-s ours) am f56d8694: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
...
* commit '501633dd45858159255447f7b4118a80b44bbcae':
Import translations. DO NOT MERGE
2013-10-22 12:55:15 -07:00
Baligh Uddin
b1c3072ca3
am d94b7ffc: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
...
* commit 'd94b7ffc2e621a48bed9f10fa03dcc7508fce8ce':
Import translations. DO NOT MERGE
2013-10-22 12:52:23 -07:00
Baligh Uddin
501633dd45
am f56d8694: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
...
* commit 'f56d8694f224ef7082c48a227d18d5612a4cfe11':
Import translations. DO NOT MERGE
2013-10-22 12:52:16 -07:00
Baligh Uddin
530bdf0814
Merge "Import translations. DO NOT MERGE"
2013-10-22 19:48:17 +00:00
Baligh Uddin
d94b7ffc2e
Merge "Import translations. DO NOT MERGE" into klp-dev
2013-10-22 19:48:12 +00:00
Baligh Uddin
d271d054a9
Merge "Import translations. DO NOT MERGE"
2013-10-22 19:48:09 +00:00
Baligh Uddin
f56d8694f2
Merge "Import translations. DO NOT MERGE" into klp-dev
2013-10-22 19:48:05 +00:00
Craig Mautner
04f0b70c13
Check for home activity when switching focus.
...
When finishing or stopping an activity the code was automatically
refocusing to the next activity on the same stack independent of the
task's onTopOfHome flag. When the activity eventually finished or
stopped it would then honor the onTopOfHome flag.
This fix examines the onTopOfHome flag and arranges the focus
correctly if home is the next activity to run.
Fixes bug 11318263.
Change-Id: I73a8f5e82de04b01acaffe366b085f9e475e1451
2013-10-22 12:31:01 -07:00
Satoshi Kataoka
d7443c83ce
Notify commitText event to InputMethodManagerService
...
for the intelligent subtype switching
Bug: 7043015
Change-Id: I11ed9a767588f8080753cd9bce011dac7db579ad
2013-10-23 04:14:43 +09:00
John Spurlock
a81736a74d
Ensure the simple CAB appears below the status bar.
...
When the contextual action bar is not in overlay mode,
the screen layout is a linear layout. (screen_simple.xml)
Ensure the standalone CAB appears below the status bar,
consumes the top offset (to avoid content application below it)
and fill in the status area with a guard view for background
protection.
Bug:10014069
Change-Id: I614f16dfa77367a94808aef54710ffebd66e1ca8
2013-10-22 13:51:52 -04:00
Craig Mautner
d8796d44d5
am 39308006: am e609a677: am 74082349: Merge "Make sure mFocusedStack is never the home stack." into klp-dev
...
* commit '39308006d6868fa7be892276e31ff90943f8d99b':
Make sure mFocusedStack is never the home stack.
2013-10-22 10:45:02 -07:00
Craig Mautner
39308006d6
am e609a677: am 74082349: Merge "Make sure mFocusedStack is never the home stack." into klp-dev
...
* commit 'e609a677f8ff02aa163d6136370b9fee0dec9096':
Make sure mFocusedStack is never the home stack.
2013-10-22 10:42:48 -07:00
Craig Mautner
e609a677f8
am 74082349: Merge "Make sure mFocusedStack is never the home stack." into klp-dev
...
* commit '7408234985707f98d4800cdd43a6fcaa35cb628a':
Make sure mFocusedStack is never the home stack.
2013-10-22 10:39:51 -07:00
Craig Mautner
7408234985
Merge "Make sure mFocusedStack is never the home stack." into klp-dev
2013-10-22 17:36:57 +00:00
Craig Mautner
d1bbdb462a
Make sure mFocusedStack is never the home stack.
...
There were circumstances where mFocusedStack could be assigned the
home stack. If this were ever to occur then all subsequent tasks would
be put on the home stack. This fix ensures that there is no way that
mFocusedStack will ever be assigned to the home task.
Fixes bug 11271189.
Change-Id: I7ddd9b6bcbf2787cbe2f44b461ad057ae2241f00
2013-10-22 09:53:20 -07:00
Roman Nurik
f69719662d
am b1f8f31b: am 1330dfa8: am acc642bc: Merge "Add Nexus 5 to Device Art Generator." into klp-dev
...
* commit 'b1f8f31b4c24d00e4607d01fbf851a6ab14b34da':
Add Nexus 5 to Device Art Generator.
2013-10-22 09:15:23 -07:00
Roman Nurik
b1f8f31b4c
am 1330dfa8: am acc642bc: Merge "Add Nexus 5 to Device Art Generator." into klp-dev
...
* commit '1330dfa8c73f05dc076cc822dd46805a1ac31200':
Add Nexus 5 to Device Art Generator.
2013-10-22 09:12:25 -07:00
Roman Nurik
1330dfa8c7
am acc642bc: Merge "Add Nexus 5 to Device Art Generator." into klp-dev
...
* commit 'acc642bce9e1ca1782c8f93131d944d4a2f92be0':
Add Nexus 5 to Device Art Generator.
2013-10-22 09:09:05 -07:00
Roman Nurik
acc642bce9
Merge "Add Nexus 5 to Device Art Generator." into klp-dev
2013-10-22 16:06:20 +00:00
Brett Chabot
305258da75
Add 'no system permission' test app.
...
Used in PackageManagerOTATests to verify upgraded system apps
are granetd new permissions.
Bug 11271490
Change-Id: Idbc07bc043d06ea15dc41285ecbfb8186a7ecc95
2013-10-22 04:58:50 +00:00
Craig Mautner
8e867f3810
am e0bebd29: am 0857e3b9: am 24ba3234: Merge "Do not delete stacks that are not empty." into klp-dev
...
* commit 'e0bebd294e7d2b998cc71e77e99f311c6321a6a1':
Do not delete stacks that are not empty.
2013-10-21 21:41:47 -07:00
Craig Mautner
e0bebd294e
am 0857e3b9: am 24ba3234: Merge "Do not delete stacks that are not empty." into klp-dev
...
* commit '0857e3b97a12bbd9f4d333b620bd7dfbd275c812':
Do not delete stacks that are not empty.
2013-10-21 21:38:12 -07:00
Craig Mautner
0857e3b97a
am 24ba3234: Merge "Do not delete stacks that are not empty." into klp-dev
...
* commit '24ba3234caa27185aa34aab5b88190f85f9a8d75':
Do not delete stacks that are not empty.
2013-10-21 21:34:59 -07:00
Craig Mautner
24ba3234ca
Merge "Do not delete stacks that are not empty." into klp-dev
2013-10-22 04:31:12 +00:00
Craig Mautner
19d9bd54d3
Do not delete stacks that are not empty.
...
The possibility existed that an activity was set to a task that it was
already being set to. If that were to happen, and it was the only
activity in the only task of the stack the stack would be deleted.
This fixes that situation and logs it as well to confirm that it does
fix bug 11272935. Logging to be deleted upon successful monkey run
exhibiting the log.
Change-Id: I436fdcc9a3734adad81d3ef90f29b93b3ac4dfcd
2013-10-21 20:05:26 -07:00
Michael Wright
db8a9a1632
Merge "Utilize new Android LED constants"
2013-10-22 01:26:45 +00:00
Jeff Brown
60b00461ae
am f52b9f00: am c024edfb: am 534103d4: Merge "Fix issues catching up to touch events after a short pause." into klp-dev
...
* commit 'f52b9f0001a98621f8ce19676e16672bd25c82bf':
Fix issues catching up to touch events after a short pause.
2013-10-21 18:12:47 -07:00
Robert Greenwalt
405f731a4d
am 63dd9d2f: am 4802c6da: am 4d8a8392: Merge "Don\'t set same country code on supplicant again and again" into klp-dev
...
* commit '63dd9d2f550983d890ea21eee9b8f8619608bb79':
Don't set same country code on supplicant again and again
2013-10-21 18:09:02 -07:00
Jeff Brown
f52b9f0001
am c024edfb: am 534103d4: Merge "Fix issues catching up to touch events after a short pause." into klp-dev
...
* commit 'c024edfb085e42945f7021adb9d4aaf07dbc2f46':
Fix issues catching up to touch events after a short pause.
2013-10-21 18:09:01 -07:00
Christopher Tate
0cbfafdf70
am 1c565bfe: am 6fd88844: am 7eb83c59: Merge "Preserve window sizes when rebatching alarms" into klp-dev
...
* commit '1c565bfe53fe8205bf828f5073dd25d9d74a0f57':
Preserve window sizes when rebatching alarms
2013-10-21 18:08:57 -07:00
Jeff Brown
c024edfb08
am 534103d4: Merge "Fix issues catching up to touch events after a short pause." into klp-dev
...
* commit '534103d4004ffd102609a09e0b55d329adbc1a57':
Fix issues catching up to touch events after a short pause.
2013-10-21 18:06:23 -07:00
Robert Greenwalt
63dd9d2f55
am 4802c6da: am 4d8a8392: Merge "Don\'t set same country code on supplicant again and again" into klp-dev
...
* commit '4802c6da7f044e7bd5927601a78713130cf157c0':
Don't set same country code on supplicant again and again
2013-10-21 18:05:05 -07:00
Christopher Tate
1c565bfe53
am 6fd88844: am 7eb83c59: Merge "Preserve window sizes when rebatching alarms" into klp-dev
...
* commit '6fd8884402659c1cf2fd6e638a36fa69396be4fa':
Preserve window sizes when rebatching alarms
2013-10-21 18:05:01 -07:00
Satoshi Kataoka
673c558e7e
Merge "Shorten the interval to reconnect the disconnected IME"
2013-10-22 01:04:56 +00:00
Jeff Brown
534103d400
Merge "Fix issues catching up to touch events after a short pause." into klp-dev
2013-10-22 01:03:55 +00:00
Robert Greenwalt
4802c6da7f
am 4d8a8392: Merge "Don\'t set same country code on supplicant again and again" into klp-dev
...
* commit '4d8a8392f7a452479f228fbe08e43fa4145dda56':
Don't set same country code on supplicant again and again
2013-10-21 18:01:39 -07:00
Christopher Tate
6fd8884402
am 7eb83c59: Merge "Preserve window sizes when rebatching alarms" into klp-dev
...
* commit '7eb83c597fadaa41052c96826c7ca3e53aca9a3d':
Preserve window sizes when rebatching alarms
2013-10-21 18:01:36 -07:00
Satoshi Kataoka
bcacc322f8
Shorten the interval to reconnect the disconnected IME
...
10sec -> 3sec
Bug: 5474811
Change-Id: I2f8c49eb00df6e3fd22fdb96ed0a14432ddaa874
2013-10-21 18:01:29 -07:00
Robert Greenwalt
4d8a8392f7
Merge "Don't set same country code on supplicant again and again" into klp-dev
2013-10-22 00:59:40 +00:00
Christopher Tate
7eb83c597f
Merge "Preserve window sizes when rebatching alarms" into klp-dev
2013-10-22 00:58:42 +00:00