drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
185,779 Commits 1 Branch 0 Tags
Commit Graph

185779 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jay Shrauner
a6baa77482 Merge "Check for empty lookup keys in getLookupUri" 2015-03-23 21:03:33 +00:00
Jeff Brown
04bf45a300 Merge "resolved conflicts for merge of 13d81b6d to master" 2015-03-23 21:02:30 +00:00
Miao Wang
b2b0c4c207 Merge "[RenderScript] Add create(Context, int) to be compatible with the thunker layer & minor tweaks." 2015-03-23 21:01:59 +00:00
Julia Reynolds
151df5db5f Merge "DPM constants for specifying minimum version numbers for DO and DIA." 2015-03-23 21:01:30 +00:00
Craig Mautner
00a6675461 Add null check and call destroy from single point. 
Ensure that calling destroy() on a DimLayer surface only happens
once.

Fixes bug 19660387.

Change-Id: Iee8ea20b5d7c3a8f81f14a3ecff66a1dc1a8d719
 2015-03-23 14:00:47 -07:00
Dianne Hackborn
0b071a08d8 Add view ID, rework assist API. 
Add view ID information to the assist structure.

Also rework the API to simplify how it works by removing
the ViewNode wrapper around ViewNodeImpl -- these are now
just the same thing.  And then add complexity by introducing
a formal WindowNode object that contains the top-level window
information (so I can add in some more window-specific info
in the future).

Change-Id: I5d525cf61ab6a73193e5cceb4c09d2d21cc27bae
 2015-03-23 13:59:47 -07:00
Alan Viverette
53796737eb Merge "Fix default width and height for PopupWindow's decor view" 2015-03-23 20:54:43 +00:00
Jeff Brown
221a8277dc resolved conflicts for merge of 13d81b6d to master 
Change-Id: Icb72123fcf4b74e97d9a62504caf8a17eb65c9e6
 2015-03-23 13:53:09 -07:00
Alan Viverette
29abdb429c Merge "Correctly apply android:theme attribute from <include> tag" 2015-03-23 20:50:54 +00:00
Alan Viverette
150a59330b Merge "Update DatePicker and CalendarView to latest Material spec" 2015-03-23 20:45:56 +00:00
Alan Viverette
ab517ef4d8 Merge "Refactor theme colors, fix dialog background, accent in light Settings" 2015-03-23 20:45:33 +00:00
Wale Ogunwale
e0cc2f652b Changed recent multi-window UI to use persist.sys.debug.multi_window 
Consistent with what is been set under developer options.

Change-Id: I871ba1b612e344846c33fae68ad3286f7bec1b4b
 2015-03-23 13:44:36 -07:00
Alan Viverette
b0a2fbce16 Refactor theme colors, fix dialog background, accent in light Settings 
Bug: 19706726
Change-Id: If81c0a4775c366ae1a278d79f6353670182f7d27
 2015-03-23 13:42:06 -07:00
Anthony Hugh
c8bb597fba am 09ebc52a: am 7c08dd61: Merge "DO NOT MERGE: Set the appliance (tv/watch) in the configuration earlier" into lmp-mr1-modular-dev 
* commit '09ebc52a851d3432087a622a9372a071a1c0c761':
  DO NOT MERGE: Set the appliance (tv/watch) in the configuration earlier
 2015-03-23 20:28:35 +00:00
Anthony Hugh
09ebc52a85 am 7c08dd61: Merge "DO NOT MERGE: Set the appliance (tv/watch) in the configuration earlier" into lmp-mr1-modular-dev 
* commit '7c08dd61c43d76241c8f47c5aae934486605a80e':
  DO NOT MERGE: Set the appliance (tv/watch) in the configuration earlier
 2015-03-23 20:21:58 +00:00
Anthony Hugh
7c08dd61c4 Merge "DO NOT MERGE: Set the appliance (tv/watch) in the configuration earlier" into lmp-mr1-modular-dev 2015-03-23 20:15:50 +00:00
Alan Viverette
0ef59ac0e5 Update DatePicker and CalendarView to latest Material spec 
Bug: 19431364
Change-Id: If364a051a5208d170495de4182e46b32c7560e08
 2015-03-23 13:13:25 -07:00
Adam Lesinski
11cc1f166d DO NOT MERGE: Set the appliance (tv/watch) in the configuration earlier 
Some UI is displayed (boot/optimizing) before the configuration
has been completely set. This noteably happens for watches and
TVs because UIModeManagerService hasn't started yet.

UIModeManagerService is started earlier, and its dependency
TwilightService is loaded during the "all system services ready"
boot phase.

b/18388692

Change-Id: Iabdf8ac3eb04ebcb44779d752e19042769cc65c6
 2015-03-23 12:02:52 -07:00
Miao Wang
a4e5adf955 [RenderScript] Add create(Context, int) to be compatible with 
the thunker layer & minor tweaks.

bug:19888167
bug:19888339
Change-Id: Ib264c4ca48c990b3476456838047f73d95f6752f
 2015-03-23 11:50:18 -07:00
Craig Mautner
4774f6a4e4 Recalculate input method top edge. 
The bottom edge of an input method target window is set using the top
edge of the input method window. A switch from using the input
method's content frame's top edge to its display frame's top edge
(ag/634725) caused the underlying window to be obscured. This fix uses
the lower of the two frames to set the bottom edge of the target
window.

Fixes bug 19434816.

Change-Id: I5fe73fbe8a432b24a12c030f029cdfcd55e23274
 2015-03-23 11:49:03 -07:00
Adam Lesinski
3561761776 Merge "Set the appliance (tv/watch) in the configuration earlier" 2015-03-23 18:33:10 +00:00
Alan Viverette
2a16460c7c Merge "Fix radial time picker for Explore by Touch and scroll actions" 2015-03-23 17:35:40 +00:00
Alan Viverette
4a6bd692d2 Fix radial time picker for Explore by Touch and scroll actions 
Bug: 19889521
Change-Id: I4fa6b9e0459630ecdb4144f4640213415247735a
 2015-03-23 10:34:23 -07:00
Zhijun He
709a4de485 Merge "media: fix build break" 2015-03-23 17:30:28 +00:00
Zhijun He
d1cbc68405 media: fix build break 
clang/llvm complains the timestamp print formating.

Change-Id: Ie4bff9cbec90994709097d087d1c1f2a7d1465cf
 2015-03-23 10:10:04 -07:00
Michael Wright
722612707e am b42baaa8: am 978cfc39: Merge "SystemUI needs the SET_WALLPAPER permission" 
* commit 'b42baaa829be7efa692088e97a44712daecbf5f4':
  SystemUI needs the SET_WALLPAPER permission
 2015-03-23 16:02:24 +00:00
Michael Wright
b42baaa829 am 978cfc39: Merge "SystemUI needs the SET_WALLPAPER permission" 
* commit '978cfc39a10e1b95f9d6dfb5c8e9eb58a10ce0ec':
  SystemUI needs the SET_WALLPAPER permission
 2015-03-23 15:55:53 +00:00
Michael Wright
978cfc39a1 Merge "SystemUI needs the SET_WALLPAPER permission" 2015-03-23 15:43:23 +00:00
Geoff Mendal
abdbf1860c Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev 2015-03-23 15:41:51 +00:00
Geoff Mendal
ecad2e2c34 Merge "Import translations. DO NOT MERGE" 2015-03-23 15:41:25 +00:00
Geoff Mendal
762e4ed2ee Import translations. DO NOT MERGE 
Change-Id: Iab2d39063389eedb4a3fbaff17064b05583c1196
Auto-generated-cl: translation import
 2015-03-23 08:00:56 -07:00
Geoff Mendal
bd43ee44b2 Import translations. DO NOT MERGE 
Change-Id: I61b935f025acf57c934bca1b3ed954838c26a122
Auto-generated-cl: translation import
 2015-03-23 07:52:26 -07:00
Geoff Mendal
521c125d56 Import translations. DO NOT MERGE 
Change-Id: I7298b94a7d28dc5e674054aa7204d5c652fb12a9
Auto-generated-cl: translation import
 2015-03-23 06:15:29 -07:00
Geoff Mendal
4d17b9549e am 2f12b803: (-s ours) am eded9424: (-s ours) Import translations. DO NOT MERGE 
* commit '2f12b803e913117edbed7a9409f04b1d00686eba':
  Import translations. DO NOT MERGE
 2015-03-23 12:55:52 +00:00
Samuel Asteberg
8d516a80a0 SystemUI needs the SET_WALLPAPER permission 
If changing wallpaper when low on memory, retrieving the default
wallpaper may return null, which triggers error handling in
ImageWallpaper. This error handling tries to perform
WallpaperManager.clear(), but for that it needs SET_WALLPAPER
permission, which it does not have.

For users with apps that auto change wallpaper, this issue can
be frequent in low-memory conditions.

The solution is to add the permisson.

Change-Id: I81503c1667e3952c2dd15599969f7dcc51623e5b
 2015-03-23 13:50:09 +01:00
Geoff Mendal
2f12b803e9 am eded9424: (-s ours) Import translations. DO NOT MERGE 
* commit 'eded9424305cb6538cc0516670930a9f8fccbfd1':
  Import translations. DO NOT MERGE
 2015-03-23 12:49:39 +00:00
Geoff Mendal
eded942430 Import translations. DO NOT MERGE 
Change-Id: I911df3cb6476017bb6723403dbabb2dfbfc4bce2
Auto-generated-cl: translation import
 2015-03-23 05:38:24 -07:00
Dongwon Kang
731843e424 TIF: fix NPE in the case a hardware TV input is not ready to use. 
Bug: 19805327
Change-Id: I0c96ab9274ea2404d75b02205ef40f56fb4552f6
 2015-03-23 17:13:55 +09:00
Dongwon Kang
e638966972 TIF: Add COLUMN_INTERNAL_PROVIDER_FLAGX to TvContract.Programs 
These flags are expected to be used for TV input's internal purpose.

Bug: 19190140
Change-Id: Ie45a582287a83abdbecb129f5c03cc166f617776
 2015-03-23 15:33:49 +09:00
tiger_huang
1263b2f1f2 Prevent unexpected rotation while going back to keyguard 
The original logic would let the app hidden by keyguard be able to
decide the orientation. While going back from a show-when-locked app
to keyguard, there would be a short time that keyguard is unable to
decide the orientation, which causes WMS uses the wrong orientation
from the wrong app.

https://code.google.com/p/android/issues/detail?id=155640

Change-Id: Ibc17bfe4603f68b241dc7380459ec9de42a3e259
 2015-03-23 05:58:46 +00:00
Alan Viverette
259c284069 Fix default width and height for PopupWindow's decor view 
Fixes a regression whereby failing to explicitly set a width and height
would cause the popup window's decor view to be 0 width and height.

Also deprecates unnecessary method for setting window width and
height spec and replaces with less-confusing setters.

Cleans up javadoc for modified methods.

Bug: 19538371
Change-Id: I20da3ff02ad12e99adf14c056edd1a890b5c322a
 2015-03-22 17:39:39 -07:00
Jeff Sharkey
bf2673384c Merge "Bring MountService into the SystemService world." 2015-03-22 20:03:55 +00:00
Jeff Sharkey
56e629322f Bring MountService into the SystemService world. 
Change-Id: I7f7db49ff373b199f7b81f184a7c62bee682af67
 2015-03-21 20:41:00 -07:00
Alex Klyubin
afa10ad39a am 2110a28a: am a4c4c575: Merge "Add android.security.NetworkSecurityPolicy." 
* commit '2110a28a6c7ef7d7802028d0a2dd9c14ceb432e1':
  Add android.security.NetworkSecurityPolicy.
 2015-03-22 00:40:51 +00:00
Griff Hazen
583c7c569b am 38f75097: am 0b42ff79: Merge "Allow emulator to select a window outset bottom" into lmp-mr1-modular-dev 
* commit '38f75097ff0bc265dbfba9c40cda6c017078b82e':
  Allow emulator to select a window outset bottom
 2015-03-22 00:11:11 +00:00
Griff Hazen
38f75097ff am 0b42ff79: Merge "Allow emulator to select a window outset bottom" into lmp-mr1-modular-dev 
* commit '0b42ff7916e6cc32c812a3be8f3e4ebdf96e8553':
  Allow emulator to select a window outset bottom
 2015-03-22 00:05:48 +00:00
Griff Hazen
0b42ff7916 Merge "Allow emulator to select a window outset bottom" into lmp-mr1-modular-dev 2015-03-21 23:59:46 +00:00
Alan Viverette
12062c6e99 am 19537c0a: am 38fcaf40: Merge "Move arrow_pointer hotspot to better match actual tip" 
* commit '19537c0a18998622c8555573a7df0b32853fbde3':
  Move arrow_pointer hotspot to better match actual tip
 2015-03-21 20:26:16 +00:00
Alan Viverette
19537c0a18 am 38fcaf40: Merge "Move arrow_pointer hotspot to better match actual tip" 
* commit '38fcaf4037a50225b931551a48c898c7b0bb4db2':
  Move arrow_pointer hotspot to better match actual tip
 2015-03-21 20:20:48 +00:00
Alan Viverette
38fcaf4037 Merge "Move arrow_pointer hotspot to better match actual tip" 2015-03-21 20:06:57 +00:00