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

85050 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Wink Saville
fa9cae7e91 am ea4f446a: am 72c06bcf: am 0c99f7e3: am ba3cf72a: Merge "Telephony: Clarify IccCardConstants.State enum" 
* commit 'ea4f446a816ee1558c2776206642d0751fc2afb7':
  Telephony: Clarify IccCardConstants.State enum
 2012-09-11 13:23:39 -07:00
Wink Saville
ea4f446a81 am 72c06bcf: am 0c99f7e3: am ba3cf72a: Merge "Telephony: Clarify IccCardConstants.State enum" 
* commit '72c06bcf1970f615f5037b9f63759d06a527cb4e':
  Telephony: Clarify IccCardConstants.State enum
 2012-09-11 13:21:38 -07:00
Adam Cohen
2664f94f20 am aec914b1: Merge "Adding notion of keyguard widgets" into jb-mr1-dev 
* commit 'aec914b1301b9608053b77318c8ea86fa162f14d':
  Adding notion of keyguard widgets
 2012-09-11 13:19:52 -07:00
Wink Saville
72c06bcf19 am 0c99f7e3: am ba3cf72a: Merge "Telephony: Clarify IccCardConstants.State enum" 
* commit '0c99f7e36da7ebc92d0a084f3dc1717a7c31423e':
  Telephony: Clarify IccCardConstants.State enum
 2012-09-11 13:19:18 -07:00
Adam Cohen
aec914b130 Merge "Adding notion of keyguard widgets" into jb-mr1-dev 2012-09-11 13:18:14 -07:00
Wink Saville
0c99f7e36d am ba3cf72a: Merge "Telephony: Clarify IccCardConstants.State enum" 
* commit 'ba3cf72a08368ab40556b07b4518536bb59eb2f6':
  Telephony: Clarify IccCardConstants.State enum
 2012-09-11 13:17:17 -07:00
Jim Miller
68cfbf21d4 am ea42443e: Merge "Attempt to fix blank keyguard issue" into jb-mr1-dev 
* commit 'ea42443e35f04ebd5c8fd6b6b2fc362e2534cb9a':
  Attempt to fix blank keyguard issue
 2012-09-11 13:10:34 -07:00
Jim Miller
ea42443e35 Merge "Attempt to fix blank keyguard issue" into jb-mr1-dev 2012-09-11 13:08:18 -07:00
Eino-Ville Talvala
64791aabd4 am ff5c9146: Merge "NEW_API: Unhide android.hardware.Camera.Parameters#SCENE_MODE_HDR" into jb-mr1-dev 
* commit 'ff5c9146b53d8429f8ee778f193582c12da0d2b3':
  NEW_API: Unhide android.hardware.Camera.Parameters#SCENE_MODE_HDR
 2012-09-11 12:43:42 -07:00
Eino-Ville Talvala
ff5c9146b5 Merge "NEW_API: Unhide android.hardware.Camera.Parameters#SCENE_MODE_HDR" into jb-mr1-dev 2012-09-11 12:41:11 -07:00
Wink Saville
ba3cf72a08 Merge "Telephony: Clarify IccCardConstants.State enum" 2012-09-11 12:24:15 -07:00
Svetoslav Ganov
7abd5cfacf am c574fd04: Merge "Fixing implementation of View.requestRectangleOnScreen(Rect, boolean)." into jb-mr1-dev 
* commit 'c574fd04cc192fa30af5dd065c5d0cd4c50f8db4':
  Fixing implementation of View.requestRectangleOnScreen(Rect, boolean).
 2012-09-11 12:18:21 -07:00
Svetoslav Ganov
c574fd04cc Merge "Fixing implementation of View.requestRectangleOnScreen(Rect, boolean)." into jb-mr1-dev 2012-09-11 12:16:13 -07:00
Selim Gurun
3591fa3bcd am 2fa10c67: Fix build break 
* commit '2fa10c675b42d22e73492154ca0ca1cbdbceaa3a':
  Fix build break
 2012-09-11 11:35:27 -07:00
Eino-Ville Talvala
7cfd7d5b65 NEW_API: Unhide android.hardware.Camera.Parameters#SCENE_MODE_HDR 
Bug: 7054970

Change-Id: I509fa18f1203022bb23cd9ef5c70cb3a3fbb8b77
 2012-09-11 11:34:59 -07:00
Selim Gurun
2fa10c675b Fix build break 
Change-Id: Ib5415bbebb849de23b3ff8533a7c1a98f6ae38f4
 2012-09-11 11:32:44 -07:00
Eino-Ville Talvala
94aa95beca am a910390b: Merge "Camera: Add SCENE_MODE_HDR." into jb-mr1-dev 
* commit 'a910390b7d64fba46e7c2034f7085b04e5268cab':
  Camera: Add SCENE_MODE_HDR.
 2012-09-11 11:21:47 -07:00
Eino-Ville Talvala
a910390b7d Merge "Camera: Add SCENE_MODE_HDR." into jb-mr1-dev 2012-09-11 11:20:09 -07:00
Fabrice Di Meglio
3827922569 am 5cf8bd79: Merge "Fix bug #7141044 GlobalActions dialog (power off / airplane mode / sound off) should be RTL aware" into jb-mr1-dev 
* commit '5cf8bd79bbdef0185574f0e3514124583ad537cd':
  Fix bug #7141044 GlobalActions dialog (power off / airplane mode / sound off) should be RTL aware
 2012-09-11 11:20:05 -07:00
Fabrice Di Meglio
5cf8bd79bb Merge "Fix bug #7141044 GlobalActions dialog (power off / airplane mode / sound off) should be RTL aware" into jb-mr1-dev 2012-09-11 11:18:15 -07:00
Kenny Root
dba90626d3 am a3618092: Merge "Remove "unlinklib" command from installd" into jb-mr1-dev 
* commit 'a36180925bdbde9308f9ae6d27dd5fbadb2fa511':
  Remove "unlinklib" command from installd
 2012-09-11 11:16:22 -07:00
Kenny Root
a36180925b Merge "Remove "unlinklib" command from installd" into jb-mr1-dev 2012-09-11 11:13:53 -07:00
Amith Yamasani
59337ae684 am 8015f039: Merge "Enforce a user limit" into jb-mr1-dev 
* commit '8015f039c744fb59c14920550705af958fc3c86d':
  Enforce a user limit
 2012-09-11 11:11:23 -07:00
Amith Yamasani
8015f039c7 Merge "Enforce a user limit" into jb-mr1-dev 2012-09-11 11:08:38 -07:00
Eino-Ville Talvala
9725ff46c4 am 6fc7275d: Merge "Camera: Add enableShutterSound method." into jb-mr1-dev 
* commit '6fc7275d0ede6d352854db8fff95ec611bd07416':
  Camera: Add enableShutterSound method.
 2012-09-11 11:07:51 -07:00
Eino-Ville Talvala
6fc7275d0e Merge "Camera: Add enableShutterSound method." into jb-mr1-dev 2012-09-11 11:06:13 -07:00
Selim Gurun
a7a5fa82cc am 06ee8cde: Merge "Remove defunct searchbox implementation from webview." into jb-mr1-dev 
* commit '06ee8cdec509590aeaddcfb30aa517ab369d59c5':
  Remove defunct searchbox implementation from webview.
 2012-09-11 11:04:57 -07:00
Irfan Sheriff
abee4a7695 am f625436c: Merge "Handle ascii encoded SSID" into jb-mr1-dev 
* commit 'f625436cc741932518e5f1a41586c72ac8297ece':
  Handle ascii encoded SSID
 2012-09-11 11:03:11 -07:00
Mike Lockwood
a3f1b5086b am 25da9375: Merge "MtpDatabase: Fix typo affecting parent and format queries" into jb-mr1-dev 
* commit '25da9375fdf2e92c3f50c878da9c781a368bf255':
  MtpDatabase: Fix typo affecting parent and format queries
 2012-09-11 11:03:08 -07:00
Selim Gurun
06ee8cdec5 Merge "Remove defunct searchbox implementation from webview." into jb-mr1-dev 2012-09-11 11:01:32 -07:00
Scott Main
f7b133be57 am 8b9e467d: am c02b5008: am c0e0d2bf: Merge "docs: update for multi apk doc for ABI support" into jb-dev 
* commit '8b9e467dfb2738679ac40ef4338be7b17610df81':
  docs: update for multi apk doc for ABI support
 2012-09-11 11:01:07 -07:00
Irfan Sheriff
f625436cc7 Merge "Handle ascii encoded SSID" into jb-mr1-dev 2012-09-11 11:00:10 -07:00
Amith Yamasani
faea76ff8b Enforce a user limit 
By default only 1 user is allowed. Some devices permit more than 1.
Set the real user limit in a device overlay for config.xml

Change-Id: I2e0bffa13393b954fcd20e55b92f20de980c58c0
 2012-09-11 10:59:48 -07:00
Mike Lockwood
25da9375fd Merge "MtpDatabase: Fix typo affecting parent and format queries" into jb-mr1-dev 2012-09-11 10:57:41 -07:00
Kenny Root
9bbd70a963 Remove "unlinklib" command from installd 
unlinklib is no longer necessary since libraries are now either stored
in an ASEC container or in /data/app-lib

Replace lib directory with a symlink to the /data/app-lib directory even
if it's a dangling link. That way developers don't name something "lib"
in their directory which gets blown away during an update.

Change-Id: I142cf13dba9c13aafbaf0ff8d5e9872cbf1cc910
 2012-09-11 10:55:17 -07:00
Adam Cohen
0aa2d42e87 Adding notion of keyguard widgets 
-> Persisting certain appwidget options
-> Adding ability to specify appwidget options on bind
   so as to avoid AppWidgetProvider update call with no
   options.

Change-Id: I5631039f19f1822b8e123b559b6353c880c0192e
 2012-09-11 10:53:57 -07:00
Scott Main
8b9e467dfb am c02b5008: am c0e0d2bf: Merge "docs: update for multi apk doc for ABI support" into jb-dev 
* commit 'c02b5008c109f4d3057de1bab8b7ac0478208816':
  docs: update for multi apk doc for ABI support
 2012-09-11 10:53:24 -07:00
Scott Main
c02b5008c1 am c0e0d2bf: Merge "docs: update for multi apk doc for ABI support" into jb-dev 
* commit 'c0e0d2bf3db18eaa2b94608654784cad29f96b23':
  docs: update for multi apk doc for ABI support
 2012-09-11 10:50:40 -07:00
Irfan Sheriff
b6deeed3ce Handle ascii encoded SSID 
Supplicant now passes as an ascii encoded string that allows it to
pass any sequence of bytes for a SSID. see src/utils/common.c in supplicant
for details of the implementation.

We create a SSID structure WifiSsid in framework to store the ssid and handle
the conversion appropriately when required for printing and for an application.

At this point, we still do not handle non-printable octets from an application perspective
for connectivity

Bug: 7110903
Change-Id: I520e5ee23baed4867b8b408bbb3eda5c9e92b6bf
 2012-09-11 10:50:04 -07:00
Mike Lockwood
58e6831ccb MtpDatabase: Fix typo affecting parent and format queries 
Bug: 7114350

Change-Id: I80269cfcebf521ea13cae30c1c9bd477d76adbd1
Signed-off-by: Mike Lockwood <lockwood@google.com>
 2012-09-11 10:49:34 -07:00
Scott Main
c0e0d2bf3d Merge "docs: update for multi apk doc for ABI support" into jb-dev 2012-09-11 10:48:16 -07:00
Selim Gurun
0e9292b94a Remove defunct searchbox implementation from webview. 
The search box implementation has not been in use since ICS. This
removes dead code from webview.

Change-Id: I8a28eeeec556619abc4a902a3abec2ac52bad319
 2012-09-11 10:40:28 -07:00
Jean-Michel Trivi
dff22ac7bb am 660c8a11: Merge "Add support for controlling remote submix audio routing" into jb-mr1-dev 
* commit '660c8a115bdc92bed4bc8380407f2ac3333c42e1':
  Add support for controlling remote submix audio routing
 2012-09-11 10:38:55 -07:00
Jean-Michel Trivi
660c8a115b Merge "Add support for controlling remote submix audio routing" into jb-mr1-dev 2012-09-11 10:36:54 -07:00
Winson Chung
fcde3a44da am db425bbb: Merge "Fixing issue with Airplane Mode. (Bug 7141144)" into jb-mr1-dev 
* commit 'db425bbb283d5345616c5bb762b9650a7ff19980':
  Fixing issue with Airplane Mode. (Bug 7141144)
 2012-09-11 10:01:14 -07:00
Winson Chung
db425bbb28 Merge "Fixing issue with Airplane Mode. (Bug 7141144)" into jb-mr1-dev 2012-09-11 09:59:39 -07:00
Winson Chung
08b1cc8475 Fixing issue with Airplane Mode. (Bug 7141144) 
Change-Id: I83e2bdd5e8b0e0c732e8d46c47f8619daa0c7c02
 2012-09-11 10:01:24 -07:00
John Spurlock
6beb722043 am 9f750af6: Update the dream manager to be multi-user aware. 
* commit '9f750af6c178d8abb5c12d34efba599e3d53aea4':
  Update the dream manager to be multi-user aware.
 2012-09-11 08:25:02 -07:00
John Spurlock
9f750af6c1 Update the dream manager to be multi-user aware. 
Dream settings are stored per-user, so dream manager operations
must act according to the calling or current user.

Bug:7041514
Change-Id: I4a0bbbd76886e6440b1afd89c61af5f4569b0e18
 2012-09-11 09:50:23 -04:00
Dianne Hackborn
8bb779bd47 am 0bac8bcb: Merge "Animations for user switching." into jb-mr1-dev 
* commit '0bac8bcbcc281afc041f621a156fd21549d686e1':
  Animations for user switching.
 2012-09-10 21:06:38 -07:00