Michael Wright
bba434af67
am 10884694: am 357c75e7: Merge "Add missing character combinations for international layouts"
...
* commit '108846942f4296fa12b09dd70d60a21c69deace2':
Add missing character combinations for international layouts
2014-04-30 01:19:56 +00:00
Michael Wright
3e320a0cac
am 9feab5f2: am 8a02b20f: Merge "Add TYPE_MAGNIFICATION_OVERLAY to InputWindowInfo::isTrustedOverlay()"
...
* commit '9feab5f278d8c9e030e72989a7f6f3d2f376748d':
Add TYPE_MAGNIFICATION_OVERLAY to InputWindowInfo::isTrustedOverlay()
2014-04-30 01:19:52 +00:00
Bill Yi
ad85d5422b
am 293513a5: (-s ours) Merge commit \'0b62467b142b61ee1e449ba958ba37dfd961ef56\' into HEAD
...
* commit '293513a59d36cd96a3e474dde5981380d372d8c9':
Update framework to use M33 Skia. DO NOT MERGE
2014-04-30 01:19:37 +00:00
Michael Wright
ade631eed0
Merge "NULL previous background bitmap upon changing wallpaper"
2014-04-30 01:19:10 +00:00
Dianne Hackborn
684bf34ee8
Switch IProcessObserver to report process state
...
When IProcessObserver was created, the only information
we had for the state of a process was its "importance".
Now we have the process state, which is much more useful.
Switch to reporting that.
Change-Id: Icdb3eea8cf96f4eff7ed3d584f940a1bd9cc3884
2014-04-29 17:56:57 -07:00
Deepanshu Gupta
b86e85600d
am 4bf3c930: (-s ours) am 92bc0753: am 8c15cd0d: am c967d8dc: Add special system view cookie to OverflowButton. [DO NOT MERGE]
...
* commit '4bf3c930684b1e697c87d3fdb520309c39e51b14':
Add special system view cookie to OverflowButton. [DO NOT MERGE]
2014-04-30 00:45:25 +00:00
Deepanshu Gupta
4bf3c93068
am 92bc0753: am 8c15cd0d: am c967d8dc: Add special system view cookie to OverflowButton. [DO NOT MERGE]
...
* commit '92bc07534e511b9afa7edaffe867d2674c504d73':
Add special system view cookie to OverflowButton. [DO NOT MERGE]
2014-04-30 00:41:26 +00:00
Deepanshu Gupta
92bc07534e
am 8c15cd0d: am c967d8dc: Add special system view cookie to OverflowButton. [DO NOT MERGE]
...
* commit '8c15cd0dc1d04490b82fd7d8da7611ff3219a1f0':
Add special system view cookie to OverflowButton. [DO NOT MERGE]
2014-04-30 00:38:35 +00:00
Deepanshu Gupta
8c15cd0dc1
am c967d8dc: Add special system view cookie to OverflowButton. [DO NOT MERGE]
...
* commit 'c967d8dc62c429ecf3e27bf3714a953636e75cbf':
Add special system view cookie to OverflowButton. [DO NOT MERGE]
2014-04-30 00:30:29 +00:00
Michael Wright
108846942f
am 357c75e7: Merge "Add missing character combinations for international layouts"
...
* commit '357c75e74760933f05ff89352ee86dd540633782':
Add missing character combinations for international layouts
2014-04-30 00:07:11 +00:00
Michael Wright
9feab5f278
am 8a02b20f: Merge "Add TYPE_MAGNIFICATION_OVERLAY to InputWindowInfo::isTrustedOverlay()"
...
* commit '8a02b20f6f3fdd5baa5d22321769303ce76ba80a':
Add TYPE_MAGNIFICATION_OVERLAY to InputWindowInfo::isTrustedOverlay()
2014-04-30 00:03:29 +00:00
Michael Wright
357c75e747
Merge "Add missing character combinations for international layouts"
2014-04-30 00:01:38 +00:00
George Mount
d64616e8d2
Fix NPE when going "back" from Activity Transition.
...
Also fixed failure to start enter transition when shared element
and exit transition complete simultaneously.
Bug 14399938
Change-Id: Id0d4171f8cf94a30e47aee41ce68b4a25960f219
2014-04-29 16:58:42 -07:00
Michael Wright
8a02b20f6f
Merge "Add TYPE_MAGNIFICATION_OVERLAY to InputWindowInfo::isTrustedOverlay()"
2014-04-29 23:58:17 +00:00
Joe Onorato
016db94896
Merge "Turn off this very verbose log."
2014-04-29 23:50:29 +00:00
Deepanshu Gupta
c967d8dc62
Add special system view cookie to OverflowButton. [DO NOT MERGE]
...
Add a special view cookie to enable the IDE to identify the overflow
menu button in the Action Bar.
Change-Id: Ida3ed776afb8c9fa8af23b73d4cf6d47eef0ab87
(cherry picked from commit 674af92fd3a618695448ff88568b03390e90bc66)
2014-04-29 16:49:21 -07:00
Joe Onorato
8dc2e5a01a
Turn off this very verbose log.
...
adb shell dumpsys activity broadcasts
has the last 100 broadcasts, so it can be used for debugging
instead of spamming the main logs.
Change-Id: I19c3ac72eb783999e615261da7f00b527d2bc06f
2014-04-29 23:26:46 +00:00
Guang Zhu
dbe2aed24f
am f0a3ea6e: am c6ebc0d1: Merge "make success explicit in BT instrumentation util" into klp-modular-dev
...
* commit 'f0a3ea6ea259f836c71007ab07966d9dd2a140d6':
make success explicit in BT instrumentation util
2014-04-29 23:12:16 +00:00
Guang Zhu
f0a3ea6ea2
am c6ebc0d1: Merge "make success explicit in BT instrumentation util" into klp-modular-dev
...
* commit 'c6ebc0d120bd7faa61d2f906f4a180c720f1f0d8':
make success explicit in BT instrumentation util
2014-04-29 23:09:12 +00:00
Bill Yi
293513a59d
Merge commit '0b62467b142b61ee1e449ba958ba37dfd961ef56' into HEAD
2014-04-29 16:07:29 -07:00
Guang Zhu
c6ebc0d120
Merge "make success explicit in BT instrumentation util" into klp-modular-dev
2014-04-29 23:06:39 +00:00
Nick Kralevich
d37ae7c13d
am ab583454: am 1866e5dc: am af40649e: Merge "Set NO_NEW_PRIVS on zygote init"
...
* commit 'ab5834545da906f1a150672ead825c28a2e1f82a':
Set NO_NEW_PRIVS on zygote init
2014-04-29 22:34:54 +00:00
Michael Wright
15c32f2699
Merge "Move key attribute information into KeyEvent."
2014-04-29 22:31:06 +00:00
Nick Kralevich
ab5834545d
am 1866e5dc: am af40649e: Merge "Set NO_NEW_PRIVS on zygote init"
...
* commit '1866e5dc8bb04b58a67e54f66cb4ec22e878667d':
Set NO_NEW_PRIVS on zygote init
2014-04-29 22:26:41 +00:00
Nick Kralevich
1866e5dc8b
am af40649e: Merge "Set NO_NEW_PRIVS on zygote init"
...
* commit 'af40649e4ad506e312b53518cd2b9f2b58dee3ba':
Set NO_NEW_PRIVS on zygote init
2014-04-29 22:24:32 +00:00
Nick Kralevich
af40649e4a
Merge "Set NO_NEW_PRIVS on zygote init"
2014-04-29 22:20:47 +00:00
Nick Kralevich
195c73c9b2
Set NO_NEW_PRIVS on zygote init
...
When app_process/zygote starts, make sure PR_SET_NO_NEW_PRIVS is set.
This prevents zygote spawned apps from acquiring new privileges
on exec.
In particular, this allows the CTS test
android.os.cts.SecurityFeaturesTest#testNoNewPrivs() to pass if ART is set
as the default runtime.
Change-Id: I81139cda999c7b1430242561aad28f566e9b6da0
2014-04-29 15:10:58 -07:00
Selim Cinek
0377b796d0
Merge "Introduced basic animations for the new notifications."
2014-04-29 22:03:17 +00:00
Selim Cinek
572bbd42a4
Introduced basic animations for the new notifications.
...
Animations between two different states of the notification stack scroller
are now possible.
Bug: 14081264
Change-Id: I2b8e964095f71766feac5a76c4e3b85d22648d35
2014-04-30 00:01:06 +02:00
Dianne Hackborn
3e77bb8331
Merge "Add IBatteryStats API to retrieve current charge times."
2014-04-29 21:54:58 +00:00
Dianne Hackborn
ab5c0ea43c
Add IBatteryStats API to retrieve current charge times.
...
Also include charge/discharge information in dumpsys.
Change-Id: Ica1b333ad334dc698d4a67da391b378757662f41
2014-04-29 14:53:32 -07:00
Jinsuk Kim
c79224e4b7
am 60037302: am 8fe27e88: Merge "Move logical address allocation logic into native service from HAL" into klp-modular-dev
...
* commit '60037302208be033442cc3f3c50a25c7064ebbd1':
Move logical address allocation logic into native service from HAL
2014-04-29 21:38:19 +00:00
Jinsuk Kim
6003730220
am 8fe27e88: Merge "Move logical address allocation logic into native service from HAL" into klp-modular-dev
...
* commit '8fe27e881851921a90882f7d4da142bf936c5549':
Move logical address allocation logic into native service from HAL
2014-04-29 21:35:01 +00:00
Jinsuk Kim
8fe27e8818
Merge "Move logical address allocation logic into native service from HAL" into klp-modular-dev
2014-04-29 21:32:50 +00:00
George Mount
989a4e9b13
Merge "Add mechanism for Transitions to target a class."
2014-04-29 21:30:37 +00:00
George Mount
f31d367a5c
Merge "Transfer image of shared element to launched Activity."
2014-04-29 21:30:27 +00:00
Jorim Jaggi
9f5957989e
Merge "Prevent expanded notifications on lockscreen."
2014-04-29 21:23:03 +00:00
Jorim Jaggi
dce3c4cca5
Prevent expanded notifications on lockscreen.
...
Change-Id: I9a0ffca823883cfed75d0e093f5a4364b20008b3
2014-04-29 23:20:12 +02:00
Baligh Uddin
b3988743af
am 86af7745: (-s ours) am c2e5503d: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev
...
* commit '86af7745d337f79b37e25e21f699bf04a46838be':
Import translations. DO NOT MERGE
2014-04-29 21:13:42 +00:00
Baligh Uddin
86af7745d3
am c2e5503d: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev
...
* commit 'c2e5503dbae833065a16fe35296e202db3887920':
Import translations. DO NOT MERGE
2014-04-29 21:07:16 +00:00
Baligh Uddin
c2e5503dba
Merge "Import translations. DO NOT MERGE" into klp-modular-dev
2014-04-29 21:03:00 +00:00
Baligh Uddin
5f08b3ec9c
Merge "Import translations. DO NOT MERGE"
2014-04-29 21:02:59 +00:00
Baligh Uddin
d1cf53e002
Merge "Import translations. DO NOT MERGE"
2014-04-29 21:02:37 +00:00
Baligh Uddin
b2776bf7a4
Merge "Import translations. DO NOT MERGE"
2014-04-29 21:02:32 +00:00
George Mount
b061087212
Merge "Add Transform and ClipBounds Transitions."
2014-04-29 20:56:18 +00:00
Jorim Jaggi
707eb8bab9
Merge "Remove "speedbump" to expand notification with one finger."
2014-04-29 20:52:34 +00:00
Jorim Jaggi
7f2d87c006
Remove "speedbump" to expand notification with one finger.
...
Change-Id: I16b2493142adc277a3cb11ab9a88040aab6e3f47
2014-04-29 22:49:48 +02:00
George Mount
6eb2bc52a5
Merge "Add ability to exclude Views in transition XML."
2014-04-29 20:49:26 +00:00
Selim Cinek
d0b12fe4a2
Merge "Refactored the layout of a notifications"
2014-04-29 20:46:12 +00:00
Jorim Jaggi
be565dfc1c
Refactored the layout of a notifications
...
Notifications now consist of ExpandableViews instead of SizeAdaptiveLayouts
to avoid layout passes during the resizing. The StackScrollAlgorithm and its
States are also refactored in order to support the new behaviour. In addition,
the generation of the outline is moved to the notification views instead of
the container which contains them.
Change-Id: I1ac1292a6520f5951610039bfa204c204be9d640
2014-04-29 22:42:55 +02:00