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

105015 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jaikumar Ganesh
032aeafd68 am d5af1724: am 176c245c: Merge "Hardware geofence API changes." into jb-mr2-dev 
* commit 'd5af1724500f42e389cc2b8a0be9bacdf53405ad':
  Hardware geofence API changes.
 2013-04-17 22:25:18 -07:00
Jaikumar Ganesh
d5af172450 am 176c245c: Merge "Hardware geofence API changes." into jb-mr2-dev 
* commit '176c245cefaf08f33043e9b67cb787efeb6ad662':
  Hardware geofence API changes.
 2013-04-17 22:21:32 -07:00
Jaikumar Ganesh
176c245cef Merge "Hardware geofence API changes." into jb-mr2-dev 2013-04-18 05:18:41 +00:00
Jaikumar Ganesh
da6508954a Hardware geofence API changes. 
b/8631678

1.GeofenceRequest object created.
2.MonitorState moved to a new callback
3.getTypeAndStatus separated to 2 calls.
4.Binder death implemented
5.geofenceChange callback name changed.
6.Parameters rearranged in some calls.

Change-Id: I8fe9621186aeb49efeb0eef1821a2556afe03cfc
 2013-04-17 22:18:01 -07:00
Satoshi Kataoka
5faf1985af am 3e3a7b3b: am f024e7ac: Merge "Fix possible NPE" into jb-mr2-dev 
* commit '3e3a7b3b1ed641dfa7c321f48bd228c59dc3c180':
  Fix possible NPE
 2013-04-17 20:40:25 -07:00
Satoshi Kataoka
3e3a7b3b1e am f024e7ac: Merge "Fix possible NPE" into jb-mr2-dev 
* commit 'f024e7ac44e00ea560f547b4e5d67645a2e6c9b4':
  Fix possible NPE
 2013-04-17 20:36:12 -07:00
Satoshi Kataoka
f024e7ac44 Merge "Fix possible NPE" into jb-mr2-dev 2013-04-18 03:33:39 +00:00
Dianne Hackborn
a6e8ebb12f am fb4e1c21: am 25b49734: Merge "Fix issue #8540550: Screenshots should never have transparency" into jb-mr2-dev 
* commit 'fb4e1c21eddf07fad7b36ac5e19dd2d479e71c5c':
  Fix issue #8540550: Screenshots should never have transparency
 2013-04-17 19:07:03 -07:00
Dianne Hackborn
fb4e1c21ed am 25b49734: Merge "Fix issue #8540550: Screenshots should never have transparency" into jb-mr2-dev 
* commit '25b49734cac1ecd17dba2af2a1af8328490236d4':
  Fix issue #8540550: Screenshots should never have transparency
 2013-04-17 19:03:09 -07:00
Dianne Hackborn
25b49734ca Merge "Fix issue #8540550: Screenshots should never have transparency" into jb-mr2-dev 2013-04-18 02:00:46 +00:00
Benoit Goby
95be338f9b am aa313948: am d02b00dd: Merge "Fix UsbDebuggingActivity not shown in adb tcpip mode" into jb-mr2-dev 
* commit 'aa313948752a427281aa8d22066fc2d71e369cb7':
  Fix UsbDebuggingActivity not shown in adb tcpip mode
 2013-04-17 18:59:02 -07:00
Benoit Goby
aa31394875 am d02b00dd: Merge "Fix UsbDebuggingActivity not shown in adb tcpip mode" into jb-mr2-dev 
* commit 'd02b00dd6efd3841708cd72ae08e5d548b8cd07b':
  Fix UsbDebuggingActivity not shown in adb tcpip mode
 2013-04-17 18:56:10 -07:00
Benoit Goby
d02b00dd6e Merge "Fix UsbDebuggingActivity not shown in adb tcpip mode" into jb-mr2-dev 2013-04-18 01:52:55 +00:00
Jeff Brown
59ecf6d383 am 3b90af23: am ab15e6ab: Merge "Add a config resource to force HDMI rotation on some devices." into jb-mr2-dev 
* commit '3b90af234303cb674ed29dc258240e7cef96e943':
  Add a config resource to force HDMI rotation on some devices.
 2013-04-17 18:47:12 -07:00
Jeff Brown
3b90af2343 am ab15e6ab: Merge "Add a config resource to force HDMI rotation on some devices." into jb-mr2-dev 
* commit 'ab15e6ab37cb29e6f3653cc5fa1872523946c50e':
  Add a config resource to force HDMI rotation on some devices.
 2013-04-17 18:44:26 -07:00
Jeff Brown
ab15e6ab37 Merge "Add a config resource to force HDMI rotation on some devices." into jb-mr2-dev 2013-04-18 01:42:01 +00:00
Mathias Agopian
b35fbd5720 am 740cf4ec: am bb7b315c: Merge "add javadoc for SurfaceView {unL|l}ockCanvas{AndPost}()" into jb-mr2-dev 
* commit '740cf4ec31b8d7363c9a0f839afda3d8cb0ab9a3':
  add javadoc for SurfaceView {unL|l}ockCanvas{AndPost}()
 2013-04-17 18:36:08 -07:00
Mathias Agopian
740cf4ec31 am bb7b315c: Merge "add javadoc for SurfaceView {unL|l}ockCanvas{AndPost}()" into jb-mr2-dev 
* commit 'bb7b315cdd48fdcffc07d0e98557cb88b9f58006':
  add javadoc for SurfaceView {unL|l}ockCanvas{AndPost}()
 2013-04-17 18:32:24 -07:00
Mathias Agopian
bb7b315cdd Merge "add javadoc for SurfaceView {unL|l}ockCanvas{AndPost}()" into jb-mr2-dev 2013-04-18 01:29:07 +00:00
Dianne Hackborn
ca46b87118 Fix issue #8540550: Screenshots should never have transparency 
Make sure the thumbnail bitmap is initialized with a black
background.

Change-Id: I87c00d309b7d30b6085a751aa4ae22cf146c74f5
 2013-04-17 18:06:22 -07:00
Chris Craik
181e3cb37c am 9b9fe68e: am 18455c30: Merge "Add input/output JSON data for baseline comparison" into jb-mr2-dev 
* commit '9b9fe68ea3117041e570ca158d61201acefb0d8f':
  Add input/output JSON data for baseline comparison
 2013-04-17 17:38:36 -07:00
Chris Craik
9b9fe68ea3 am 18455c30: Merge "Add input/output JSON data for baseline comparison" into jb-mr2-dev 
* commit '18455c307d8ea439dbf78aa3789380259ddd8572':
  Add input/output JSON data for baseline comparison
 2013-04-17 17:34:46 -07:00
Benoit Goby
29a4b7277e Fix UsbDebuggingActivity not shown in adb tcpip mode 
Bug: 8646772
Change-Id: If34c756bece903a0a452070bbc94ebc71d325bf6
 2013-04-17 17:34:30 -07:00
Chris Craik
18455c307d Merge "Add input/output JSON data for baseline comparison" into jb-mr2-dev 2013-04-18 00:32:08 +00:00
Jeff Brown
c82c89edc7 Add a config resource to force HDMI rotation on some devices. 
If the hardware composer HAL does not provide full support for
multiple displays, it may be necessary to force the HDMI rotation
when not docked.  (When docked, we can use the dock's orientation.)

This configuration is not expected to be used on newer devices
with the requisite HAL support and may be removed in the future.

Bug: 8511721
Change-Id: I1ff50f00ee7fe621aceff94bd938ecf6385c3f38
 2013-04-17 17:18:15 -07:00
Jim Miller
9b4b662c27 resolved conflicts for merge of 6825c478 to master 
Change-Id: Id9657db0b3623c329ae2cff3916c2d0eb4301dd7
 2013-04-17 16:27:30 -07:00
Chet Haase
68293ecb91 am 78296cb7: am bc09a364: Merge "Fixes for setClipBounds()" into jb-mr2-dev 
* commit '78296cb760bff8bf951e88d6f4ec9a6ff3059406':
  Fixes for setClipBounds()
 2013-04-17 15:54:52 -07:00
Jim Miller
6825c47830 am 9bf7be93: Merge "Add permission check for owner-info related LockSettings." into jb-mr2-dev 
* commit '9bf7be933d039ef227ca54f917c1ff6a00a2f833':
  Add permission check for owner-info related LockSettings.
 2013-04-17 15:49:23 -07:00
Chet Haase
78296cb760 am bc09a364: Merge "Fixes for setClipBounds()" into jb-mr2-dev 
* commit 'bc09a364c3fd49470b936e7bc2521f6de9ba07b4':
  Fixes for setClipBounds()
 2013-04-17 15:49:17 -07:00
Jim Miller
9bf7be933d Merge "Add permission check for owner-info related LockSettings." into jb-mr2-dev 2013-04-17 22:47:06 +00:00
Craig Mautner
61cc1b632a Merge "Steady improvement to multi stack." 2013-04-17 22:35:02 +00:00
Jim Miller
158fe19ff8 Add permission check for owner-info related LockSettings. 
Fixes bug 8512972

Change-Id: I372ef892000e5de9075783f06b722e2911cfc90d
 2013-04-17 15:26:10 -07:00
Chet Haase
bc09a364c3 Merge "Fixes for setClipBounds()" into jb-mr2-dev 2013-04-17 22:13:50 +00:00
Mathias Agopian
9ddf32aa8a add javadoc for SurfaceView {unL|l}ockCanvas{AndPost}() 
Bug: 8593591
Change-Id: I152281ddca8716aee97147cb1b3fb483ed46b053
 2013-04-17 15:04:47 -07:00
Jean-Michel Trivi
d5e1495723 am aa4e2462: am e1546df2: Merge "Fix message handling in RemoteControlClient" into jb-mr2-dev 
* commit 'aa4e246271fa837c373b71fbaa671f0cbc336eca':
  Fix message handling in RemoteControlClient
 2013-04-17 14:23:06 -07:00
Adam Cohen
c283277551 am f4865efe: am be8bc839: Merge "DO NOT MERGE Stripping some new widget API that is yet unused" into jb-mr2-dev 
* commit 'f4865efe603e795bc037f5df468556140165eea2':
  DO NOT MERGE Stripping some new widget API that is yet unused
 2013-04-17 14:23:01 -07:00
Jim Miller
3569e9e50c resolved conflicts for merge of 2f6a2526 to master 
Change-Id: Ie51d3a63f4d4d5bad7ef16ad84ef6ad5acdaa64a
 2013-04-17 14:18:56 -07:00
Jean-Michel Trivi
aa4e246271 am e1546df2: Merge "Fix message handling in RemoteControlClient" into jb-mr2-dev 
* commit 'e1546df25a7de17195f5b38ca90cad8447c288d0':
  Fix message handling in RemoteControlClient
 2013-04-17 14:15:36 -07:00
Jean-Michel Trivi
e1546df25a Merge "Fix message handling in RemoteControlClient" into jb-mr2-dev 2013-04-17 21:09:44 +00:00
Adam Cohen
f4865efe60 am be8bc839: Merge "DO NOT MERGE Stripping some new widget API that is yet unused" into jb-mr2-dev 
* commit 'be8bc8392e203a661242b0637ce25bd05c292306':
  DO NOT MERGE Stripping some new widget API that is yet unused
 2013-04-17 14:06:33 -07:00
Adam Cohen
be8bc8392e Merge "DO NOT MERGE Stripping some new widget API that is yet unused" into jb-mr2-dev 2013-04-17 21:03:43 +00:00
Craig Mautner
29219d963d Steady improvement to multi stack. 
- Fix back button behavior with two stacks. Stopping activities were
held in that state indefinitely. This change causes IDLE_NOW_MSG to
be sent immediately for the last activity in a stack.

- Touch in non-focused stack was being ignored because of focus tests
in AbsListView.

- Change the focused stack when the activity focus changes. Renamed
mMainStack to mFocusedStack to reflect this.

- Resume all top stack activities when resuming.

- Assign intent task to ActivityRecord if it doesn't have a task.
Fixes bug 8433463.

Change-Id: I8d3c806234511697bc209ab99890730ffa514d20
 2013-04-17 13:54:48 -07:00
Adam Cohen
33f3aab220 DO NOT MERGE Stripping some new widget API that is yet unused 
Change-Id: I7a7156f30aa9105461908f66426950d13eb01408
 2013-04-17 13:48:45 -07:00
Jim Miller
2f6a2526db am b1e5137a: Merge "Move owner info from Settings.Secure to LockSettings" into jb-mr2-dev 
* commit 'b1e5137a807d19a9cbc241c0ba84c3c49b32fceb':
  Move owner info from Settings.Secure to LockSettings
 2013-04-17 13:44:23 -07:00
Jim Miller
b1e5137a80 Merge "Move owner info from Settings.Secure to LockSettings" into jb-mr2-dev 2013-04-17 20:39:58 +00:00
Amith Yamasani
c1ce6e1a79 am ac16c21d: am a0042742: Merge "Modify restrictions bundle per api council recommendations" into jb-mr2-dev 
* commit 'ac16c21d11c1545efb8deafbcb7c120a5e0821a1':
  Modify restrictions bundle per api council recommendations
 2013-04-17 11:34:28 -07:00
Dianne Hackborn
2590a8b341 am bc463ea1: am e8d12dd6: Merge "Fix issue #8032572: Android app permission help text "null"..." into jb-mr2-dev 
* commit 'bc463ea1c5fa9c80fa06183a82fdd1acfb5289e5':
  Fix issue #8032572: Android app permission help text "null"...
 2013-04-17 11:30:50 -07:00
Amith Yamasani
ac16c21d11 am a0042742: Merge "Modify restrictions bundle per api council recommendations" into jb-mr2-dev 
* commit 'a0042742c8941519718cc8872a84cfec10294386':
  Modify restrictions bundle per api council recommendations
 2013-04-17 11:30:41 -07:00
Amith Yamasani
a0042742c8 Merge "Modify restrictions bundle per api council recommendations" into jb-mr2-dev 2013-04-17 18:26:49 +00:00
Dianne Hackborn
bc463ea1c5 am e8d12dd6: Merge "Fix issue #8032572: Android app permission help text "null"..." into jb-mr2-dev 
* commit 'e8d12dd6b08ec5b3f2a18bee14171079c6c27e0d':
  Fix issue #8032572: Android app permission help text "null"...
 2013-04-17 11:26:05 -07:00