Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
177,605 Commits 3 Branches 0 Tags
38b5d057f08a1a05df44f94de1053f74739c6677
Commit Graph

48524 Commits

Author SHA1 Message Date
Igor Murashkin
110a880342 am 6d2cca33: Merge "camera2-legacy: Fix jpeg thumbnail quality not being set" into lmp-dev 
* commit '6d2cca330f2bfd7e9fc4699f3e8248762454e344':
  camera2-legacy: Fix jpeg thumbnail quality not being set
 2014-09-16 08:44:09 +00:00
Adam Lesinski
3d52cb5da2 am 1416621b: Merge "Show the lockscreen when more than 1 user is present" into lmp-dev 
* commit '1416621b4407fe8a1b488cface2be5743fa4b7a3':
  Show the lockscreen when more than 1 user is present
 2014-09-16 08:44:06 +00:00
Eino-Ville Talvala
f0a9713e18 am 3703cae1: Merge "Camera2: Check for sequence complete sooner." into lmp-dev 
* commit '3703cae1eec5128f0f93ca873a06ca41e99b1805':
  Camera2: Check for sequence complete sooner.
 2014-09-16 08:44:02 +00:00
Alan Viverette
8f9fc07aa0 am 1375db70: Merge "Always apply ImageView\'s tint attribute using SRC_ATOP by default" into lmp-dev 
* commit '1375db7006e58635912a2fafce1ede47ed10bac0':
  Always apply ImageView's tint attribute using SRC_ATOP by default
 2014-09-16 08:43:58 +00:00
Yohei Yukawa
ce0a930be2 am 8219934a: Merge "Minimize the number of default enabled IMEs part 3" into lmp-dev 
* commit '8219934a5569b14a3bc9223bc33164e2fe05c044':
  Minimize the number of default enabled IMEs part 3
 2014-09-16 08:43:51 +00:00
Ang Li
909c459169 am 36fdf64f: Merge "Fix a typo in comment." into lmp-dev 
* commit '36fdf64f0305db556a448efae1b9f0241a3b5ee0':
  Fix a typo in comment.
 2014-09-16 08:43:47 +00:00
Adam Powell
7920c579dc am 3b2dfa7a: Merge "Treat empty string as title-set in ToolbarWidgetWrapper" into lmp-dev 
* commit '3b2dfa7a301d8e45b3e6f3c99f95b7ba27bb3bf2':
  Treat empty string as title-set in ToolbarWidgetWrapper
 2014-09-16 08:43:43 +00:00
Adam Powell
3b1a9b3f69 am 17ec7920: Merge "Finish materializing dialogs" into lmp-dev 
* commit '17ec7920bab6cbec4be42f4f0db8c8e6cc2f484e':
  Finish materializing dialogs
 2014-09-16 08:43:35 +00:00
Chet Haase
4aec3867fe am 4b20b031: Merge "Avoid invalidating view during some outline invalidations" into lmp-dev 
* commit '4b20b03109947531f934bbeed819f522cf8f43b8':
  Avoid invalidating view during some outline invalidations
 2014-09-16 08:43:20 +00:00
George Mount
409e9a32c0 am b3a4720f: am aa386270: am 9da2ace7: Merge "Fixed OOM due to visibility transitions." into lmp-dev 
* commit 'b3a4720f3411ac14002d6d8b69fc15d4188829fb':
  Fixed OOM due to visibility transitions.
 2014-09-16 08:40:49 +00:00
George Mount
ded715cd78 am 5846345b: am 9588dada: am 4bf9a24d: Merge "Fixed enter/exit transitions working against shared elements." into lmp-dev 
* commit '5846345b2a97a1441c37902539f7ceadc80f8fbc':
  Fixed enter/exit transitions working against shared elements.
 2014-09-16 08:40:44 +00:00
Eino-Ville Talvala
197244c414 am d9d6b219: am 194e9509: am ac7be719: Merge "Camera2: Clean up corner case error handling" into lmp-dev 
* commit 'd9d6b219d6bc1fddd4d0871dc765d670d6e8b817':
  Camera2: Clean up corner case error handling
 2014-09-16 08:40:38 +00:00
Andres Morales
76d2e35f57 am f26f125a: am e887d0a5: am 1d436165: Merge "Add hidden API for pausing and resuming NFC polling." into lmp-dev 
* commit 'f26f125a5240bea2f3aa7daaea490d53daaefcc8':
  Add hidden API for pausing and resuming NFC polling.
 2014-09-16 08:40:14 +00:00
Jeff Sharkey
ec20c174db am 07b76d6f: am 1d98fbf2: Merge "Update API naming to follow style guide." into lmp-dev 
* commit '07b76d6fed3bf3ba4a61226b9dd1484e69e084ac':
  Update API naming to follow style guide.
 2014-09-16 08:39:37 +00:00
Chris Craik
23034c9328 am 103a3379: am 447f8cd8: Merge "Enable shadow for GhostView" into lmp-dev 
* commit '103a33792460a4e16b4f3a2a57a315a19a3a719e':
  Enable shadow for GhostView
 2014-09-16 08:39:24 +00:00
Ihab Awad
6de325caa0 am fd9884ad: am 336c84c3: Merge "Add system feature for ConnectionService API support (1/3)" into lmp-dev 
* commit 'fd9884adc315137dca6a49777d7767d258fdc862':
  Add system feature for ConnectionService API support (1/3)
 2014-09-16 08:39:13 +00:00
Sandeep Siddhartha
8cf8f71644 Fix issues with multiple languages and multi-users 
For multi-user the issue was looking into the user ID of the current
process instead of the active user. The current process was the system
process and the call to UserManager was returning a user handle that
wasn't of any use while trying to map sound models to a user.

For language, the issue was that we were incorrectly just looking up the
model based on the keyphrase id, however we should have also taken the
enrolled model's locale into account.

Explicitly document that for model management the string representation of locales
is a BCP47 language tag.

Remove debug logging.

Bug: 16798166
Bug: 17462570
Bug: 17463511
Change-Id: Ieffb3e218de63f6e7f40af9705dced481a35b0ad
 2014-09-15 19:59:09 -07:00
Alan Viverette
d015e3454e Properly handle dispatchRestoreInstanceState for new-style DatePicker 
Fixes reversed day/month/year in restore instance state.

BUG: 17514055
Change-Id: Id839f2f0dbca47034dc84100dbeb1c32e8848178
 2014-09-15 19:27:55 -07:00
Alan Viverette
d735c9b1ed Fix TimePicker.setCurrentHour() when argument is 0 
BUG: 17515453
Change-Id: Ie67db01ed3c574a23ec377de15e48aa1b4ae3709
 2014-09-15 18:54:10 -07:00
Edward Jee
1bbfcc2fdc Merge "Adds APIs for Bluetooth PBAP and MAP access permission." into lmp-dev 2014-09-16 01:19:19 +00:00
Igor Murashkin
4e5eddff5e Merge "camera2-legacy: Fix jpeg thumbnail quality not being set" into lmp-dev 2014-09-16 00:58:24 +00:00
Igor Murashkin
89bb63f395 camera2-legacy: Fix jpeg thumbnail quality not being set 
Bug: 17472049
Change-Id: I6ce9f2bb07def86bc58b4b2495c58ee6762a65e1
 2014-09-15 17:54:09 -07:00
Adam Lesinski
3846c1d261 Merge "Show the lockscreen when more than 1 user is present" into lmp-dev 2014-09-16 00:50:23 +00:00
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
George Mount
2716ff8fa7 am aa386270: am 9da2ace7: Merge "Fixed OOM due to visibility transitions." into lmp-dev 
* commit 'aa386270cf60bb57dfcad5f0b5cded9d4a87b978':
  Fixed OOM due to visibility transitions.
 2014-09-15 22:04:49 +00:00
George Mount
6521ebcfdb am 9588dada: am 4bf9a24d: Merge "Fixed enter/exit transitions working against shared elements." into lmp-dev 
* commit '9588dada867027b3938ba99b0cacfda7f784c2b7':
  Fixed enter/exit transitions working against shared elements.
 2014-09-15 22:04:36 +00:00
Eino-Ville Talvala
c27591b8eb am 194e9509: am ac7be719: Merge "Camera2: Clean up corner case error handling" into lmp-dev 
* commit '194e950920fd5ef1188d3b55fbbecf54b2dc26a1':
  Camera2: Clean up corner case error handling
 2014-09-15 22:04:30 +00:00
Andres Morales
43a4762e88 am e887d0a5: am 1d436165: Merge "Add hidden API for pausing and resuming NFC polling." into lmp-dev 
* commit 'e887d0a59e3e0e28ffdbb7d584fbca67c9c350b9':
  Add hidden API for pausing and resuming NFC polling.
 2014-09-15 22:04:05 +00: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
Paul Miller
3ff073ad0a Disallow passing a StringBufferInputStream to a WebResourceResponse 
BUG:17489928

Change-Id: Ie41671ad721c0c4da95d96332c4ec4d4ca2bff7c
 2014-09-15 20:18:50 +00: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