Chris Wren
fcdd2f0ea2
am 9330c3e5: Merge "Bring consistency to FLAG_ONLY_ALERT_ONCE semantics." into lmp-dev
...
* commit '9330c3e544107c0da0425ca5e6cd0caec8d475d7':
Bring consistency to FLAG_ONLY_ALERT_ONCE semantics.
2014-09-08 20:51:10 +00:00
Kenny Guy
3e3fcdf742
am 4e9c9518: Merge "Renaming of LauncherApps apis" into lmp-dev
...
* commit '4e9c9518f937377fab1afd78c09d5d47a1a11ed1':
Renaming of LauncherApps apis
2014-09-08 20:51:05 +00:00
John Spurlock
048bb429e9
am e5feafcd: Merge "Zen: Remove suppression of untagged vibrations in zen mode." into lmp-dev
...
* commit 'e5feafcd1589bf6e92669df82a545276fa4ab29b':
Zen: Remove suppression of untagged vibrations in zen mode.
2014-09-08 20:51:01 +00:00
Jorim Jaggi
e9c595a402
am 7ad90a9a: Merge "Start all resolver activities after keyguard is gone" into lmp-dev
...
* commit '7ad90a9af57d248504b7c33663700db59bebd735':
Start all resolver activities after keyguard is gone
2014-09-08 20:50:57 +00:00
Chris Wren
6db58cb0a1
Merge "Bring consistency to FLAG_ONLY_ALERT_ONCE semantics." into lmp-dev
2014-09-08 20:47:07 +00:00
Kenny Guy
d9037a48c6
Merge "Renaming of LauncherApps apis" into lmp-dev
2014-09-08 20:47:07 +00:00
John Spurlock
897b01b39e
Merge "Zen: Remove suppression of untagged vibrations in zen mode." into lmp-dev
2014-09-08 20:40:46 +00:00
Chris Wren
d93d5adfe7
Bring consistency to FLAG_ONLY_ALERT_ONCE semantics.
...
For updates, the sounds layer checks for existence of the flag on the
new version while the heads up was checking for the flag on the
old version.
Both now agree to check the new version.
Bug: 14255617
Change-Id: Ib617df11f0dea17b5dfdf2ef6330bdbd18032ac6
2014-09-08 16:40:39 -04:00
Jorim Jaggi
92cb37a027
Merge "Start all resolver activities after keyguard is gone" into lmp-dev
2014-09-08 20:38:36 +00:00
Craig Mautner
8eba965633
am 8ffe407a: Merge "Relax requirements on Activity.requestVisibleBehind" into lmp-dev
...
* commit '8ffe407a65df2c363492e798dd316e816f2ac21e':
Relax requirements on Activity.requestVisibleBehind
2014-09-08 20:21:18 +00:00
John Spurlock
1564b6d8d7
Zen: Remove suppression of untagged vibrations in zen mode.
...
Bug:17313184
Change-Id: I07d24a7d9ce15160a4990391c53d7d6309a13c3e
2014-09-08 16:16:25 -04:00
Winson Chung
104770b61a
am 3361310f: Ensuring that the start delay matches the transition delay. (Bug 16987565)
...
* commit '3361310f20013b95ae1e99e0de7b15c6ea422f64':
Ensuring that the start delay matches the transition delay. (Bug 16987565)
2014-09-08 20:13:12 +00:00
Kenny Guy
5856bcfd5f
am 652e64d3: Merge "Revert "Ensure ApplicationInfo is for correct user for system/android package." Cache in ActivityThread means this still doesn\'t make sure we will get an ApplicationInfo for the user being requested. So reverting." into lmp-dev
...
* commit '652e64d30c2b1d499dbcba93056eaf40b270ad09':
Revert "Ensure ApplicationInfo is for correct user for system/android package." Cache in ActivityThread means this still doesn't make sure we will get an ApplicationInfo for the user being requested. So reverting.
2014-09-08 20:13:08 +00:00
Craig Mautner
ff56885db3
Merge "Relax requirements on Activity.requestVisibleBehind" into lmp-dev
2014-09-08 20:12:35 +00:00
Winson Chung
19d62382d0
Ensuring that the start delay matches the transition delay. (Bug 16987565)
...
- Also ensure that the empty text is normal weight
Change-Id: I3227a62fcb39910a402b13f42a6cb9e418f992aa
2014-09-08 20:08:01 +00:00
Kenny Guy
48f0b48555
Merge "Revert "Ensure ApplicationInfo is for correct user for system/android package." Cache in ActivityThread means this still doesn't make sure we will get an ApplicationInfo for the user being requested. So reverting." into lmp-dev
2014-09-08 20:02:10 +00:00
Jorim Jaggi
80be90606e
am 5d629572: Merge "Restrict line count for BigTextStyle" into lmp-dev
...
* commit '5d629572c2e3c8142ed437efbd1ebdd4bde4220c':
Restrict line count for BigTextStyle
2014-09-08 19:57:10 +00:00
Jorim Jaggi
f98fbb710b
Merge "Restrict line count for BigTextStyle" into lmp-dev
2014-09-08 19:46:45 +00:00
Jorim Jaggi
55b67cd40d
am 66d3891d: Merge "Fix invisible low prio notifications in SHADE_LOCKED" into lmp-dev
...
* commit '66d3891d1e8566944d4f86ba5df39b037f90573b':
Fix invisible low prio notifications in SHADE_LOCKED
2014-09-08 19:45:33 +00:00
Jorim Jaggi
a3bb226b08
Merge "Fix invisible low prio notifications in SHADE_LOCKED" into lmp-dev
2014-09-08 19:34:44 +00:00
Tom O'Neill
cf8e84b83d
am 8fff150b: Merge "Fix a STOPSHIP" into lmp-dev
...
* commit '8fff150bb5c9971c5ba25cf9568a2944ff951c04':
Fix a STOPSHIP
2014-09-08 19:32:47 +00:00
vandwalle
5c3e062056
am a35a795f: Merge "add more info to WifiConfiguration.toString: - add the noInternetAccess field - add stats about user triggered wifi state disabling requests - Wifi SSID can change even though we don\'t loose connection, hence it must be looked at with each Network
...
* commit 'a35a795fab56f3d0239a67191f97aa1756fecd3b':
add more info to WifiConfiguration.toString: - add the noInternetAccess field - add stats about user triggered wifi state disabling requests - Wifi SSID can change even though we don't loose connection, hence it must be looked at with each Network State Change
2014-09-08 19:32:44 +00:00
Tom O'Neill
9f8c80df1d
Merge "Fix a STOPSHIP" into lmp-dev
2014-09-08 19:29:57 +00:00
vandwalle
171575266c
Merge "add more info to WifiConfiguration.toString: - add the noInternetAccess field - add stats about user triggered wifi state disabling requests - Wifi SSID can change even though we don't loose connection, hence it must be looked at with each Network State Change" into lmp-dev
2014-09-08 19:22:15 +00:00
Kenny Guy
c2a4060005
Revert "Ensure ApplicationInfo is for correct user for system/android package."
...
Cache in ActivityThread means this still doesn't make sure we will
get an ApplicationInfo for the user being requested. So reverting.
This reverts commit 4a3b8aa08d743b28d53b327597abf03a925641f2.
Bug:17002733
Change-Id: Ie40eb31c4074cea09de3d6a41fe38b14e00eb059
2014-09-08 18:53:56 +00:00
Svet Ganov
a8ea00af2a
am a00c7eb9: Merge "Clicking on partially coverd views by other views or windows." into lmp-dev
...
* commit 'a00c7eb909b043ce5c915604087438d06b7d164e':
Clicking on partially coverd views by other views or windows.
2014-09-08 18:51:42 +00:00
Dharmesh Mokani
ca1459bb0f
am e70ac872: Merge "Remove old methods : AlwaysOnHotwordDetector" into lmp-dev
...
* commit 'e70ac872c6655c6ab8c0e3ce48a7ed13df99494f':
Remove old methods : AlwaysOnHotwordDetector
2014-09-08 18:51:39 +00:00
Svet Ganov
2bb02c799c
Merge "Clicking on partially coverd views by other views or windows." into lmp-dev
2014-09-08 18:45:04 +00:00
Dharmesh Mokani
2b02f88737
Merge "Remove old methods : AlwaysOnHotwordDetector" into lmp-dev
2014-09-08 18:43:14 +00:00
Jason Monk
bc80f9d2f9
am 01ac9651: Merge "Update downtime to handle TimeZone change" into lmp-dev
...
* commit '01ac96519ec69af24d053c9e790068e3c51f4f57':
Update downtime to handle TimeZone change
2014-09-08 18:40:14 +00:00
Craig Mautner
9ac2f6c8ec
am 851f7eb5: Merge "Ignore finishing activities when fetching the top" into lmp-dev
...
* commit '851f7eb59803dbc86ce36a95034249968a95d831':
Ignore finishing activities when fetching the top
2014-09-08 18:34:50 +00:00
George Mount
539909ae96
am f7b281a6: Merge "Use Alpha instead of TransitionAlpha for Activity Transitions." into lmp-dev
...
* commit 'f7b281a624c76d0bb744cf4bb47e92d35b66e34b':
Use Alpha instead of TransitionAlpha for Activity Transitions.
2014-09-08 18:34:47 +00:00
Jason Monk
100d9471ab
Merge "Update downtime to handle TimeZone change" into lmp-dev
2014-09-08 18:33:09 +00:00
Craig Mautner
d2a38c7854
Merge "Ignore finishing activities when fetching the top" into lmp-dev
2014-09-08 18:32:01 +00:00
George Mount
214e7ad175
Merge "Use Alpha instead of TransitionAlpha for Activity Transitions." into lmp-dev
2014-09-08 18:25:03 +00:00
Jason Monk
e9f7d9deb0
am 24229aff: Merge "Add VPN Key to signal icons" into lmp-dev
...
* commit '24229aff4174c917ef26d79a409916c4c8ac4920':
Add VPN Key to signal icons
2014-09-08 18:24:11 +00:00
Jason Monk
95e71085e2
Merge "Add VPN Key to signal icons" into lmp-dev
2014-09-08 18:15:38 +00:00
Nancy Chen
b564bcb23d
am 0efb7dcf: Merge "Make changes to Telecomm API per review guidelines." into lmp-dev
...
* commit '0efb7dcf688ae6a736ff25ebcf98e8ec3475c447':
Make changes to Telecomm API per review guidelines.
2014-09-08 17:47:21 +00:00
Nancy Chen
6faad7e5b6
Merge "Make changes to Telecomm API per review guidelines." into lmp-dev
2014-09-08 17:38:58 +00:00
Tom O'Neill
bc3095139e
Fix a STOPSHIP
...
Change-Id: I3714f1645c0a847e912cb79515fe3991960c1698
2014-09-08 10:14:33 -07:00
Chris Craik
e43a3b7329
am 8bc6e915: Merge "Fix save count offsetting within DisplayList chunks" into lmp-dev
...
* commit '8bc6e9158ad915b1d3e113923bf013e3383213ec':
Fix save count offsetting within DisplayList chunks
2014-09-08 17:14:27 +00:00
Chris Craik
5f5df97df9
Merge "Fix save count offsetting within DisplayList chunks" into lmp-dev
2014-09-08 17:09:01 +00:00
Jeff Sharkey
4736043809
am 2f0ed017: Merge "Delayed ASEC allocation, refine progress handling." into lmp-dev
...
* commit '2f0ed01789f305506426b67139146b634457fd5a':
Delayed ASEC allocation, refine progress handling.
2014-09-08 16:48:39 +00:00
Jeff Sharkey
e016605981
Merge "Delayed ASEC allocation, refine progress handling." into lmp-dev
2014-09-08 16:38:42 +00:00
Jeff Sharkey
77d218e186
Delayed ASEC allocation, refine progress handling.
...
For restore use-case, session creation needs to complete quickly, so
delay ASEC allocation until session is opened. When preflighting
size checks, only consider external when we have a known size for the
container. Also relax size checks when using MODE_INHERIT_EXISTING
on external, since we don't know how much of existing app will be
copied over.
Consider session as "active" while commit is ongoing, until we're
either finished or pending user interaction.
Always publish first client needle movement away from 0. Use 25% of
internal progress to reflect ASEC allocation.
Avoid CloseGuard messages about leaking PFDs.
Bug: 17405741, 17402982
Change-Id: I6247a1d335d26621549c701c4c4575a8d16ef8c2
2014-09-08 09:31:49 -07:00
Jorim Jaggi
457a10d29c
Restrict line count for BigTextStyle
...
Also fixes paddings for the first line for InboxStyle notifications.
Bug: 17161340
Change-Id: I00a92f256d9ccad7cfbcecb591e84bb0d68ba635
2014-09-08 18:31:03 +02:00
Dharmesh Mokani
50c290406a
Remove old methods : AlwaysOnHotwordDetector
...
Bug: 17389896
Change-Id: I47d0ae3ecad0ce8a74ed65a73309faa541b74a06
2014-09-08 09:22:16 -07:00
Nicolas Prevot
6d9a8d3465
am 09286405: Merge "Marking two flags as final." into lmp-dev
...
* commit '09286405d1c3b3ace460521049989a6d662ba203':
Marking two flags as final.
2014-09-08 16:16:41 +00:00
Nicolas Prevot
97e75e1da9
Merge "Marking two flags as final." into lmp-dev
2014-09-08 16:06:30 +00:00
George Mount
a9e7c21f14
am 850bca01: Merge "Only call setHasTransientState in captureHierarchy." into lmp-dev
...
* commit '850bca013baf35c99895009e94943f3f127b9e70':
Only call setHasTransientState in captureHierarchy.
2014-09-08 15:00:07 +00:00