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

85864 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Dianne Hackborn
8727a73127 Merge "A little cleanup." into jb-mr1-dev 2012-09-09 14:45:58 -07:00
Elliott Hughes
ee15e15475 Fix aapt to get expat header files from the approved location. 
Change-Id: Ic7c796e048cfe98ee355c18b3708fee5ea716e2e
 2012-09-09 14:45:32 -07:00
Guang Zhu
783f9e6615 Use correct PowerManager call to wake up screen 
The current implementation does not actually wakes up the screen.

Change-Id: Ief2dca013cfe40e03b64273fe7b09822e9ad42a7
 2012-09-09 14:43:09 -07:00
Dianne Hackborn
1b8ecc5031 A little cleanup. 
Change-Id: Ie33fd1b02011606e67ce08df3cce887c07680c60
 2012-09-09 14:41:34 -07:00
Jeff Brown
4303433399 am 47b2efc7: Merge "Copy all mutable state before sending to clients." into jb-mr1-dev 
* commit '47b2efc76e315431bfe388d01b144035f402efe3':
  Copy all mutable state before sending to clients.
 2012-09-09 14:23:24 -07:00
Jeff Brown
47b2efc76e Merge "Copy all mutable state before sending to clients." into jb-mr1-dev 2012-09-09 14:20:52 -07:00
Jeff Brown
d8544a5148 Copy all mutable state before sending to clients. 
This resolves an issue with ConcurrentModificationException
or inconsistent data being perceived by clients.

Fixed an NPE in the WifiP2pDeviceList copy constructor.

Bug: 7133752
Change-Id: I37a4d004f7b1ca21d490f131039d81695db2ba42
 2012-09-09 14:08:52 -07:00
Jeff Brown
092d330d02 am fdb5bd26: Merge "Disable wifi display API when the adapter is not registered." into jb-mr1-dev 
* commit 'fdb5bd261d7836b5f7e9c20d75709ca978d6eb18':
  Disable wifi display API when the adapter is not registered.
 2012-09-09 13:31:41 -07:00
Jeff Brown
fdb5bd261d Merge "Disable wifi display API when the adapter is not registered." into jb-mr1-dev 2012-09-09 13:29:19 -07:00
Jeff Brown
21c7153d30 Disable wifi display API when the adapter is not registered. 
Bug: 7132341
Change-Id: I46d859082077afd2c8adc829ad285977dff80d07
 2012-09-09 13:28:04 -07:00
Kenny Root
e671ef1bf1 am 25c925e6: Throw ALL the exceptions! (in the PackageManagerTests) 
* commit '25c925e6659e57f1cc8fef83be07f3917a108e3c':
  Throw ALL the exceptions! (in the PackageManagerTests)
 2012-09-09 12:35:31 -07:00
Kenny Root
25c925e665 Throw ALL the exceptions! (in the PackageManagerTests) 
Change all the test method headers to throw Exception so we don't have
to try to catch anything during the tests. Catching an exception might
mask an error during the tests.

Also fix a lot of formatting errors that have built up over the years.
This includes 3-space indentations instead of 4-space, missing spaces
between braces and parens, too-long lines, wrapping when it isn't
needed, etc.

Change-Id: Ifccea5f0706b6f9235f37974a5f80bee76c654dd
 2012-09-09 12:32:03 -07:00
Kenny Root
7d06cb0840 am 0c191624: Remove "protect" command from installd 
* commit '0c191624fba8484e811027a9db40a62a960ab7dc':
  Remove "protect" command from installd
 2012-09-09 12:31:46 -07:00
Kenny Root
0c191624fb Remove "protect" command from installd 
No one uses the "protect" command anymore, so remove it from installd.

Change-Id: Ia990bae6f95cd6e317496f5dd173ec15164d7164
 2012-09-09 12:12:43 -07:00
Svetoslav Ganov
d09cd88106 am add52a97: Viewport should zoom out when screen magnification is disabled. 
* commit 'add52a975aa78d9e24d3e63a8168c00a9bfb80ec':
  Viewport should zoom out when screen magnification is disabled.
 2012-09-09 11:17:49 -07:00
Svetoslav Ganov
add52a975a Viewport should zoom out when screen magnification is disabled. 
1. If screen magnification is disabled when the screen is in a
   magnified state we have to zoom out since otherwise the user
   is stuck in a magnified state without ability to pan/zoom/
   toggle magnification which renders the device useless.

bug:7131030

Change-Id: I8f3339f31310448ec8742f3101c1fdc61a6a5f83
 2012-09-09 11:13:58 -07:00
Svetoslav Ganov
fb9d384f55 am 5b1720e1: Merge "Viewport should zoom out when screen magnification is disabled." into jb-mr1-dev 
* commit '5b1720e11d3d5a23c4b0406e1c51e8cd8275f25f':
  Viewport should zoom out when screen magnification is disabled.
 2012-09-09 10:53:27 -07:00
Svetoslav Ganov
5b1720e11d Merge "Viewport should zoom out when screen magnification is disabled." into jb-mr1-dev 2012-09-09 10:50:34 -07:00
Svetoslav Ganov
6d0df874ce Viewport should zoom out when screen magnification is disabled. 
1. If screen magnification is disabled when the screen is in a
   magnified state we have to zoom out since otherwise the user
   is stuck in a magnified state without ability to pan/zoom/
   toggle magnification which renders the device useless.

bug:7131030

Change-Id: Ia620954fbd594e7cd470e43b89d9ed04c0397c3c
 2012-09-09 10:46:10 -07:00
Jeff Brown
fbb2da7a4d am a3909a93: Work around crash when display is removed. 
* commit 'a3909a93958676d341424d574752bc7b3280d421':
  Work around crash when display is removed.
 2012-09-09 01:16:34 -07:00
Jeff Brown
a3909a9395 Work around crash when display is removed. 
After a display is removed, there may be a brief time
when a Context still exists that is bound to it.
We need to provide metrics in this case.

Bug: 7131637
Change-Id: I11b264a000653adbf0f3da399eaab66c4b40fb2a
 2012-09-09 01:05:38 -07:00
Jeff Brown
5eeb313e7c am e168edb5: Merge "Add skeleton Wifi-Display tile in QS." into jb-mr1-dev 
* commit 'e168edb5ced3e2659fe722c08e702a977a2ad78e':
  Add skeleton Wifi-Display tile in QS.
 2012-09-09 00:28:08 -07:00
Jeff Brown
1cd3b66151 Merge branch 'jb-mr1-dev-plus-aosp' of https://googleplex-android.googlesource.com/_direct/platform/frameworks/base into jb-mr1-dev-plus-aosp 2012-09-09 00:28:08 -07:00
Jeff Brown
61dae16159 Improve Wifi display discovery API. 
Change-Id: I4d46503e5413f52da16f79bbc9c631cc5ae9c178
 2012-09-09 00:28:02 -07:00
Jeff Brown
d07934dbc6 am 20ec8ac5: Merge "Improve Wifi display discovery API." into jb-mr1-dev 
* commit '20ec8ac58665e6e2991988c134ba3b8590911648':
  Improve Wifi display discovery API.
 2012-09-09 00:26:17 -07:00
Jeff Brown
e168edb5ce Merge "Add skeleton Wifi-Display tile in QS." into jb-mr1-dev 2012-09-09 00:25:48 -07:00
Jeff Brown
20ec8ac586 Merge "Improve Wifi display discovery API." into jb-mr1-dev 2012-09-09 00:23:59 -07:00
Jeff Brown
508257bdfc Add skeleton Wifi-Display tile in QS. 
Pop up a little dialog when the tile is touched with options
to connect, scan and disconnect.

Change-Id: Ic9e28344899310692ace36c322974df175f82e08
 2012-09-08 23:15:12 -07:00
Jeff Brown
180bbc7181 Improve Wifi display discovery API. 
Change-Id: I4d46503e5413f52da16f79bbc9c631cc5ae9c178
 2012-09-08 23:15:00 -07:00
Amith Yamasani
46148f2265 am 8f008e73: Merge "More multi-user methods in PM" into jb-mr1-dev 
* commit '8f008e737a84be289d07cc603f98da1bbbfcf837':
  More multi-user methods in PM
 2012-09-08 20:23:33 -07:00
Amith Yamasani
8f008e737a Merge "More multi-user methods in PM" into jb-mr1-dev 2012-09-08 20:20:57 -07:00
Amith Yamasani
151ec4c9f8 More multi-user methods in PM 
pm can list installed packages by user now.

Bug: 6926465

Change-Id: I822311bfd6e7e2d6fb315fc484739fbf953c9bb6
 2012-09-08 19:14:00 -07:00
Jeff Brown
367d2e7b74 am 8e810132: Merge "Make display manager tell input system about viewports." into jb-mr1-dev 
* commit '8e810132315ba6ce2e1f3dca5e91fd34e42a44d8':
  Make display manager tell input system about viewports.
 2012-09-08 18:22:06 -07:00
Jeff Brown
8e81013231 Merge "Make display manager tell input system about viewports." into jb-mr1-dev 2012-09-08 18:19:14 -07:00
Jeff Brown
d728bf514f Make display manager tell input system about viewports. 
The window manager is no longer responsible for telling the
input system about the display viewport.

Change-Id: I932882bae55decef55f25093bb2a7ebac1620bb1
 2012-09-08 18:12:57 -07:00
Geremy Condra
aaa8b0d50a Merge "Add components for the Android Config Updater to system server." 2012-09-08 17:51:16 -07:00
Winson Chung
7901c80164 am a4a2bee7: Merge "Initial changes to add QuickSettings." into jb-mr1-dev 
* commit 'a4a2bee79a5ff8a2e6887a0135ed79b7b733891d':
  Initial changes to add QuickSettings.
 2012-09-08 15:58:15 -07:00
Jeff Brown
de758bd07d am 1edf63ef: Merge "Enable auto-brightness adjustment feature with system prop." into jb-mr1-dev 
* commit '1edf63ef4c7484355a6d9371bea912d6518a7d1e':
  Enable auto-brightness adjustment feature with system prop.
 2012-09-08 15:56:29 -07:00
Winson Chung
a4a2bee79a Merge "Initial changes to add QuickSettings." into jb-mr1-dev 2012-09-08 15:55:10 -07:00
Winson Chung
d63c597865 Initial changes to add QuickSettings. 
Change-Id: If510f74d6046929e5e8a794c6dc2fddb15a03d6b
 2012-09-08 15:55:31 -07:00
Jeff Brown
1edf63ef4c Merge "Enable auto-brightness adjustment feature with system prop." into jb-mr1-dev 2012-09-08 15:53:50 -07:00
Jeff Brown
631938f26d Enable auto-brightness adjustment feature with system prop. 
This feature is experimental and disabled by default.

Change-Id: I183534370da7613557e4d1535f556873f8a763df
 2012-09-08 15:11:11 -07:00
Jeff Brown
fb7a804592 am b0d10aa9: Merge "Add new wifi display discovery API." into jb-mr1-dev 
* commit 'b0d10aa9831fb74a28db63cac9d111559bed62ab':
  Add new wifi display discovery API.
 2012-09-08 14:57:52 -07:00
Jeff Brown
10d49dcf3d am 0597100f: Merge "Retry wifi display connections." into jb-mr1-dev 
* commit '0597100f9127ddc0b638eb044872f138f4d3e4a8':
  Retry wifi display connections.
 2012-09-08 14:56:01 -07:00
Jeff Brown
b0d10aa983 Merge "Add new wifi display discovery API." into jb-mr1-dev 2012-09-08 14:55:02 -07:00
Jeff Brown
9fd7ce728b am f82b5836: Merge "Add permissions to control and configure wifi display." into jb-mr1-dev 
* commit 'f82b58368e1bd502f82ad7791647c5922ba5d0c0':
  Add permissions to control and configure wifi display.
 2012-09-08 14:54:14 -07:00
Jeff Brown
0597100f91 Merge "Retry wifi display connections." into jb-mr1-dev 2012-09-08 14:53:58 -07:00
Jeff Brown
e08ae388d6 Add new wifi display discovery API. 
The API is quite simple.  There are a few extra functions
on DisplayManager to scan, connect and disconnect from
wifi displays and get status, and a single protected
broadcast sent when the status changes.

Change-Id: Ic91dbab5ee818e790b27fa32e1a1e93788793be0
 2012-09-08 14:53:34 -07:00
Jeff Brown
f82b58368e Merge "Add permissions to control and configure wifi display." into jb-mr1-dev 2012-09-08 14:51:55 -07:00
Jason Sams
039df49b27 am 43190793: Merge "Fix doc typo." into jb-mr1-dev 
* commit '4319079375ef49668ea88e74fb899275d6bbdb19':
  Fix doc typo.
 2012-09-08 13:07:44 -07:00