Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
85,919 Commits 3 Branches 0 Tags
9a605bcfe07bc2ce598d528d83f150aa046d42d3
Commit Graph

85919 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Scott Main
9a605bcfe0 am f7b133be: am 8b9e467d: am c02b5008: am c0e0d2bf: Merge "docs: update for multi apk doc for ABI support" into jb-dev 
* commit 'f7b133be571466a1ccea5b91c0503d6653c0cd1a':
  docs: update for multi apk doc for ABI support
 2012-09-12 15:13:26 -07:00
Jean-Michel Trivi
cc9387be99 am dff22ac7: am 660c8a11: Merge "Add support for controlling remote submix audio routing" into jb-mr1-dev 
* commit 'dff22ac7bbf80c849cda96ff2b0f6618a35b86bd':
  Add support for controlling remote submix audio routing
 2012-09-12 15:13:20 -07:00
Winson Chung
4d571f1d84 am fcde3a44: am db425bbb: Merge "Fixing issue with Airplane Mode. (Bug 7141144)" into jb-mr1-dev 
* commit 'fcde3a44da4a792fc88f8700d913a7f0155934ba':
  Fixing issue with Airplane Mode. (Bug 7141144)
 2012-09-12 13:18:12 -07:00
John Spurlock
4170af8bab am 6beb7220: am 9f750af6: Update the dream manager to be multi-user aware. 
* commit '6beb72204346fe75f763592462c9bc2a0b560533':
  Update the dream manager to be multi-user aware.
 2012-09-12 13:17:57 -07:00
Dianne Hackborn
dea6f14dc0 Merge "resolved conflicts for merge of 8bb779bd to master" 2012-09-12 13:15:07 -07:00
Dianne Hackborn
f41d25a2f5 resolved conflicts for merge of 8bb779bd to master 
Change-Id: I72ddc0a67cf55d45958a622ffe535f32c1721052
 2012-09-12 10:55:03 -07:00
Geremy Condra
c3ec0d01a6 Push event logging down into libcore.EventLogger 
This changes the default behavior of the EventLogger from logging
to the normal logs to logging to the event logs.

Change-Id: I4338a1605928b82246a369adb3514bd31cd552e8
 2012-09-11 21:29:06 -07:00
Geremy Condra
a913e70f81 Added event logging for config installation failures. 
This just logs the directory the data is being written to, which
will tell us whether we've pushed a bad update and are about to
start wedging devices.

Change-Id: Iaaef6d41b2ab18bcce295c583ee13f49e337ed65
 2012-09-11 17:02:48 -07:00
Geremy Condra
c023c434aa Create intermediate directories when installing config data. 
This prevents an issue where a user factory data resets and
hoses the default directory layout- it will now be recreated
on first update.

Change-Id: I7e3cb47a0fa3aa941a74d46fba7e15865484b66d
 2012-09-11 15:46:56 -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
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
Scott Main
c0e0d2bf3d Merge "docs: update for multi apk doc for ABI support" into jb-dev 2012-09-11 10:48:16 -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
Winson Chung
029bf7547d am 1178b6c8: am 1679b368: Adding brightness dialog to quick settings. 
* commit '1178b6c8b17cbeffa9d89b51ec5cd87d312774ea':
  Adding brightness dialog to quick settings.
 2012-09-10 20:25:13 -07:00
Winson Chung
f1e4048715 am 89f7cb24: am e641b6a9: Adding alarm to quick settings. 
* commit '89f7cb24f2484ac90306a81fe0e17f65a45482c2':
  Adding alarm to quick settings.
 2012-09-10 20:23:32 -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
272e2a5cec am 23e03832: am e1f02ef0: Merge "Miscellaneous fixes for Settings" into jb-mr1-dev 
* commit '23e038323dc79c3d5355ba4b4b77060a763a1a91':
  Miscellaneous fixes for Settings
 2012-09-10 19:25:29 -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
5a4e19b576 am 75ff7c33: am ce3ef0ab: Merge "Screen magnification should disengage on screen off." into jb-mr1-dev 
* commit '75ff7c33408483b8ee8e87e0f5bbe56220325bf5':
  Screen magnification should disengage on screen off.
 2012-09-10 18:25:52 -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
Selim Gurun
6eb6157da6 am d2d3bff2: am befab9e6: Merge "Control access to inherited methods of jsinterface objects" into jb-mr1-dev 
* commit 'd2d3bff22c339bc30452a6c79b703b6d22f08d3b':
  Control access to inherited methods of jsinterface objects
 2012-09-10 18:21:14 -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
Jim Miller
a090b7429d am bd5cd21d: am eeabf942: Merge "Allow pattern to start from outside pattern view" into jb-mr1-dev 
* commit 'bd5cd21d827a422a5ab787b87625d25a5d35f7bb':
  Allow pattern to start from outside pattern view
 2012-09-10 18:21:08 -07:00
Amith Yamasani
71fd13dcde am c648ef27: am 5bf7800d: Merge "Force keyguard if there are multiple users" into jb-mr1-dev 
* commit 'c648ef27b25c4d0a45801e42fcc5bc9a1a6e66a4':
  Force keyguard if there are multiple users
 2012-09-10 18:19:26 -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
Romain Guy
1fe832bd06 am 7daa4fce: am df46c637: Merge "Prevent degenerate 9-patches from drawing out of bounds Bug #7137292" into jb-mr1-dev 
* commit '7daa4fce8c9c8bbdca5180ad7160bd7416a3d160':
  Prevent degenerate 9-patches from drawing out of bounds Bug #7137292
 2012-09-10 17:48:26 -07:00
Svetoslav Ganov
a1b5b22b9b am 7ddeda01: am 3c396fcc: Merge "Reducing the click delay while screen magnification is enabled." into jb-mr1-dev 
* commit '7ddeda0150f347f06cce0eaa6212ba496d88b52f':
  Reducing the click delay while screen magnification is enabled.
 2012-09-10 17:45:53 -07:00
Romain Guy
7daa4fce8c am df46c637: Merge "Prevent degenerate 9-patches from drawing out of bounds Bug #7137292" into jb-mr1-dev 
* commit 'df46c637550b4c6f0543574cfbd544329f48f5c7':
  Prevent degenerate 9-patches from drawing out of bounds Bug #7137292
 2012-09-10 17:44:58 -07:00
Romain Guy
df46c63755 Merge "Prevent degenerate 9-patches from drawing out of bounds Bug #7137292" into jb-mr1-dev 2012-09-10 17:43:21 -07:00