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

4411 Commits

Author SHA1 Message Date
Romain Guy
6a7cac6af9 am d9731a57: am bf53be46: am 09353f74: Merge "Check and fail early if requested wallpaper size exceeds maximum texture size." 
* commit 'd9731a57c631a5218819dbb02755c4dd41e7cc44':
  Check and fail early if requested wallpaper size exceeds maximum texture size.
 2013-02-27 23:22:28 +00:00
Romain Guy
d9731a57c6 am bf53be46: am 09353f74: Merge "Check and fail early if requested wallpaper size exceeds maximum texture size." 
* commit 'bf53be46d237866a9964a4f1fa960eb6ef4a70a6':
  Check and fail early if requested wallpaper size exceeds maximum texture size.
 2013-02-27 07:08:15 +00:00
Maggie Benthall
3316f30add am 40bbc3bb: Merge "Add location sharing toggle user restriction." into jb-mr2-dev 
* commit '40bbc3bb9997c6e9ea9aae42edd6bb4430d70978':
  Add location sharing toggle user restriction.
 2013-02-25 21:49:03 +00:00
Baligh Uddin
1441e6fa32 Merge "Import translations. DO NOT MERGE" 2013-02-25 18:07:01 +00:00
Maggie Benthall
6794458f86 Add location sharing toggle user restriction. 
And add support for respecting it.

Change-Id: Ia5cf9134c5f5741c3f55afadbe54f862da7bfe5b
 2013-02-25 12:45:14 -05:00
Baligh Uddin
351600ec71 Import translations. DO NOT MERGE 
Change-Id: Ie31e6632a217b9b9c7c0ebb79b16747830370db1
Auto-generated-cl: translation import
 2013-02-25 08:53:09 -08:00
Baligh Uddin
be46b8ccd2 Import translations. DO NOT MERGE 
Change-Id: Icdfc932c8898e3c716e012d384afa2521d3ac11c
Auto-generated-cl: translation import
 2013-02-25 08:52:34 -08:00
Derek Sollenberger
bc340d03c3 Merge "Merge remote-tracking branch 'goog/master-chromium' into 'goog/master'" 2013-02-22 18:39:13 +00:00
Daniel Sandler
458d5e1b03 Make QUICK_CLOCK work on tablets. 
Bug: 7724222
Change-Id: Ib8f4beb206736ed01edda96fbd3638a377a8f49e
 2013-02-21 15:12:49 -05:00
Fabrice Di Meglio
584e5af847 am 50c291b6: Merge "SystemUI optimization - rely on inheritance for layout direction" 
* commit '50c291b653062e7356fd8764bf625a1e1f2c678d':
  SystemUI optimization - rely on inheritance for layout direction
 2013-02-20 15:21:26 -08:00
Fabrice Di Meglio
50c291b653 Merge "SystemUI optimization - rely on inheritance for layout direction" 2013-02-20 23:18:04 +00:00
Michael Wright
01fc6fc4c1 am 1fd2ed58: Merge "Add brightness dialog to SystemUI" 
* commit '1fd2ed58da3e578df0cd0c326c719cf1c282b793':
  Add brightness dialog to SystemUI
 2013-02-20 15:06:43 -08:00
Michael Wright
1fd2ed58da Merge "Add brightness dialog to SystemUI" 2013-02-20 23:03:18 +00:00
Michael Wright
0087a14d4b Add brightness dialog to SystemUI 
Change-Id: If31406c9144bb2583876f08dd54b259d1dfa3601
 2013-02-20 14:39:03 -08:00
Romain Guy
09bd2113e3 am 14bd8359: Merge "Wallpaper software rendering fallback Bug #8230579" 
* commit '14bd8359a84c9b3f634d1fd816ddf5750d6539a9':
  Wallpaper software rendering fallback Bug #8230579
 2013-02-20 10:36:12 -08:00
Romain Guy
14bd8359a8 Merge "Wallpaper software rendering fallback Bug #8230579" 2013-02-20 18:33:05 +00:00
Romain Guy
c8d983f725 Wallpaper software rendering fallback 
Bug #8230579

If the wallpaper fails to render with OpenGL, fall back to software
rendering instead of throwing an exception and crashing the wallpaper.

Change-Id: I40ed6056e6ea09b92b6cd441f16101dcc296fb8e
 2013-02-20 10:05:36 -08:00
Daniel Sandler
8071a6aac8 am 8983d11c: Merge "Looking for NaN values in status bar animations." 
* commit '8983d11c4069bc136f496987f11df7dcd5771188':
  Looking for NaN values in status bar animations.
 2013-02-19 20:05:05 -08:00
Daniel Sandler
8983d11c40 Merge "Looking for NaN values in status bar animations." 2013-02-20 04:01:28 +00:00
Daniel Sandler
42b3cf94d0 Looking for NaN values in status bar animations. 
We should probably set these values to 0 when we find them,
but first I want to catch this bug in the act before I paper
over it with defensive programming.

Also standardizing on use of isStarted() instead of
isRunning() on animators.

Bug: 7686690
Change-Id: I9f93c443784d2ed795d3e16ad9bb03811371497c
 2013-02-19 22:56:38 -05:00
Michael Jurka
0321991bbd am 5b032429: Merge "Fix one cause of slow scrolling in Recents" 
* commit '5b0324299af1aa520792789549f4cc8ea8d1935d':
  Fix one cause of slow scrolling in Recents
 2013-02-19 14:42:49 -08:00
Michael Jurka
5b0324299a Merge "Fix one cause of slow scrolling in Recents" 2013-02-19 22:38:49 +00:00
Michael Jurka
67b03701b6 Fix one cause of slow scrolling in Recents 
Bug: 8208782

Change-Id: I8153001d1cea0c01f929d3091a722fed842038fa
 2013-02-19 14:23:16 -08:00
Baligh Uddin
32a4fd8e14 Merge "Import translations. DO NOT MERGE" 2013-02-19 21:57:16 +00:00
Jeff Sharkey
cd85845b6e am ccacb8e8: Merge "Add DUMP permission to SystemUI for bugreports." 
* commit 'ccacb8e88bb4369225e5a97bd64b8351fe04f1b5':
  Add DUMP permission to SystemUI for bugreports.
 2013-02-19 13:17:24 -08:00
Jeff Sharkey
a2c73ae969 Add DUMP permission to SystemUI for bugreports. 
Bug: 8223786
Change-Id: Ie91167eaaa299fb7f0affa386407765efe4965a4
 2013-02-19 13:01:35 -08:00
Baligh Uddin
9cd4ffa6f0 Import translations. DO NOT MERGE 
Change-Id: I0d54b8a3066875c4107699d0a9c1309b996362ba
Auto-generated-cl: translation import
 2013-02-19 12:37:29 -08:00
Baligh Uddin
4cf32d2e9f Import translations. DO NOT MERGE 
Change-Id: I12eb67341bf7801d996bfaef6ede235dbb3daecd
Auto-generated-cl: translation import
 2013-02-15 13:43:45 -08:00
Fabrice Di Meglio
b5fe52b389 SystemUI optimization - rely on inheritance for layout direction 
- this CL purpose is to fully rely on inheritance for setting the
SystemUI views layout direction. This is the default case for layout
direction and should stay like that.

Change-Id: I8efb6ab6e5bd10f519c7a27e8837efb69631940e
 2013-02-15 13:10:38 -08:00
Christopher Tate
c5f09df8fd am afc43ed9: Merge "Full backup now saves getExternalFilesDir() content with the app data" 
* commit 'afc43ed9a765766fc35477f42cbc6bfdad0b1067':
  Full backup now saves getExternalFilesDir() content with the app data
 2013-02-15 11:42:30 -08:00
Kristian Monsen
1456758802 resolved conflicts for merge of 58a1ca66 to master-chromium 
Change-Id: I06b61e6d7d52b584eae03a95220381475b8bff0e
 2013-02-14 19:48:27 -08:00
Christopher Tate
416c39e8d4 Full backup now saves getExternalFilesDir() content with the app data 
... instead of only saving it with the enormous "shared storage" generic
data blob.  In parallel, we no longer store managed app-specific files
on external storage as part of the generic shared-storage blob.

At restore time we just go ahead and apply such files, though,
because they're a priori going to be part of an archive generated by
an older version of the platform, so that's how the data is expected
to be handled in those circumstances.

Bug 6718844

Change-Id: I4410514d368b11d74b3afe6b92d363d4115a3415
 2013-02-14 18:46:53 -08:00
Mathias Agopian
58a1ca6642 Merge "split Surface in two classes: SurfaceControl and Surface" 2013-02-14 20:25:08 +00:00
Mathias Agopian
3866f0d581 split Surface in two classes: SurfaceControl and Surface 
SurfaceControl is the window manager side; it can
control the attributes of a surface but cannot push buffers
to it. Surface on the other hand is the application (producer)
side and is used to push buffers to the surface.

Change-Id: Ib6754c968924e87e8dd02a2073c7a447f729f4dd
 2013-02-14 12:19:11 -08:00
Wim Vander Schelden
9549c067d9 Check and fail early if requested wallpaper size exceeds maximum texture size. 
This fixes an issue where OpenGL initialization succeeds but buffer allocation fails because the requested wallpaper size
is too large (or otherwise unsupported) by the graphics hardware. This fixes an issue where SystemUI crashes constantly
on the PandaBoard when connected to a full HD display. Tested only on PandaBoard, no access to alternative hardware.
Signed-off-by: Wim Vander Schelden <wim.vander.schelden@philips.com>

Change-Id: I8d2e1ae9fd9772977c4e365f23f2f58bbca3787c
 2013-02-14 19:16:23 +00:00
Daniel Sandler
7eb092a39c am 2977a30e: Merge "More debug logs for stuck statusbars." 
# Via Android (Google) Code Review (1) and Daniel Sandler (1)
* commit '2977a30ef422f2be4a5ef74dd1a5a32a6a8f994b':
  More debug logs for stuck statusbars.
 2013-02-13 17:55:15 -08:00
Daniel Sandler
2977a30ef4 Merge "More debug logs for stuck statusbars." 2013-02-14 01:49:59 +00:00
Daniel Sandler
37a38aaecb More debug logs for stuck statusbars. 
Bug: 7686690
Change-Id: Ic58d90a56412579cad0c77f5787a6fc4193a32d1
 2013-02-13 20:47:48 -05:00
Kenny Root
f22d550195 am 1247c0a1: am a276589b: am 37edbbc6: Merge "VpnDialogs: filter obscured touches" 
# Via Android Git Automerger (2) and others
* commit '1247c0a11d54478158dafcaeedd7e49a6b99fb1f':
  VpnDialogs: filter obscured touches
 2013-02-13 17:13:35 -08:00
Kenny Root
1247c0a11d am a276589b: am 37edbbc6: Merge "VpnDialogs: filter obscured touches" 
# Via Android Git Automerger (1) and others
* commit 'a276589ba5439e6b06a4f49de7420fbf45104c80':
  VpnDialogs: filter obscured touches
 2013-02-13 17:11:34 -08:00
Jean-Michel Trivi
b5dc902580 am 4627a47d: Merge "Remove obsolete imports" 
# Via Android (Google) Code Review
* commit '4627a47d94a5322b9a3cea02645929b260a6ee16':
  Remove obsolete imports
 2013-02-13 16:45:44 -08:00
Jean-Michel Trivi
4627a47d94 Merge "Remove obsolete imports" 2013-02-14 00:42:43 +00:00
Kenny Root
56480ef53f VpnDialogs: filter obscured touches 
Change-Id: Ifcc919c36006c88e36363f5160f9334df0cf7e5b
 2013-02-13 16:32:48 -08:00
Chris Craik
c932760f66 Merge "Revert "Merge remote-tracking branch 'goog/master-chromium' into 'goog/master'" DO NOT MERGE" 2013-02-13 23:14:58 +00:00
Jean-Michel Trivi
21b1549cac am 0888a067: Merge "Fix AudioFocus for back-to-back notifications" 
# Via Android (Google) Code Review (1) and Jean-Michel Trivi (1)
* commit '0888a06762fb55d48646c86c6a0184a0b96cdc24':
  Fix AudioFocus for back-to-back notifications
 2013-02-13 11:44:38 -08:00
Jean-Michel Trivi
fc95e673d3 am 23bbe02b: Merge "No AudioFocus for notifications when media played remotely" 
# Via Android (Google) Code Review (1) and Jean-Michel Trivi (1)
* commit '23bbe02b363bb96bd56d4008141e8cf800bb46b7':
  No AudioFocus for notifications when media played remotely
 2013-02-13 11:41:12 -08:00
Jean-Michel Trivi
0888a06762 Merge "Fix AudioFocus for back-to-back notifications" 2013-02-13 19:40:33 +00:00
Jean-Michel Trivi
23bbe02b36 Merge "No AudioFocus for notifications when media played remotely" 2013-02-13 19:37:45 +00:00
Chris Craik
7c1a49f5f5 Revert "Merge remote-tracking branch 'goog/master-chromium' into 'goog/master'" DO NOT MERGE 
This reverts commit 6c0307dd0aefe9a08794b155fc03ee60ebd14f25, reversing
changes made to a2cd828b749c444d55c2c41c7dbb85088ff94b9f.

Conflicts:
	packages/SystemUI/res/values-sv/strings.xml

Change-Id: Ia178efe8b14751583d47b2826bfe3d3d5463dd2e
 2013-02-13 10:50:20 -08:00
Jean-Michel Trivi
562e65bb19 Remove obsolete imports 
Change-Id: I67d357a1b0bac89447b1e237f61dd18aea7b912b
 2013-02-13 17:52:30 +00:00