Commit Graph

45273 Commits

Author SHA1 Message Date
Eino-Ville Talvala
d701bfb615 Merge "Camera2: Check for sequence complete sooner." into lmp-dev 2014-09-16 00:47:29 +00:00
Adam Lesinski
61d9409239 Show the lockscreen when more than 1 user is present
Bug:17399024
Change-Id: Iaf2ea2747cbcd9db45ba9faa7c8fe0389a799855
2014-09-15 17:46:10 -07:00
Alan Viverette
7413501b9c Merge "Always apply ImageView's tint attribute using SRC_ATOP by default" into lmp-dev 2014-09-16 00:40:36 +00:00
Yohei Yukawa
84f20ec49d Merge "Minimize the number of default enabled IMEs part 3" into lmp-dev 2014-09-16 00:19:55 +00:00
Ang Li
85be272268 Merge "Fix a typo in comment." into lmp-dev 2014-09-16 00:00:37 +00:00
Adam Powell
afd3a3a049 Merge "Treat empty string as title-set in ToolbarWidgetWrapper" into lmp-dev 2014-09-15 23:55:34 +00:00
Adam Powell
ebff4063ba Merge "Finish materializing dialogs" into lmp-dev 2014-09-15 23:41:57 +00:00
Adam Powell
6192b07bdc Treat empty string as title-set in ToolbarWidgetWrapper
If a developer explicitly sets the empty string as the title of a
Toolbar that is used as an action bar via Activity#setActionBar, don't
overwrite it with the window title. This clears up a nonintuitive
behavior when explicitly clearing the title of a toolbar.

Bug 17510951

Change-Id: I183c2ca57d3bd16ae1f89bb7daa2cdf086189138
2014-09-15 16:36:01 -07:00
Eino-Ville Talvala
848fe733f3 Camera2: Check for sequence complete sooner.
It's possible, especially with legacy mode, for a last frame for a
sequence to have already arrived when a repeating sequence is stopped.

In that case, need to check for sequence complete as soon as the
requestId, framenumber pair is added to the pending queue of completions.

Bug: 17428716
Change-Id: Ie5c6ea5a43639c812b8441da326c6303e150fce0
2014-09-15 16:28:02 -07:00
Alan Viverette
38f93bcb21 Always apply ImageView's tint attribute using SRC_ATOP by default
Preserves pre-L behavior and avoids requiring developers to manually
set the tintMode to SRC_ATOP when targeting SDK 21+.

BUG: 17507827
Change-Id: I43f86cbcb9662172254f46700441ca85a54428f6
2014-09-15 16:25:09 -07:00
Chet Haase
18c56d0ac4 Merge "Avoid invalidating view during some outline invalidations" into lmp-dev 2014-09-15 22:40:04 +00:00
Chet Haase
27652eff44 Avoid invalidating view during some outline invalidations
We were invalidating the view during outline invalidation far
too often. Sometimes, it's appropriate to invalidate the view when
the outline changes, but not when the outline is being invalidated
in the middle of drawing the view, which is done in reaction to a view
invalidation.

Issue #17460940 Volantis: panning in Calendar from month to month is only at 30fps

Change-Id: I7bdee17dc9c7df89d4cd3d781010823cef931222
2014-09-15 15:33:10 -07:00
Ang Li
953b5625d5 Fix a typo in comment.
Change-Id: I23224b1adf946ebec0ec7a39686913189c9b8287
2014-09-15 15:09:16 -07:00
Jeff Sharkey
2d360218b4 am 1d98fbf2: Merge "Update API naming to follow style guide." into lmp-dev
* commit '1d98fbf27258cbe98e9f7226cc6baedd83a80d3d':
  Update API naming to follow style guide.
2014-09-15 22:01:59 +00:00
Chris Craik
aca8b5fd6b am 447f8cd8: Merge "Enable shadow for GhostView" into lmp-dev
* commit '447f8cd8e5b71119eaee3d6b9b319caeacd9e5cb':
  Enable shadow for GhostView
2014-09-15 22:01:51 +00:00
Ihab Awad
e11a3b798b am 336c84c3: Merge "Add system feature for ConnectionService API support (1/3)" into lmp-dev
* commit '336c84c35722e221cb3ec5d99c3876a5e5015e2a':
  Add system feature for ConnectionService API support (1/3)
2014-09-15 22:01:41 +00:00
Jeff Sharkey
49c0e7375b Merge "Update API naming to follow style guide." into lmp-dev 2014-09-15 21:51:18 +00:00
Chris Craik
7436d1997c Merge "Enable shadow for GhostView" into lmp-dev 2014-09-15 21:32:06 +00:00
Adam Powell
d044ad97a8 Finish materializing dialogs
Fix bottom spacing for dialogs with no button bar

Remove default dividers from dialog lists

Bug 17503404

Change-Id: Icdcaaad99f70a259ff3f892d6385257801e38437
2014-09-15 14:30:23 -07:00
Jeff Sharkey
de74231f24 Update API naming to follow style guide.
Bug: 17510755
Change-Id: If73d81b416355559592feb895a62132194f4ba62
2014-09-15 14:17:46 -07:00
Ihab Awad
de4e52aa49 Merge "Add system feature for ConnectionService API support (1/3)" into lmp-dev 2014-09-15 20:14:51 +00:00
Wink Saville
02e3979d62 Merge commit 'e58e59cc' into fix-merge-conflict
* commit 'e58e59cc':
  ksd to lmp-sprout-dev

Conflicts:
	core/java/android/provider/CallLog.java
	telephony/java/android/telephony/SubInfoRecord.java
	telephony/java/android/telephony/SubscriptionManager.java
	telephony/java/android/telephony/TelephonyManager.java
	telephony/java/com/android/internal/telephony/ISub.aidl
	telephony/java/com/android/internal/telephony/TelephonyIntents.java

Change-Id: I2b892b692743a7ccde55185a2b90135bf28408cd
2014-09-15 12:40:02 -07:00
George Mount
2511bf3e42 am 9da2ace7: Merge "Fixed OOM due to visibility transitions." into lmp-dev
* commit '9da2ace7b05124d4709846e714f6abf9f78c9b04':
  Fixed OOM due to visibility transitions.
2014-09-15 19:28:33 +00:00
George Mount
fc64541f51 am 4bf9a24d: Merge "Fixed enter/exit transitions working against shared elements." into lmp-dev
* commit '4bf9a24d6bbe3a95cf1f1740a6df931c282d5adc':
  Fixed enter/exit transitions working against shared elements.
2014-09-15 19:28:29 +00:00
Eino-Ville Talvala
2396727e99 am ac7be719: Merge "Camera2: Clean up corner case error handling" into lmp-dev
* commit 'ac7be7192127be81b7cc0737c86c04a1f6aba851':
  Camera2: Clean up corner case error handling
2014-09-15 19:28:25 +00:00
Andres Morales
d5e212ae7f am 1d436165: Merge "Add hidden API for pausing and resuming NFC polling." into lmp-dev
* commit '1d4361657a3478c77d6a71c248a007d04f8106e6':
  Add hidden API for pausing and resuming NFC polling.
2014-09-15 19:28:05 +00:00
George Mount
08ff5c14fe Merge "Fixed OOM due to visibility transitions." into lmp-dev 2014-09-15 18:12:24 +00:00
George Mount
94e7e7ef91 Merge "Fixed enter/exit transitions working against shared elements." into lmp-dev 2014-09-15 18:12:13 +00:00
Eino-Ville Talvala
5fa15be4e9 Merge "Camera2: Clean up corner case error handling" into lmp-dev 2014-09-15 18:11:11 +00:00
George Mount
27bc8aa583 Fixed enter/exit transitions working against shared elements.
Bug 17499971

The enter and exit transitions were targeting the shared element.
This means you'd get double transitions on the shared element.

Also, the enter transition was not properly initialized to have
an invalid target so it was targeting all views.

Change-Id: I4f3510c70bea90f09be01776bc0ad1ffb42d99d5
2014-09-15 11:08:39 -07:00
George Mount
79b2781aa7 Fixed OOM due to visibility transitions.
Have maximum size for Visibility transition bitmaps.

Also changed Visibility to avoid transitioning out child views
while transitioning out their parents.

Also moved view-to-bitmap code to common utility.

Bug 17469198

Change-Id: I05f069a267539b479da1b39cdad2cc9270c5c381
2014-09-15 11:05:36 -07:00
Sander Alewijnse
38ea779b42 Update targetSdkVersion check.
Bug:16509819
Change-Id: I471c4a5b2450b4cc64414dfa2dae75d51cce3abb
2014-09-15 18:54:15 +01:00
Ihab Awad
1ec6888685 Add system feature for ConnectionService API support (1/3)
Bug: 17445268
Change-Id: Ibf52cb394f00d075afd07b883a91f00da84b3c85
2014-09-15 09:10:54 -07:00
Andres Morales
bd9d664743 Merge "Add hidden API for pausing and resuming NFC polling." into lmp-dev 2014-09-15 15:10:45 +00:00
George Mount
48520a6c5a am e0b9e2f1: am 7d3d95e7: Merge "Fix exit transitions hiding views permanently." into lmp-dev
* commit 'e0b9e2f107660e09daa5c0a5ecc1a616cd7da097':
  Fix exit transitions hiding views permanently.
2014-09-15 14:43:29 +00:00
George Mount
8c598767a7 am 7d3d95e7: Merge "Fix exit transitions hiding views permanently." into lmp-dev
* commit '7d3d95e790c475c81da9be60d3355637ac5b4332':
  Fix exit transitions hiding views permanently.
2014-09-15 14:22:36 +00:00
George Mount
2911b2046a Merge "Fix exit transitions hiding views permanently." into lmp-dev 2014-09-15 14:06:52 +00:00
Yohei Yukawa
dc489241cf Minimize the number of default enabled IMEs part 3
With this CL, the behavior of getDefaultEnabledImes() changes
as follows:

- Previously system IMEs are always enabled by default as long
  as it is a software keyboard that supports En_* subtype. With
  this CL, getDefaultEnabledImes() relies on the locale returned
  from getFallbackLocaleForDefaultIme() instead of calling
  isSystemImeThatHasEnglishKeyboardSubtype() to minimize the
  number of enabled IMEs.
- Previously default enabled system IMEs are chosen in a
  country-agnostic way. As a result, "en_IN" is enabled even
  when the system locale is "en_US". With this CL, the system
  first tries to find IMEs with taking the coutnry into account,
  and use the country-agnostic way when and only when fallback
  logic is required.

BUG: 17347871
Change-Id: I6571d464a46453934f0a8f5e79018a67a9a3c845
2014-09-15 13:13:45 +09:00
Alan Viverette
14d639755e am 62b910c0: am 6ef642ca: Merge "Clean up view drawable tinting methods, fix default modes" into lmp-dev
* commit '62b910c008da3fbcf11f67340002aa14e1d297b0':
  Clean up view drawable tinting methods, fix default modes
2014-09-15 00:00:37 +00: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
Chris Craik
203d1cce5c Enable shadow for GhostView
bug:17331776
Change-Id: Ia5819422e8cb53d2a4da110f819823b4e90e2fee
2014-09-14 16:28:52 -07:00
Adam Powell
35e752ef62 am 51bf4916: am 86a3adca: Merge "Magic null-background filling for PhoneWindows" into lmp-dev
* commit '51bf49165c01c6ee7386fcee35c17cf636a151cb':
  Magic null-background filling for PhoneWindows
2014-09-14 23:21:09 +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
Adam Powell
9dbe94d8cd Merge "Magic null-background filling for PhoneWindows" into lmp-dev 2014-09-14 22:51:29 +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
Chet Haase
c148f7d008 am f2fdeb5f: am f9f4d316: Merge "set correct bounds in ActionBar based on visibility of ActionBarView" into lmp-dev
* commit 'f2fdeb5fe8770cfe09163a151a140f7ce59e6f0f':
  set correct bounds in ActionBar based on visibility of ActionBarView
2014-09-14 21:54:50 +00:00
Eino-Ville Talvala
9503785393 Camera2: Clean up corner case error handling
- If a session is closed, and a new session is created immediately
afterwards, but then fails to be configured, the first session sees an
onUnconfigured call which it wasn't expecting, and throws an
exception on an internal thread, leading to app death.
Add a guard against this case.

- If the lower levels skip a frame (illegal per design), be slightly more
robust to that by accepting any successful result as the latest completed
frame, instead of just incrementing the completed frame count. This will
lead to missing results, but should allow shutdown, etc, to complete
cleanly.

- Convert TIMED_OUT error codes to CAMERA_ERROR CameraAccessExceptions.
This is a common error code returned by waitUntilIdle.

Also, improve debug logging to log a session ID with verbose logging,
and add a few verbose logs.

Bug: 16899526
Change-Id: I7a31f0a12effc2611e1f9c2408224ee82c37c912
2014-09-14 14:41:47 -07: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