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

138975 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Robert Greenwalt
d88fb3e670 am bcf103d0: Merge "Apply API review to android.net.Network:" into lmp-preview-dev 
* commit 'bcf103d0ef929669268a76aa72bd90ed9af4d63d':
  Apply API review to android.net.Network:
 2014-06-11 17:03:04 +00:00
Matthew Williams
86c9bb94b8 am d6d72e5b: Merge "Fix battery controller non-fire bug" into lmp-preview-dev 
* commit 'd6d72e5bc4e5659eb06606abce01da80e6d2f2b6':
  Fix battery controller non-fire bug
 2014-06-11 17:02:58 +00:00
Matthew Williams
43c4f41adb am 8e8c1401: Fix build. 
* commit '8e8c140114cb3a4f1cf448c4492c13769738ca12':
  Fix build.
 2014-06-11 17:02:53 +00:00
Jorim Jaggi
dbff68ae1a am d8c7eb63: (-s ours) Merge "DO NOT MERGE: Fix paddings for user switch and status bar icons." into lmp-preview-dev 
* commit 'd8c7eb63a96e65cb0b0587f614e0353c1801f455':
  DO NOT MERGE: Fix paddings for user switch and status bar icons.
 2014-06-11 17:02:46 +00:00
Christopher Tate
0d3c637e8a am 67691d13: Merge "Fix build" into lmp-preview-dev 
* commit '67691d130e89135cc8de4cbe03d82058d9ee45b4':
  Fix build
 2014-06-11 17:02:35 +00:00
Winson Chung
09cb074e0e am 16696cb1: Merge "Updating Recents to make the cards slightly more visible." into lmp-preview-dev 
* commit '16696cb15954020880c9bed85376c4b0814ff19d':
  Updating Recents to make the cards slightly more visible.
 2014-06-11 17:02:29 +00:00
Christopher Tate
0188bee2c5 am d8f71d34: Merge "Out with the old; in with the new" into lmp-preview-dev 
* commit 'd8f71d34c3c7fb161a1586de8edb52161c32d672':
  Out with the old; in with the new
 2014-06-11 17:02:18 +00:00
Jose Lima
acdee87366 am a49ab110: Merge "Make convertToTranslucent a public method in Activity" into lmp-preview-dev 
* commit 'a49ab11049339155c156e0f58bb076396695be75':
  Make convertToTranslucent a public method in Activity
 2014-06-11 17:02:13 +00:00
John Spurlock
d038666f3c am 58b243c3: Merge "Saver: Shared resource update and new settings." into lmp-preview-dev 
* commit '58b243c37e74d45129071ac55128c16160e6fac8':
  Saver: Shared resource update and new settings.
 2014-06-11 17:02:07 +00:00
Lorenzo Colitti
5592a725dd Merge "Don't enable Ethernet on the emulator." into lmp-preview-dev 2014-06-10 22:31:57 +00:00
Svetoslav
2f45055618 Merge "Accessibility window changes not reported." into lmp-preview-dev 2014-06-10 22:18:15 +00:00
Svetoslav
e16a5009cc Accessibility window changes not reported. 
On accessibility service side we were asking only for cached windows but since
to optimize performance the system is sending only deltas for windows the service
already introspected, new windows were not seen by the accessibility service.

bug:15092286

Change-Id: I7e9c360f624c53ff1773c485a8907dc425e3352a
 2014-06-11 01:05:04 +00:00
Deepanshu Gupta
dc8455bdc2 Merge "LayoutLib: Fix EditText rendering" into lmp-preview-dev 2014-06-10 22:18:15 +00:00
Deepanshu Gupta
1160e6d2f7 LayoutLib: Fix EditText rendering 
Framework has overloaded java.lang.System.arraycopy() for char[]. The
method is not present on the Desktop VMs. This change replaces the calls
to this method by its more general alternative - the one using Objects.

TODO: Make it more configurable and flexible to allow rewrite of any
such methods in the future.

Change-Id: I6823b13e52b1c555eb257d02b79707d84e73236f
 2014-06-10 17:44:14 -07:00
Zhijun He
e414608cb3 CamcorderProfiles: Add 4K video constants 
Bug: 15287656
Change-Id: Ifbd9d37fb775371e2a4ee5cf80abbf83a75ffd65
 2014-06-10 22:16:41 +00:00
Deepanshu Gupta
352d84fb07 Merge "Remove lxml dependency." into lmp-preview-dev 2014-06-10 22:12:51 +00:00
Deepanshu Gupta
125714173b Remove lxml dependency. 
The encoding for the .ttx file generated is now hard-coded to be utf-8.

Change-Id: I71c208327995651fcf44b6961510f84bafb05848
 2014-06-10 17:00:29 -07:00
Christopher Tate
d3bafe826b Merge "Hide the (obsolescent) android.app.maintenance APIs" into lmp-preview-dev 2014-06-10 22:12:51 +00:00
Christopher Tate
863d8af75a Hide the (obsolescent) android.app.maintenance APIs 
Bug 14994893

Change-Id: If3c06de006504e81c37eb6b716d613e5124d28bc
 2014-06-10 18:20:24 -07:00
Robert Greenwalt
78802575ac Merge "Add a new IpPrefix class and use it in RouteInfo." 2014-06-10 22:12:51 +00:00
Selim Gurun
1ac3e017d4 Merge "Add WebChromeClient.showFileChooser" 2014-06-10 22:13:32 +00:00
Deepanshu Gupta
096e639d3d Merge "LayoutLib: Support more ContextThemeWrappers" into lmp-preview-dev 2014-06-10 22:06:31 +00:00
Deepanshu Gupta
b54b78e215 LayoutLib: Support more ContextThemeWrappers 
ContextThemeWrapper may be the base context for another
ContextThemeWrapper. We now extract the base context till we reach the
final context.

Change-Id: I034444a2d1579241543fd24248530b299e72498a
 2014-06-10 17:44:37 -07:00
Selim Cinek
1c9c717f1b am f1187ac8: Merge "Added card elevation when card is clicked on the lockscreen" into lmp-preview-dev 
* commit 'f1187ac8e8d2c8927caf322a12de8c32ee3f919f':
  Added card elevation when card is clicked on the lockscreen
 2014-06-10 21:41:46 +00:00
Robert Phillips
88b0078468 Merge "Update Picture documentation Enhanced comment" 2014-06-10 21:32:31 +00:00
Vinit Deshpande
daf215cf95 Support scanning using band specification instead of channels 
This change enables scanning with band specification instead of channels,
this should ease app development.

Also includes a bug fix for parcel serialization/deserialization.

Change-Id: Idbffce4805b403bf8fe1efae999cb828e09c2420
 2014-06-12 08:34:44 -07:00
Vinit Deshpande
e344cb2268 Fix an NPE in WifiScanner while reporting description 
Change-Id: Ie9d12e19e0b8ca98c6ec4c6fa5222a2f28983e64
 2014-06-12 08:34:44 -07:00
Svetoslav
4604abc97d Moving and resizing windows not reported propely for accessibility. 
When the position and size of a window changes we have to report that
to the accessibility layer if the window introspection is enabled.

bug:15569915

Change-Id: I3f869e0a582592bfa5f3743d5c2133ee8cb39b34
 2014-06-12 08:26:21 -07:00
Nicolas Prevot
006812acd2 am 485303e2: Merge "Correcting a bug related to Uri permissions." into lmp-preview-dev 
* commit '485303e2e45ca91287400b0b26e1e737062c8839':
  Correcting a bug related to Uri permissions.
 2014-06-12 15:23:38 +00:00
John Reck
dea0f13683 am 82469fb2: (-s ours) Merge "DO NOT MERGE Disable AtlasInitializer" into lmp-preview-dev 
* commit '82469fb2aa173e307c0c92ccdf9db30316502813':
  DO NOT MERGE Disable AtlasInitializer
 2014-06-12 15:23:32 +00:00
Mark Salyzyn
fe2fd536de Merge "hwui: 64-bit compile issue" 2014-06-11 21:23:31 +00:00
Andy McFadden
564dae50b5 Merge "Delete a local ref in getSurface" 2014-06-12 03:30:50 +00:00
Andy McFadden
5ad3ab8a16 Delete a local ref in getSurface 
ANativeWindow_fromSurface() provides a native-only call path to
android_view_Surface_getSurface(), so we need to clean up the
local reference.

Bug 14087233

Change-Id: I92aa5aa492c47a0642fdcb28c717ad7f874e1ad9
 2014-06-11 15:22:32 -07:00
John Reck
de233aec5a Merge "DO NOT MERGE Disable AtlasInitializer" into lmp-preview-dev 2014-06-10 21:55:02 +00:00
John Reck
c60676624c DO NOT MERGE Disable AtlasInitializer 
Bug: 15425820

Change-Id: I15270eb7a5856523625e2de48ef9efc2520ddb0f
 2014-06-11 15:53:53 +00:00
John Spurlock
c830d8f3b1 Merge "SystemUI asset update." into lmp-preview-dev 2014-06-10 21:32:31 +00:00
John Spurlock
899f439a29 SystemUI asset update. 
- Updated location icons.
- Updated no-sim, plumb up to QS.
- Updated zen mode synthetic notification icon.
- Updated color inversion icons.

Change-Id: I4849fbe11683feab37160c3d23502b01035de66a
 2014-06-11 11:04:43 -04:00
justinzhang
800c103495 Hide status bars in lock task 
Call StatusBarManager to show/hide status bars for lock task.
(Same CL as https://googleplex-android-review.git.corp.google.com/#/c/461068/,
sorry for the confusion.)

Bug: 13669575
Change-Id: I5c90bdb1d868aa02d3679e854b5ccbe434d996d6
(cherry picked from commit cc2365ac9eae0393154c863a21286c9a95311e15)
 2014-06-11 14:53:28 +00:00
Jessica Hummel
542588e3ba Update documentation so it meets api requirements 
Change-Id: Ice52dc3d5ecca77f81d3df1b43179c94aece6fef
bug:15023443

Conflicts:
	api/current.txt
	core/java/android/app/admin/DeviceAdminReceiver.java
 2014-06-11 11:37:53 +01:00
John Spurlock
edbfd04060 Merge "Brightness slider no longer displays the automatic icon." into lmp-preview-dev 2014-06-10 21:32:31 +00:00
John Spurlock
6d20526adf Brightness slider no longer displays the automatic icon. 
Bug:15414855
Change-Id: I3a1b8e7758e41abd172c20177f42452077bfc7a7
 2014-06-10 19:28:03 -04:00
Julia Reynolds
1b8aef2be7 Merge "Material-ize the restrictions pin challenge." 2014-06-10 21:32:31 +00:00
Adrian Roos
e74b853d9f resolved conflict for merge of 3ca33b70 to master 
Change-Id: I5226015ca7cef030586349cc698a46e458ac788e
 2014-06-11 15:02:55 +02:00
Jorim Jaggi
e6cad8027c am 5eb62efd: Merge "Do not override mColor with default color if none set" into lmp-preview-dev 
* commit '5eb62efd935399335ee2504a483900c69a45494a':
  Do not override mColor with default color if none set
 2014-06-11 12:41:45 +00:00
Florin Malita
cf6edd2b22 Merge "Pass full matrix + clip save flags to the native SkCanvas." 2014-06-10 21:32:31 +00:00
Przemyslaw Szczepaniak
d3919a318a Add missing copyright headers in speech.tts 
Change-Id: Icf1c3cf71ac45cb00606c8034af375e657c31ea5
 2014-06-12 12:39:46 +00:00
Dan Sandler
59c11b5dda Merge "NotificationListenerService: API updates" into lmp-preview-dev 2014-06-10 21:32:31 +00:00
Christoph Studer
d0694b6735 NotificationListenerService: API updates 
Introduce RankingMap holding single notification Rankings
indexed by SBN keys.

Also, pass RankingMap with notification event callbacks so
subclasses don't have to call getCurrentRanking() unnecessarily.

Bug: 15415840
Change-Id: Id41e174f00c06c86359c03646abc3db78028b324
 2014-06-11 18:27:18 +02:00
Jorim Jaggi
1a8e848dc4 Merge "Fix blank lockscreen." into lmp-preview-dev 2014-06-10 21:32:31 +00:00
Jorim Jaggi
0a27be899c Fix blank lockscreen. 
Bug: 15281241
Change-Id: If315891274a97fa5cc579554b83b85cf3c87f0fb
 2014-06-11 15:45:22 +02:00