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

138904 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
justinzhang
34576c6ace am 8b00d123: (-s ours) Hide status bars in lock task 
* commit '8b00d123ec3154482644d2ebe913326552b47321':
  Hide status bars in lock task
 2014-06-12 00:03:33 +00:00
vandwalle
6a9ef94bf4 Merge "auto-roam initial implementation" 2014-06-11 21:23:31 +00:00
Sol Boucher
8d336682d4 Merge "Add CameraToo, a sample point-and-shoot camera app" 2014-06-11 23:10:23 +00:00
Sol Boucher
b84fdffad4 Add CameraToo, a sample point-and-shoot camera app 
It demonstrates basic use of the features of the new Camera2 API.

Change-Id: I593bc682e5c6203754e9a3ee9a78efbd1b208513
 2014-06-11 21:47:49 +00:00
Craig Mautner
0aad830d1b am 28084383: am e33010a2: Merge "Add NO_ANIMATION flag to ActivityView Intents." into klp-modular-dev 
* commit '28084383c13660864f75452f99183c377c2798ec':
  Add NO_ANIMATION flag to ActivityView Intents.
 2014-06-11 21:38:49 +00:00
Calin Juravle
9c9777da68 am cdd1fd7a: am b0492d69: am 16719591: Merge "Shrink profiler.start-immediately to fit in the maximum property size" 
* commit 'cdd1fd7a8f88e6d99e773b2fb867dbf1d6c64eb9':
  Shrink profiler.start-immediately to fit in the maximum property size
 2014-06-11 21:38:43 +00:00
Calin Juravle
a48a6fd1f2 am 5fc4e487: am b0f59cdc: am 2f84b69b: Merge "Improved profile.start-immediately comment" 
* commit '5fc4e487420b7730c9eaf2623ff1efd2633daba7':
  Improved profile.start-immediately comment
 2014-06-11 21:38:38 +00:00
vandwalle
111fa0274d auto-roam initial implementation 
Change-Id: Iad207974b2fea97420cc6131c5fa0a1f17bf2aac
 2014-06-11 14:38:06 -07:00
Kenny Root
90c392fd2d resolved conflicts for merge of 579ace03 to master 
Change-Id: I461879359824036ec861ad9b5b8804ae814179a9
 2014-06-11 14:31:56 -07:00
Craig Mautner
28084383c1 am e33010a2: Merge "Add NO_ANIMATION flag to ActivityView Intents." into klp-modular-dev 
* commit 'e33010a261d881426ce0af9a9e2177137ec3f6b9':
  Add NO_ANIMATION flag to ActivityView Intents.
 2014-06-11 17:42:06 +00:00
Calin Juravle
cdd1fd7a8f am b0492d69: am 16719591: Merge "Shrink profiler.start-immediately to fit in the maximum property size" 
* commit 'b0492d6943fc590c2569dd2fc393db54a73986d3':
  Shrink profiler.start-immediately to fit in the maximum property size
 2014-06-11 17:32:50 +00:00
Calin Juravle
5fc4e48742 am b0f59cdc: am 2f84b69b: Merge "Improved profile.start-immediately comment" 
* commit 'b0f59cdcb4d2205faa3811277163bbf215b68dfc':
  Improved profile.start-immediately comment
 2014-06-11 17:32:40 +00:00
Calin Juravle
b0492d6943 am 16719591: Merge "Shrink profiler.start-immediately to fit in the maximum property size" 
* commit '16719591f4a6b2139b1f3555dcde92d35f488b6a':
  Shrink profiler.start-immediately to fit in the maximum property size
 2014-06-11 17:28:33 +00:00
Calin Juravle
b0f59cdcb4 am 2f84b69b: Merge "Improved profile.start-immediately comment" 
* commit '2f84b69bf5afcf67469704e30866067b770ae786':
  Improved profile.start-immediately comment
 2014-06-11 17:28:29 +00: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
Craig Mautner
e33010a261 Merge "Add NO_ANIMATION flag to ActivityView Intents." into klp-modular-dev 2014-06-11 08:41:11 +00:00
Griff Hazen
579ace0358 am 9f637d10: Reduce notification service historical archive size to 1 for watches. To remove the memory footprint 
* commit '9f637d10959490c3a28e0f40330e97eb67e954d7':
  Reduce notification service historical archive size to 1 for watches. To remove the memory footprint
 2014-06-11 01:18:36 +00:00
Griff Hazen
9f637d1095 Reduce notification service historical archive size to 1 for watches. 
To remove the memory footprint

Bug: 15536759
Change-Id: I081bd962fef689b5d8ed126208499d56ebf4ae38
 2014-06-10 15:31:48 -07:00
George Mount
4a7c3af299 Merge "Prevent transitions from calling createAnimator for invalid views." 2014-06-10 22:18:15 +00:00
George Mount
208dcade93 Prevent transitions from calling createAnimator for invalid views. 
Bug 15285527

When two transitions affect different views, createAnimator is
on all Transitions for all views. This CL prevents createAnimator
from being called for Transitions that don't target a view.

Change-Id: I3f70a13b4ea38ad4a9b4724db438b40f6e80eafb
 2014-06-11 13:14:32 -07:00
George Mount
426a768974 Merge "Make more descriptive exception for null viewName." 2014-06-10 22:12:51 +00:00
George Mount
d5f9d735b7 Make more descriptive exception for null viewName. 
Bug 15114583

Change-Id: I73db179e032947843e3f9a7f1cc5228cbf6fc22b
 2014-06-11 13:00:11 -07:00
George Mount
e089d06151 Merge "Allow enter activity transitions to be delayed until data is ready." 2014-06-10 22:06:31 +00:00
George Mount
8c2614ce43 Allow enter activity transitions to be delayed until data is ready. 
Bug 15539194

Change-Id: I8de9806b0bcdf8129eb3b5a555a2433f0c7be634
 2014-06-10 17:03:43 -07:00
Leon Scroggins
84ecb7e1aa Merge "remove call to (deprecated) SetDeviceConfig" 2014-06-10 21:44:22 +00:00
Mike Reed
2216f9c2e5 remove call to (deprecated) SetDeviceConfig 
this was ignored by all callers, in that they always specify a preferred config (8888).

This removal will allow skia to remove the api and its global.

Change-Id: Ic0a4c673ddd60d0078f75e0e482aba4c9b9cf682
 2014-06-11 16:08:31 +00:00
Sreeram Ramachandran
7ac927873c Merge "Fix wifi connectivity issues." 2014-06-10 22:18:15 +00:00
Sreeram Ramachandran
211c06eb81 Fix wifi connectivity issues. 
http://ag/480881 changed RouteInfo.getDestination() to return an IpPrefix
instead of a LinkAddress. This makes the equals() comparison always fail.

So, when ConnectivityService.updateRoutes() is given identical routes, instead
of realizing that there's no diff, it would consider them different, and thus
add and remove the same route. The add would fail, since the route already
existed in netd, but the remove would succeed, leaving the system with no routes
and thus no connectivity.

Bug: 15564210
Change-Id: I2003b0fcb809cc20837dc489c58af37891ca4556
 2014-06-11 15:56:51 -07: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