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
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
Dianne Hackborn
0bac8bcbcc
Merge "Animations for user switching." into jb-mr1-dev
2012-09-10 21:04:55 -07:00
Fabrice Di Meglio
4497e0c3c6
Fix bug #7141044 GlobalActions dialog (power off / airplane mode / sound off) should be RTL aware
...
- add android:supportsRtl="true" to the manifest for system_process
Change-Id: I9794f6880c883d91751d0037646253810b086d46
2012-09-10 20:46:33 -07:00
Winson Chung
1178b6c8b1
am 1679b368: Adding brightness dialog to quick settings.
...
* commit '1679b368004239a81734ca4b5f5e2487597b8f52':
Adding brightness dialog to quick settings.
2012-09-10 20:23:22 -07:00
Winson Chung
89f7cb24f2
am e641b6a9: Adding alarm to quick settings.
...
* commit 'e641b6a99cabad7076e10694a5b1b30f449de462':
Adding alarm to quick settings.
2012-09-10 20:21:39 -07:00
Winson Chung
1679b36800
Adding brightness dialog to quick settings.
...
Change-Id: I81f640138057c26320d41f70c7f47a518fc1bd4a
2012-09-10 20:20:22 -07:00
Winson Chung
e641b6a99c
Adding alarm to quick settings.
...
- Cleaning up some code
Change-Id: Iaea2077084ba16b4fb4d47c8b2df5da6983ceb91
2012-09-10 20:20:03 -07:00
Dianne Hackborn
9d9ece3c1e
Animations for user switching.
...
The window manager now has a facility to provide a full-screen
animation, which the activity manager uses every time a user
switch happens.
The current animation is just a simple dumb slide until we get
a design from UX.
Also some cleanup: moved the portrait task animations to the
default config so we always have an animation for them, and finally
got the java symbol stuff out of public.xml.
Change-Id: I726f77422b2ef5f2d98f961f8da003e045f0ebe8
2012-09-10 19:58:21 -07:00
Christopher Tate
23e038323d
am e1f02ef0: Merge "Miscellaneous fixes for Settings" into jb-mr1-dev
...
* commit 'e1f02ef080e5046e03b4b3b7bb64e22e7790b707':
Miscellaneous fixes for Settings
2012-09-10 19:23:20 -07:00
Christopher Tate
e1f02ef080
Merge "Miscellaneous fixes for Settings" into jb-mr1-dev
2012-09-10 19:21:53 -07:00
Svetoslav Ganov
75ff7c3340
am ce3ef0ab: Merge "Screen magnification should disengage on screen off." into jb-mr1-dev
...
* commit 'ce3ef0abaa17b12dc0626b06421d58bf06974ae2':
Screen magnification should disengage on screen off.
2012-09-10 18:23:05 -07:00
Svetoslav Ganov
ce3ef0abaa
Merge "Screen magnification should disengage on screen off." into jb-mr1-dev
2012-09-10 18:21:13 -07:00
Selim Gurun
d2d3bff22c
am befab9e6: Merge "Control access to inherited methods of jsinterface objects" into jb-mr1-dev
...
* commit 'befab9e6b8fcb69cc656bb851ddc7ad7dfa6a7db':
Control access to inherited methods of jsinterface objects
2012-09-10 18:18:36 -07:00
Jim Miller
bd5cd21d82
am eeabf942: Merge "Allow pattern to start from outside pattern view" into jb-mr1-dev
...
* commit 'eeabf942263d55eb9b1ac0b9a525bd917cfc1f30':
Allow pattern to start from outside pattern view
2012-09-10 18:16:49 -07:00
Svetoslav Ganov
36e614c110
Screen magnification should disengage on screen off.
...
1. When the screen goes off the user will be in a completely
different context upon turning the screen on. Therefore,
if magnification auto update is enabled magnification
will be disengaged on screen off.
bug:7139088
Change-Id: I790cfa5b3cf31d34e95fc9548e6246a84096c37b
2012-09-10 18:16:05 -07:00
Selim Gurun
befab9e6b8
Merge "Control access to inherited methods of jsinterface objects" into jb-mr1-dev
2012-09-10 18:15:37 -07:00
Amith Yamasani
c648ef27b2
am 5bf7800d: Merge "Force keyguard if there are multiple users" into jb-mr1-dev
...
* commit '5bf7800de6d14a55d0c6ee006425fa79c3f8d21e':
Force keyguard if there are multiple users
2012-09-10 18:15:10 -07:00
Jim Miller
eeabf94226
Merge "Allow pattern to start from outside pattern view" into jb-mr1-dev
2012-09-10 18:13:57 -07:00
Amith Yamasani
5bf7800de6
Merge "Force keyguard if there are multiple users" into jb-mr1-dev
2012-09-10 18:12:42 -07:00
Amith Yamasani
b70ff9a181
Force keyguard if there are multiple users
...
Otherwise there would be no way to switch users if a user chooses None as lock screen.
Also adjust some layout params for Preference items to align the icons and text.
Change-Id: Ib11bb961edaef90de280bc7137d10b68765aea98
2012-09-10 18:11:46 -07:00