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

89416 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Christopher Tate
af3cd21b08 Merge "New command line tool: "settings"" into jb-mr1-dev 2012-10-09 11:43:56 -07:00
Robert Ly
0f31450fe0 am fba8b7f5: am f19e4b42: Merge "docs: nfc ndef helper methods bug 5957772" into jb-dev 
* commit 'fba8b7f5963cb2bc15f06d83d986345978cc415e':
  docs: nfc ndef helper methods bug 5957772
 2012-10-09 11:42:14 -07:00
Robert Ly
fba8b7f596 am f19e4b42: Merge "docs: nfc ndef helper methods bug 5957772" into jb-dev 
* commit 'f19e4b420de65306f09c199829e7e06fe210e21d':
  docs: nfc ndef helper methods bug 5957772
 2012-10-09 11:40:34 -07:00
Robert Ly
f19e4b420d Merge "docs: nfc ndef helper methods bug 5957772" into jb-dev 2012-10-09 11:38:00 -07:00
Eric Laurent
69427e3515 am 542e0afa: am 14dfe4e0: Merge "enforce camera sound according to country code" into jb-mr1-dev 
* commit '542e0afa5114583f357d6f65ede036a444f694e7':
  enforce camera sound according to country code
 2012-10-09 11:35:08 -07:00
Eric Laurent
542e0afa51 am 14dfe4e0: Merge "enforce camera sound according to country code" into jb-mr1-dev 
* commit '14dfe4e0abe21782236af987f39d01dfb38e6ff3':
  enforce camera sound according to country code
 2012-10-09 11:32:36 -07:00
Eric Laurent
14dfe4e0ab Merge "enforce camera sound according to country code" into jb-mr1-dev 2012-10-09 11:29:11 -07:00
Adam Powell
3307958c6b Allow more scaling values to be tuned in resource overlays 
Bug 7267507

Change-Id: I3fba6882a0ac4cb7d34430ba36dec83c030a73cd
 2012-10-09 11:21:08 -07:00
Irfan Sheriff
025219a9af am 31a92447: am b312163d: Merge "Fix handling of hidden access points" into jb-mr1-dev 
* commit '31a92447b00238b247ac2fcb13621ee74529b152':
  Fix handling of hidden access points
 2012-10-09 11:16:36 -07:00
Irfan Sheriff
31a92447b0 am b312163d: Merge "Fix handling of hidden access points" into jb-mr1-dev 
* commit 'b312163dde3f1303822934e735d72f00003d2564':
  Fix handling of hidden access points
 2012-10-09 11:14:47 -07:00
Irfan Sheriff
b312163dde Merge "Fix handling of hidden access points" into jb-mr1-dev 2012-10-09 11:11:29 -07:00
Irfan Sheriff
462ff630e4 Fix handling of hidden access points 
We now get raw hex data from the supplicant and we convert it into
printable format.

For hidden access point, we always used to return a single empty string.
We need to make sure we maintain that behavior for apps to not start
displaying empty strings.

Bug: 7310749
Change-Id: I2599b9b5e15be91fc34e9af629ad893b1a0357fc
 2012-10-09 10:56:47 -07:00
Dirk Dougherty
957c30ca73 am b0a8b0b8: am 3b9e7f32: am fb554fc0: am b049b1ef: am 46c4b488: Doc change: Subscriptions free trials on Google Play. 
* commit 'b0a8b0b816b19f8d584e5bf15ca1ba00b2a9497b':
  Doc change: Subscriptions free trials on Google Play.
 2012-10-09 10:42:55 -07:00
Dirk Dougherty
b0a8b0b816 am 3b9e7f32: am fb554fc0: am b049b1ef: am 46c4b488: Doc change: Subscriptions free trials on Google Play. 
* commit '3b9e7f32380e179aa1e0718762e86ffa24cbab93':
  Doc change: Subscriptions free trials on Google Play.
 2012-10-09 10:41:15 -07:00
Dirk Dougherty
3b9e7f3238 am fb554fc0: am b049b1ef: am 46c4b488: Doc change: Subscriptions free trials on Google Play. 
* commit 'fb554fc0bf46b17314df26bdfb683c580b18f214':
  Doc change: Subscriptions free trials on Google Play.
 2012-10-09 10:39:06 -07:00
Dirk Dougherty
fb554fc0bf am b049b1ef: am 46c4b488: Doc change: Subscriptions free trials on Google Play. 
* commit 'b049b1ef81d301359444b6b18671a513373ba221':
  Doc change: Subscriptions free trials on Google Play.
 2012-10-09 10:36:43 -07:00
Dirk Dougherty
b049b1ef81 am 46c4b488: Doc change: Subscriptions free trials on Google Play. 
* commit '46c4b4886ae7b3a982cb1803f2b3ed7b7aa5f1c4':
  Doc change: Subscriptions free trials on Google Play.
 2012-10-09 10:33:53 -07:00
Dirk Dougherty
46c4b4886a Doc change: Subscriptions free trials on Google Play. 
Change-Id: I981eb94658f9f152d1c1a9915ffaadd63b4a965d
 2012-10-09 10:17:55 -07:00
Amith Yamasani
5c9ef6459a am 1ab9ac68: am e8f67ed3: Merge "Add an upgrade step for settings moved to global." into jb-mr1-dev 
* commit '1ab9ac685bc65316e58e652e54e3b08d50ee73c7':
  Add an upgrade step for settings moved to global.
 2012-10-09 09:46:26 -07:00
Amith Yamasani
1ab9ac685b am e8f67ed3: Merge "Add an upgrade step for settings moved to global." into jb-mr1-dev 
* commit 'e8f67ed30b60f56718ea58338c7114d5dd14baf0':
  Add an upgrade step for settings moved to global.
 2012-10-09 09:43:23 -07:00
Amith Yamasani
e8f67ed30b Merge "Add an upgrade step for settings moved to global." into jb-mr1-dev 2012-10-09 09:40:39 -07:00
Michael Jurka
a843ebe943 am 540720e1: am 7ed267f5: Fix one case where recents is sometimes not visible 
* commit '540720e15003092d393f4f73dc099a67547bc076':
  Fix one case where recents is sometimes not visible
 2012-10-09 08:32:46 -07:00
Michael Jurka
540720e150 am 7ed267f5: Fix one case where recents is sometimes not visible 
* commit '7ed267f53852aa18aacb605297e56f88d7c08333':
  Fix one case where recents is sometimes not visible
 2012-10-09 08:30:45 -07:00
Michael Jurka
7ed267f538 Fix one case where recents is sometimes not visible 
Bug: 7299653
 2012-10-09 17:03:38 +02:00
The Android Open Source Project
eb512e9061 Reconcile with jb-mr1-release - do not merge 
Change-Id: I777b7c60008af10697d75a888d83a66416b20e89
 2012-10-09 07:29:15 -07:00
The Android Automerger
10d54d172b merge in jb-mr1-release history after reset to jb-mr1-dev 2012-10-09 06:59:27 -07:00
Satoshi Kataoka
8fa0838bf8 Don't update the text services locale in the main thread 
Bug: 6761326
Change-Id: I9f8a81d3c9261a6cfc00292b9f5cb06053b9112d
 2012-10-09 19:20:27 +09:00
Satoshi Kataoka
1bb002c73b am 255cfabb: am 6be35dd6: Merge "Fix an issue on showInputMethodPickerFromClient" into jb-mr1-dev 
* commit '255cfabba64711559601e9a11586587f4ff61cf9':
  Fix an issue on showInputMethodPickerFromClient
 2012-10-09 00:31:36 -07:00
Satoshi Kataoka
255cfabba6 am 6be35dd6: Merge "Fix an issue on showInputMethodPickerFromClient" into jb-mr1-dev 
* commit '6be35dd636bd530a781e997ea9f9a43fc82a1fef':
  Fix an issue on showInputMethodPickerFromClient
 2012-10-09 00:30:13 -07:00
Satoshi Kataoka
6be35dd636 Merge "Fix an issue on showInputMethodPickerFromClient" into jb-mr1-dev 2012-10-09 00:28:17 -07:00
Jeff Brown
33c30e36a5 am 102e97bb: am 8f4baad3: Merge "Blank or unblank all displays as need." into jb-mr1-dev 
* commit '102e97bb6dda1b211acbc4e6e3d3ae58039c9a0d':
  Blank or unblank all displays as need.
 2012-10-09 00:07:05 -07:00
Jeff Brown
102e97bb6d am 8f4baad3: Merge "Blank or unblank all displays as need." into jb-mr1-dev 
* commit '8f4baad387d8ad63efbc05cfa8c4e4c472793deb':
  Blank or unblank all displays as need.
 2012-10-09 00:05:26 -07:00
Jeff Brown
8f4baad387 Merge "Blank or unblank all displays as need." into jb-mr1-dev 2012-10-09 00:02:46 -07:00
Eino-Ville Talvala
4f8e5ce21d Camera: Query AudioService for shutter sound enforcement. 
The AudioService now tracks the shutter sound enforcement status, in
addition to the existing approach. Check with it when doing shutter
sound operations.

Bug: 7032634
Change-Id: Ief855d3a36ca5679832cf439f5638b10f70b8636
 2012-10-08 23:53:48 -07:00
Satoshi Kataoka
c86884cd83 Fix an issue on showInputMethodPickerFromClient 
Bug: 7302748
Change-Id: Iff4345d26b3d6e4bfedf893bbd6a864c771df01d
 2012-10-09 15:20:29 +09:00
Jim Miller
223ce5c732 Implement music and user priority scheme in keyguard 
This fixes an issue where the music transport hangs around indefinitely.
It used to get dismissed when music stopped playing and a notification came in.
This was due to a bug in JB.

Now that the bug is fixed,  the music control hangs around indefinitely until
the application actually releases it.

Since we have widget support, we can now leave the transport control in place
for as long as it's possible to resume music (state = playing | paused).

If music is playing, we start with the trasport showing
If not, and multi-user is enabled for more than one user, we show the user switcher.
Otherwise, we show the clock.

Bug 7290707

Change-Id: I6f0553a64b7b66bac7b35eca6d8a8793c15b918c
 2012-10-08 21:48:30 -07:00
Adam Powell
2624f57d9b am 6cccadfb: am 434f8172: Merge "Don\'t do a wifi p2p scan in MediaRouter if we\'re already connected" into jb-mr1-dev 
* commit '6cccadfb43283ff3630e49e939c98c92c136e7ec':
  Don't do a wifi p2p scan in MediaRouter if we're already connected
 2012-10-08 21:25:34 -07:00
Adam Powell
6cccadfb43 am 434f8172: Merge "Don\'t do a wifi p2p scan in MediaRouter if we\'re already connected" into jb-mr1-dev 
* commit '434f8172332f0abf02499f33846c6042ed628b0c':
  Don't do a wifi p2p scan in MediaRouter if we're already connected
 2012-10-08 21:23:28 -07:00
Adam Powell
434f817233 Merge "Don't do a wifi p2p scan in MediaRouter if we're already connected" into jb-mr1-dev 2012-10-08 21:20:20 -07:00
Adam Powell
b072a9686c Don't do a wifi p2p scan in MediaRouter if we're already connected 
When we're connected to a wifi display already, some configurations
might hiccup or otherwise disrupt the media stream if we initiate a
new scan. Block the MediaRouter's default scanning behavior if we
start up while already connected to a wifi display. (A scan will still
occur if the user opens the picker dialog.)

Change-Id: I413efa883eec41fe0377da18bcb55bc72e2ac729
 2012-10-08 20:56:35 -07:00
Winson Chung
1cea2f3d87 Increasing timeout for screenshot chord in keyguard. (Bug 6941775) 
Change-Id: Ie846ce18878f9597e9f0cd97d78322b59042d43c
 2012-10-08 20:42:31 -07:00
Jeff Brown
9e316a1a2a Blank or unblank all displays as need. 
Ensures that both the internal display and HDMI are blanked
or unblanked in tandem.

Bug: 7309812
Change-Id: Ie8b96d393e8bb20d23c92f3320142d9f7cf42aff
 2012-10-08 19:23:15 -07:00
Christopher Tate
af75948cdd New command line tool: "settings" 
Because the usual content provider interface doesn't allow specification of
the target user under which to perform settings reads/writes, this CL introduces
a new command line app specifically for that.

Usage:

   settings [--user num] get namespace key
   settings [--user num] put namespace key value

If a --user argument is not given, the owner user is targetted.

Bug 7299066

Change-Id: I73108bb76b04fad133cc4e0f218d64490de549f1
 2012-10-08 18:39:27 -07:00
Brian Colonna
517ec2a615 am 66a65f9c: am eb7f1571: Merge "FUL fallback is no longer account login - fix b/7280196" into jb-mr1-dev 
* commit '66a65f9c4b52d9823c4b6aea3e0fd3c55562d548':
  FUL fallback is no longer account login  - fix b/7280196
 2012-10-08 17:44:02 -07:00
Brian Colonna
66a65f9c4b am eb7f1571: Merge "FUL fallback is no longer account login - fix b/7280196" into jb-mr1-dev 
* commit 'eb7f1571ae60db17ead3a8879b4b49df306f009d':
  FUL fallback is no longer account login  - fix b/7280196
 2012-10-08 17:42:02 -07:00
Brian Colonna
eb7f1571ae Merge "FUL fallback is no longer account login - fix b/7280196" into jb-mr1-dev 2012-10-08 17:39:16 -07:00
Jim Miller
85849d4cde am d1c0e980: am 0c9b5359: Merge "Fix "checking account" string" into jb-mr1-dev 
* commit 'd1c0e98076524f3a8bcd6e2a31bc975321088a50':
  Fix "checking account" string
 2012-10-08 17:31:29 -07:00
Jim Miller
d1c0e98076 am 0c9b5359: Merge "Fix "checking account" string" into jb-mr1-dev 
* commit '0c9b5359bd15f74857f6b07931f484aca214abcf':
  Fix "checking account" string
 2012-10-08 17:29:23 -07:00
Jim Miller
0c9b5359bd Merge "Fix "checking account" string" into jb-mr1-dev 2012-10-08 17:26:22 -07:00
Chris Wren
a934fd142e default the screen on during the dream. 
Bug: 7295909
Change-Id: Ic629bd08bdade8dba2b92124c56cab1bb438bec2
 2012-10-08 17:23:36 -07:00