Baligh Uddin
253602c7f1
am 30729765: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev
...
* commit '30729765f6ccce8a1e649a71cde2040246b86e8b':
Import translations. DO NOT MERGE
2014-09-15 02:59:34 +00:00
Baligh Uddin
486d5c2884
am f07d95d6: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev
...
* commit 'f07d95d663b0313818820108243bbab04596d825':
Import translations. DO NOT MERGE
2014-09-15 02:59:30 +00:00
Baligh Uddin
3471203196
Merge "Import translations. DO NOT MERGE" into lmp-dev
2014-09-15 02:45:00 +00:00
Baligh Uddin
b8810b04ba
Merge "Import translations. DO NOT MERGE" into lmp-dev
2014-09-15 02:44:57 +00:00
Jungshik Jang
550a0a4337
am d0d188e5: Merge "Remove unnecessary warning." into lmp-dev
...
* commit 'd0d188e5b4991aef62c99553d59ddcb3428021bb':
Remove unnecessary warning.
2014-09-15 02:38:00 +00:00
Dan Sandler
62dd913581
am 3c7954e6: NavigationBarView: Fix NPE in Drawable.setVisible()
...
* commit '3c7954e6d6045c377a72b4d10f72602c84845b77':
NavigationBarView: Fix NPE in Drawable.setVisible()
2014-09-15 02:37:56 +00:00
Jungshik Jang
2d02b20405
Merge "Remove unnecessary warning." into lmp-dev
2014-09-15 02:23:08 +00:00
Baligh Uddin
b3c8598174
Import translations. DO NOT MERGE
...
Change-Id: I57bb85dcb94f83e095e07ee4956d786849284688
Auto-generated-cl: translation import
2014-09-14 19:17:12 -07:00
Baligh Uddin
3e8ce3bb33
Import translations. DO NOT MERGE
...
Change-Id: Idb536e9edfaee903119b8d84188d013e045f5fba
Auto-generated-cl: translation import
2014-09-14 19:12:57 -07:00
Dan Sandler
8cd9e2db31
NavigationBarView: Fix NPE in Drawable.setVisible()
...
Bug: 17495735
Change-Id: I9d5ed5a324ae5c08ea0c225104c41b44462aff22
2014-09-14 21:25:08 -04:00
Prem Kumar
35e9b1c9e6
am a203fbc8: Merge "Allow creating EAP_TLS network without specifying Phase2.None" into lmp-dev
...
* commit 'a203fbc87ae41547afb9dbdd06dd41221ed75c26':
Allow creating EAP_TLS network without specifying Phase2.None
2014-09-15 01:01:16 +00:00
Jungshik Jang
6b096d349b
Remove unnecessary warning.
...
Bug: 17501260
Change-Id: I5e7edd6d1fc179c00306d745adc99bebdcb65316
2014-09-15 09:54:47 +09:00
Prem Kumar
97a0c45cf8
Merge "Allow creating EAP_TLS network without specifying Phase2.None" into lmp-dev
2014-09-15 00:51:13 +00:00
Dianne Hackborn
4331efb86b
am 7631b257: Merge "A little more work on issue ##16907799." into lmp-dev
...
* commit '7631b257772e622b446b9c35112fe9ff0a596b17':
A little more work on issue ##16907799.
2014-09-15 00:37:47 +00:00
Dianne Hackborn
95686694f7
Merge "A little more work on issue ##16907799." into lmp-dev
2014-09-15 00:27:00 +00:00
Dianne Hackborn
24c98e8cf8
A little more work on issue ##16907799.
...
I got distracted in the middle of it, and forget to finish
up with the test to not kill processes if they aren't using
an auto create binding.
Change-Id: Ieecfe97fa3208e50cb91ba94be2a8659d128b0de
2014-09-14 17:25:34 -07:00
Alan Viverette
4603667604
am 6ef642ca: Merge "Clean up view drawable tinting methods, fix default modes" into lmp-dev
...
* commit '6ef642ca26e777c13c9a48665ed29e37e599736b':
Clean up view drawable tinting methods, fix default modes
2014-09-14 23:44:34 +00:00
Alan Viverette
670288c252
Merge "Clean up view drawable tinting methods, fix default modes" into lmp-dev
2014-09-14 23:36:06 +00:00
Alan Viverette
98d632b825
am 1aa39ebf: Merge "Simplify progress bar paths" into lmp-dev
...
* commit '1aa39ebf6739dffcd454417fcacd17868157111e':
Simplify progress bar paths
2014-09-14 23:05:35 +00:00
Adam Powell
ecfb8e78d4
am 86a3adca: Merge "Magic null-background filling for PhoneWindows" into lmp-dev
...
* commit '86a3adcaf33128377c9125c92b65458a0500e023':
Magic null-background filling for PhoneWindows
2014-09-14 23:05:31 +00:00
Alan Viverette
adabc55ab6
Merge "Simplify progress bar paths" into lmp-dev
2014-09-14 22:51:43 +00:00
Adam Powell
9dbe94d8cd
Merge "Magic null-background filling for PhoneWindows" into lmp-dev
2014-09-14 22:51:29 +00:00
Guang Zhu
ca5992515c
am 344a51ed: Merge "temporarily enable wifi verbose logging in download manager test" into lmp-dev
...
* commit '344a51ed5adec1c76b74cabe4c76e2a4766d90d3':
temporarily enable wifi verbose logging in download manager test
2014-09-14 22:49:52 +00:00
Alan Viverette
b56f5d2ab1
Clean up view drawable tinting methods, fix default modes
...
Calling setTint now only modifies the tint. It won't force a mode change.
BUG: 17494736
Change-Id: I91392634869ed23981d8e61a403bb2be42aa7a07
2014-09-14 15:48:50 -07:00
Adam Powell
f849a5e16d
Magic null-background filling for PhoneWindows
...
In the past it's been a recommended approach to avoiding overdraw for
apps to set their window background to null at runtime if their
content view fully covers their window surface. The problem with this
is the IME.
The IME can force a resize of the window at unexpected times and
unless an app has been configured to fit system windows and manually
cover the padded area that the IME window covers, the asynchronous
nature of the IME-show process can leave surface buffer garbage
visible to the user. In previous platform versions this wasn't an
issue since pre-renderthread we would always animate a crossfade from
the closed to open state. This animation was always a bit of a hack
since it could break the contract of requestLayout/invalidate on the
view hierarchy - it could result in a draw happening into the saved
"before" state of the crossfade before a pending layout.
Now that this has been cleaned up the buffer garbage is sometimes
visible.
To prevent this, PhoneWindow now detects the state of a null window
background and draws solid rects into the area not covered by a
window's content. Which color is determined by the window context's
theme, though this is not a public API available to apps.
Bug 17006497
Change-Id: I714439a1608c4ae135f3d9d49bb165330d9fbe9f
2014-09-14 15:44:11 -07:00
Guang Zhu
ac60bea01f
Merge "temporarily enable wifi verbose logging in download manager test" into lmp-dev
2014-09-14 22:35:30 +00:00
Guang Zhu
da7638db2e
temporarily enable wifi verbose logging in download manager test
...
also temporarily compile against platfrom, not SDK, since we are
using private API
Bug: 17446070
Change-Id: I6da18aca2d5eaf305940514186ef2434e52f15b9
2014-09-14 15:33:49 -07:00
Dianne Hackborn
4e12860039
am 601e63e8: Merge "Fix issue #16907799 : Processes containing bound services..." into lmp-dev
...
* commit '601e63e8b421db8e388cd0077e3dbad0cf144a0e':
Fix issue #16907799 : Processes containing bound services...
2014-09-14 22:21:28 +00:00
Alan Viverette
e5a4345a08
Simplify progress bar paths
...
BUG: 17366831
Change-Id: I7efa215d399e4bf47b41949d313fba4487f068a0
2014-09-14 15:10:54 -07:00
Dianne Hackborn
f075330db4
Merge "Fix issue #16907799 : Processes containing bound services..." into lmp-dev
2014-09-14 22:02:36 +00:00
RoboErik
c7e65eecbd
am 4be289e8: Merge "Route volume commands whenever media stream is in use" into lmp-dev
...
* commit '4be289e84aba1fc5227fa518075fb8f2c60181ba':
Route volume commands whenever media stream is in use
2014-09-14 21:57:21 +00:00
Jorim Jaggi
e66f4e26eb
am 7dbbaf7e: Merge "Fix jank while unlocking and security is set" into lmp-dev
...
* commit '7dbbaf7edb12a92aa119dc23fa705a3fb405668d':
Fix jank while unlocking and security is set
2014-09-14 21:57:17 +00:00
RoboErik
d8c36a7b60
Merge "Route volume commands whenever media stream is in use" into lmp-dev
2014-09-14 21:45:03 +00:00
Jorim Jaggi
49b03451f9
Merge "Fix jank while unlocking and security is set" into lmp-dev
2014-09-14 21:40:15 +00:00
Chet Haase
ad804f5560
am f9f4d316: Merge "set correct bounds in ActionBar based on visibility of ActionBarView" into lmp-dev
...
* commit 'f9f4d3161ed7be2365ba4f2b16d1c6571e725eb0':
set correct bounds in ActionBar based on visibility of ActionBarView
2014-09-14 21:39:25 +00:00
Dianne Hackborn
465fa39635
Fix issue #16907799 : Processes containing bound services...
...
...are killed over eagerly.
When the current foreground activity is moving to the background,
it was briefly going through the CACHED_ACTIVITY state before the
correct LAST_ACTIVITY state, allowing its bound service processes
to be killed (because they went in to the cached list). To solve
this, as long as a process has stopping activities, it won't go
lower than LAST_ACTIVITY.
Also fixed a problem where we could put a process in CACHED_EMPTY
instead of CACHED_ACTIVITY_CLIENT. There were a number of cases
in the binding flow and also the client process state transitions
where we would not correctly updateing the bound client activity
state.
And add some sanity code so that if a process hosting a
service is killed, and a client process of that service is in the
cached state, we kill the client process. This avoids situations
where we can start thrashing around in the cached list because we
are restarting process for no reason -- since they will just
continue to be cached.
Finally, tune the process LRU list to allow twice as many cached
activity processes (from 8 to 16), so we can make better use of
the RAM we have available these days.
Change-Id: Ib0cdf78c321cbb035259fc9dd6ee27b5ba1f90c5
2014-09-14 14:32:45 -07:00
Chet Haase
4605b2929e
Merge "set correct bounds in ActionBar based on visibility of ActionBarView" into lmp-dev
2014-09-14 21:30:21 +00:00
RoboErik
94c716ea29
Route volume commands whenever media stream is in use
...
Found a regression in volume handling. Previously we handled
volume commands as long as the media stream was active but we were only
handling them when there was an active session on L. This adds a check to
make sure we handle volume if anything is playing on the media stream.
bug:17498479
Change-Id: Iddd745c8a762cf7ebedb37f1b26fc934db01fba0
2014-09-14 21:16:51 +00:00
Alan Viverette
56c4f5c139
am 84670eef: Merge "Reduce instructions required to obtain and recycle TypedArray" into lmp-dev
...
* commit '84670eef1f2d685efc98644914d2bb191d0e665c':
Reduce instructions required to obtain and recycle TypedArray
2014-09-14 21:04:59 +00:00
Shawn Willden
204cef81f4
am eaabd9ac: Merge "Correct test data size in keystore signing and verification tests." into lmp-dev
...
* commit 'eaabd9ac2b3409d8eb6b6c49d2be6c89c70999f8':
Correct test data size in keystore signing and verification tests.
2014-09-14 21:04:55 +00:00
John Spurlock
07d245ba89
am 1ddb7a6b: Merge "Saver: PowerManager call to set low power mode." into lmp-dev
...
* commit '1ddb7a6b406f23c3b549aa6a771cec61c1778f3e':
Saver: PowerManager call to set low power mode.
2014-09-14 21:04:50 +00:00
Ramanan Rajeswaran
045d97a52c
am 90756e97: Merge "Fix creation issue of stack trace dump directory" into lmp-dev
...
* commit '90756e972a152a70ab1a2f3bcfd9532ece1f2056':
Fix creation issue of stack trace dump directory
2014-09-14 21:04:30 +00:00
Ramanan Rajeswaran
92b737c470
am 2e9ca0aa: Merge "Fix crash in TranserPipe." into lmp-dev
...
* commit '2e9ca0aa3de6f8e6e6691125497248dd6940c5f1':
Fix crash in TranserPipe.
2014-09-14 21:04:27 +00:00
vandwalle
e9efeb8645
am 35967d04: Merge "make wifi cellular params configurable" into lmp-dev
...
* commit '35967d0432b587dd78774ccea993f497f8b9eeb6':
make wifi cellular params configurable
2014-09-14 21:04:23 +00:00
Michael Wright
ba240c12d6
am ab567cd1: Merge "Correctly propagate SW_CAMERA_LENS_COVER_BIT" into lmp-dev
...
* commit 'ab567cd1431678b9882897e90e83a3ebbf656588':
Correctly propagate SW_CAMERA_LENS_COVER_BIT
2014-09-14 21:04:18 +00:00
Craig Mautner
95dd2929d4
am 11cb403d: Merge "Add null checks for quickly disappearing Displays" into lmp-dev
...
* commit '11cb403dd066e4de527e3c6079b3def6d3bc82bd':
Add null checks for quickly disappearing Displays
2014-09-14 21:04:09 +00:00
Dan Sandler
882df5be51
am 34c08655: Merge "Customized ripple animation for navigation bar" into lmp-dev
...
* commit '34c08655610018a0625fb6583df0e19a9c7f63dd':
Customized ripple animation for navigation bar
2014-09-14 21:04:05 +00:00
Jae Seo
ba4d4192d7
am c07446f2: TIF: Turn debugging off
...
* commit 'c07446f288e0dbf7f88b3254918817529910e6a0':
TIF: Turn debugging off
2014-09-14 21:04:02 +00:00
Christopher Lane
2cd8076536
am 1fdb5100: Merge "Handle null values in registerService" into lmp-dev
...
* commit '1fdb5100feab055ca9e52ee766d4477a188e78a3':
Handle null values in registerService
2014-09-14 21:03:57 +00:00
Yorke Lee
ee743e6071
resolved conflicts for merge of f3804c3c to lmp-sprout-dev
...
Conflicts:
telephony/java/android/telephony/TelephonyManager.java
Change-Id: Ibdd0b6c2c9901ec46196ac9460a0908dfb739ad4
2014-09-14 13:58:59 -07:00