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

138822 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Roozbeh Pournader
e210ded9fc Add Roboto Black Italic. 
The fonts was missed during the update to Roboto v2.

Bug: 15475947
Change-Id: I134138bff27bb651c91f966e20d90626172bba58
 2014-06-11 15:37:02 -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
Matthew Williams
46919f3583 Fix build. 
Two tests were breaking the build.

Change-Id: If424a552d3fedb912fa94870b88c60dc3750b69a
 2014-06-10 16:11:08 -07: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
Ruben Brunk
937c4dbb1f Merge "DO NOT MERGE: camera2: Disallow shim usage for preview." into lmp-preview-dev 2014-06-10 22:18:15 +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
Eino-Ville Talvala
73b1d94baf Merge "Camera2: Many docs updates" into lmp-preview-dev 2014-06-10 22:12:51 +00:00
Robert Greenwalt
99d4dd278e Merge "Apply API review to android.net.Network:" into lmp-preview-dev 2014-06-10 22:12:51 +00:00
Paul Jensen
0a363a319f Apply API review to android.net.Network: 
- socketFactory() renamed to getSocketFactory()
- Make sure bindProcess() documentation points developers to getSocketFactory() as the preferred approach
- Move bindProcess() and unbindProcess() to ConnectivityManager.setProcessBoundNetwork() -- passing null clears it.
- Move getProcessBoundNetwork() to ConnectivityManager.getProcessBoundNetwork().

Bug:15142362
Bug:13885501

Change-Id: Ia55c59d52e1ec8bf10dd0d9d037bd04c0998bc71
(cherry picked from commit 5ca1e6675bf4182b6e9ca76a7696bf2e38e96c4f)
 2014-06-10 22:26:11 +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
Matthew Williams
95981dc8ad Merge "Fix battery controller non-fire bug" into lmp-preview-dev 2014-06-10 22:06:31 +00:00
Matthew Williams
759275d9da Fix battery controller non-fire bug 
Receiver wasn't registered to listen for the action coming
back from the Alarm Manager.
Also, if a task starts being tracked by the battery controller
and the device is on power, the batt. controller will notify
the scheduler as such.
Added dumpsys for battery controller to help debugging.
Change-Id: I7ce305b816aea69e8d05a3daf23124c163546788
 2014-06-10 16:13:06 -07:00
Winson Chung
6f6f273df6 Merge "Updating Recents to make the cards slightly more visible." into lmp-preview-dev 2014-06-10 22:00:10 +00:00
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
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
Christopher Tate
e9ed3707b2 Merge "Out with the old; in with the new" into lmp-preview-dev 2014-06-10 21:27:54 +00:00
Jose Lima
583b6f782c Merge "Make convertToTranslucent a public method in Activity" into lmp-preview-dev 2014-06-10 21:25:11 +00:00
John Spurlock
6ab89e28cd Merge "Saver: Shared resource update and new settings." into lmp-preview-dev 2014-06-10 21:22:41 +00:00
Jorim Jaggi
ce3d6c4c02 Merge "DO NOT MERGE: Fix paddings for user switch and status bar icons." into lmp-preview-dev 2014-06-10 21:21:32 +00:00
Adrian Roos
2643de55d3 Merge "Update security method after switching user" 2014-06-10 21:21:32 +00:00