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

139188 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Christopher Tate
488662c570 Merge "Fix build" into lmp-preview-dev 2014-06-10 21:44:22 +00:00
Christopher Tate
b7b70f0f99 Fix build 
Change-Id: I339f7f1ab82af699ee34c3baf824d0278477a4cf
 2014-06-10 15:20:49 -07:00
Zhijun He
5f0d640c02 Merge "CamcorderProfiles: Add 4K video constants" 2014-06-10 21:44:22 +00:00
Robert Ly
e37da759c5 am b1cb5aab: am 748856f2: am a7ddd029: am 80e84e2d: am f3cecfa2: am 55d525b2: am 716cc7dc: Add documentation for AndroidKeyStore 
* commit 'b1cb5aabeb68815715eed423f1f9a7edb9a3e938':
  Add documentation for AndroidKeyStore
 2014-06-11 19:33:51 +00:00
Justin Koh
41a2c47e65 am 44195b4f: am 42c53fd6: Merge "Catch OperationUnsupportedException when linkifying using WebView" into klp-modular-dev 
* commit '44195b4f90d035533c879672891e7e169972d95d':
  Catch OperationUnsupportedException when linkifying using WebView
 2014-06-11 19:33:46 +00:00
Justin Koh
69b8b79a4f am 7b9fa3bd: am b7c39cee: Remove WebIconDatabase calls from android.provider.Browser 
* commit '7b9fa3bd11f73bc201a404e8dacf7c02c15290b7':
  Remove WebIconDatabase calls from android.provider.Browser
 2014-06-11 19:33:40 +00:00
Ruben Brunk
ef1b1398e9 fixbuild: Remove 'pinned' attr. 
Needed by ag/481620

BUG: 15523923
BUG: 15473856

Change-Id: I5e8bf417368b60fcc33c80852e12f27b8c580774
 2014-06-11 11:56:58 -07:00
John Spurlock
2d848a7741 am 9641b929: Merge "Brightness slider no longer displays the automatic icon." into lmp-preview-dev 
* commit '9641b929ae730241c37c8da21092cf56230aa05f':
  Brightness slider no longer displays the automatic icon.
 2014-06-11 17:43:49 +00:00
Svetoslav
a43e79cfcd am 6af2b51b: Merge "Accessibility window changes not reported." into lmp-preview-dev 
* commit '6af2b51b3c233d2c9d77282355c798c01a8afba1':
  Accessibility window changes not reported.
 2014-06-11 17:43:42 +00:00
Deepanshu Gupta
9ad11ca07f am e3e1591c: Merge "Remove lxml dependency." into lmp-preview-dev 
* commit 'e3e1591cd8d748ba5da228fe857dd785ec7965a9':
  Remove lxml dependency.
 2014-06-11 17:43:36 +00:00
Deepanshu Gupta
6370c7f554 am fe01ace8: Merge "LayoutLib: Support more ContextThemeWrappers" into lmp-preview-dev 
* commit 'fe01ace8ac5da2c9716a0eb0cb53fdda823b3910':
  LayoutLib: Support more ContextThemeWrappers
 2014-06-11 17:43:32 +00:00
Deepanshu Gupta
3e950680c4 am 0a89c1b0: Merge "LayoutLib: Fix EditText rendering" into lmp-preview-dev 
* commit '0a89c1b00762b404966e32beef1ea9a53e4a8b08':
  LayoutLib: Fix EditText rendering
 2014-06-11 17:43:26 +00:00
Christopher Tate
70c1de2072 am 40c042b8: Merge "Hide the (obsolescent) android.app.maintenance APIs" into lmp-preview-dev 
* commit '40c042b884696d162468d971630c48eebd84475b':
  Hide the (obsolescent) android.app.maintenance APIs
 2014-06-11 17:43:20 +00:00
Lorenzo Colitti
a23f56b95c am 34852095: Merge "Don\'t enable Ethernet on the emulator." into lmp-preview-dev 
* commit '34852095d9148945edc39c2df9513c41998eb55b':
  Don't enable Ethernet on the emulator.
 2014-06-11 17:43:15 +00:00
Ruben Brunk
9696db1b8b am ec346985: (-s ours) Merge "DO NOT MERGE: camera2: Disallow shim usage for preview." into lmp-preview-dev 
* commit 'ec3469853d18e18fd383dae691970dc0fb7ee0da':
  DO NOT MERGE: camera2: Disallow shim usage for preview.
 2014-06-11 17:03:20 +00:00
Eino-Ville Talvala
ac4dcf6d90 am bc4b6859: Merge "Camera2: Many docs updates" into lmp-preview-dev 
* commit 'bc4b6859cb12564d7dfe37abffd77465b4be75d0':
  Camera2: Many docs updates
 2014-06-11 17:03:11 +00:00
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
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
John Spurlock
7baacb177b Merge "Heads-up notifications for low battery warnings." into lmp-preview-dev 2014-06-10 21:44:22 +00:00
John Spurlock
3332ba54ae Heads-up notifications for low battery warnings. 
Falls back to dialogs when heads-up are N/A.

Add new ongoing notification if battery saver mode
is active.  Offer to start battery saver on warnings,
if not already started.

True up BatteryMeterView's levels to the latest threshold
levels.  15% for first warning.

Bug:13329308
Change-Id: Id8ad11a1997079ee7165ae003a8fa1c744462ab3
 2014-06-11 19:38:00 -04:00
Amith Yamasani
1d11436eae Merge "Undo some API changes that affect third party launcher writers" into lmp-preview-dev 2014-06-10 21:44:22 +00:00
Amith Yamasani
992fdbeff2 Undo some API changes that affect third party launcher writers 
Remove hidden interface methods that were added temporarily for
launcher compatibility. These cannot be implemented by third parties
if they're hidden from the SDK.

Bug: 15574383
Change-Id: I976256da4278b7077f8d357e971e8cadb4d2d686
 2014-06-12 13:37:43 -07:00
Adam Powell
55e33b03ab Merge "Fix incorrect dispatch of empty WindowInsets from ActionBarOverlayLayout" into lmp-preview-dev 2014-06-10 21:44:22 +00:00
Adam Powell
720924b6a9 Fix incorrect dispatch of empty WindowInsets from ActionBarOverlayLayout 
Fix a bug where ActionBarOverlayLayout was using a private constructor
of WindowInsets to return empty insets that should have been marked
fully consumed. This caused dispatch to further child views not to
stop appropriately, corrupting application layout in some cases.

Bug 15588587

Change-Id: I97fcefa4755addf2385a7e7b0ffbf6d3e91adc5c
 2014-06-12 14:53:10 -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
Fabrice Di Meglio
fb522b6798 Merge "Fix Material Preference Framework layout" into lmp-preview-dev 2014-06-10 21:38:43 +00:00
Fabrice Di Meglio
eb05811a5f Fix Material Preference Framework layout 
- replace "left" with "start"

Change-Id: I02f3ce5ce98bab7eb9eb2f2928cd5eb8f6b155d2
 2014-06-11 14:18:00 -07:00
John Reck
e830c37a4a Merge "Fix DA bugs" 2014-06-10 21:38:43 +00:00
George Mount
168a212848 Merge "Add reasonable default activity transitions to theme.material.light." into lmp-preview-dev 2014-06-10 21:38:43 +00:00
George Mount
01cdce69e9 Add reasonable default activity transitions to theme.material.light. 
Bug 15583434

Change-Id: Ie4dd08a0392698d2e2794a82d50ad9a213658917
 2014-06-12 07:41:13 -07:00
Daniel Sandler
c776997e87 Clean up progress bars for media & other notifications. 
Bug: 15147533
Change-Id: Ib4905203c004232bd7d78fe9fa316aa5688eaaa2
 2014-06-11 13:18:59 +00:00