Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
151,901 Commits 3 Branches 0 Tags
ea0dbf3fa29a409f4d9a2c75eb78d88677da2a52
Commit Graph

44101 Commits

Author SHA1 Message Date
Craig Mautner
ea0dbf3fa2 am 880d88b3: Merge "Restore changes that were needed." into lmp-dev 
* commit '880d88b308c73a598578f39892a3f01c201d9314':
  Restore changes that were needed.
 2014-09-16 23:00:11 +00:00
Craig Mautner
a67d9095b7 Restore changes that were needed. 
Reverting the changes in ag/548487 also reverted alanv's changes
in ag/547793. This restores alanv's changes.

Fixes build.

Change-Id: Ifa2aa928a3ad29fe49e52dbec4e4833538dfe7e9
 2014-09-16 15:50:32 -07:00
Craig Mautner
a0610d425f am b53e4c4a: Merge "Revert "Fix various bugs in DatePickerCalendarDelegate"" into lmp-dev 
* commit 'b53e4c4a3879b0a3e649e62a07734643ee3122ae':
  Revert "Fix various bugs in DatePickerCalendarDelegate"
 2014-09-16 22:24:10 +00:00
Craig Mautner
704991224d Merge "Revert "Fix various bugs in DatePickerCalendarDelegate"" into lmp-dev 2014-09-16 22:16:29 +00:00
Craig Mautner
706b3547f8 Revert "Fix various bugs in DatePickerCalendarDelegate" 
alanv@ fixed this yesterday.

This reverts commit 82537efa4c5f4aad12b9aa249fb27eda21647f39.

Change-Id: If2b91ee36f8b24f695200ac1a87a306246ee5e44
 2014-09-16 22:13:39 +00:00
Craig Mautner
f5c84c8622 am 459b2ba5: Merge "Fix various bugs in DatePickerCalendarDelegate" into lmp-dev 
* commit '459b2ba58c771d67f8d119b241e8dc4f7958dd97':
  Fix various bugs in DatePickerCalendarDelegate
 2014-09-16 21:40:31 +00:00
Craig Mautner
f6b4254bef Merge "Fix various bugs in DatePickerCalendarDelegate" into lmp-dev 2014-09-16 21:30:29 +00:00
Craig Mautner
9c26b54d3c Fix various bugs in DatePickerCalendarDelegate 
These bugs were exposed by cts DatePickerTest.

Fixes one item in 17459129.

Change-Id: Ifab52c6e6e760b75633aa4fe8ccf2d724f587e09
 2014-09-16 13:57:59 -07:00
Amit Mahajan
dfbd7494f7 am c5429d6f: Merge "Use Op package name when creating toasts" into lmp-dev 
* commit 'c5429d6feab77ad1e426afb5bddc6fcfda06d37e':
  Use Op package name when creating toasts
 2014-09-16 20:57:28 +00:00
Amit Mahajan
915a666c21 Merge "Use Op package name when creating toasts" into lmp-dev 2014-09-16 20:47:24 +00:00
Alan Viverette
e8e61c5438 am 7194361c: Merge "Properly handle dispatchRestoreInstanceState for new-style DatePicker" into lmp-dev 
* commit '7194361cdaad9150f8440dda99ccdc04556e73e2':
  Properly handle dispatchRestoreInstanceState for new-style DatePicker
 2014-09-16 18:00:39 +00:00
Jorim Jaggi
b6f3e6eb7b am ac980443: Merge "Use RenderThread for navigation bar ripples" into lmp-dev 
* commit 'ac9804435867dfaaebe1887d6de30aee7758bb39':
  Use RenderThread for navigation bar ripples
 2014-09-16 18:00:32 +00:00
Alan Viverette
328c630ab6 Merge "Properly handle dispatchRestoreInstanceState for new-style DatePicker" into lmp-dev 2014-09-16 17:55:31 +00:00
Jorim Jaggi
072707dfad Use RenderThread for navigation bar ripples 
Bug: 17506181
Change-Id: Icf3b80f8c4bc29fe85313381d4019dda3ef85ea9
 2014-09-16 17:51:55 +00:00
Martijn Coenen
c23e98ad24 am 415ef692: Merge "Fix static AID prefix registration." into lmp-dev 
* commit '415ef6926f06ba39bd366bd1d5a6115d0aead640':
  Fix static AID prefix registration.
 2014-09-16 17:49:39 +00:00
Martijn Coenen
9ed2d5f746 Merge "Fix static AID prefix registration." into lmp-dev 2014-09-16 17:40:30 +00:00
Tony Hill
929442d509 Use Op package name when creating toasts 
Some components may be running in processes other than their
base package using android:process directives. The op package
name must therefore be used otherwise the AppOps check will fail
due to a mismatch between the base package name and the UID.

Bug: 17431423
Change-Id: I429aa46066935b964151a2ec0854f0e14c117c4e
 2014-09-16 10:16:43 -07:00
Martijn Coenen
0985fb6c42 Fix static AID prefix registration. 
Bug: 16517161
Change-Id: Ibaddf8720907f1d28d44231d927f538628bbf9d0
 2014-09-16 10:09:12 -07:00
Martijn Coenen
92dafc67db am cd108cbe: Merge "AID prefix registration." into lmp-dev 
* commit 'cd108cbe643d824437e8a629aa258a62ad237b39':
  AID prefix registration.
 2014-09-16 15:04:53 +00:00
Martijn Coenen
7e25a504d4 Merge "AID prefix registration." into lmp-dev 2014-09-16 14:55:04 +00:00
Edward Jee
d796159bbb am c172b209: Merge "Adds APIs for Bluetooth PBAP and MAP access permission." into lmp-dev 
* commit 'c172b2090317b158974bc73d8baa141449a1d784':
  Adds APIs for Bluetooth PBAP and MAP access permission.
 2014-09-16 08:44:13 +00:00
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
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
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
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