Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
96,902 Commits 3 Branches 0 Tags
3ce74b24d824b8630be69da73a940bb170fa02ff
Commit Graph

2306 Commits

Author SHA1 Message Date
Michael Jurka
223172045f am 4ed32c24: am d2de8033: am a8d63ec9: Merge "Disable adding keyguard widgets until setup is done" into jb-mr1.1-dev 
* commit '4ed32c248a70fb3ab4d36def8f73e5b88b7fc3d5':
  Disable adding keyguard widgets until setup is done
 2012-11-29 15:58:14 -08:00
Michael Jurka
4ed32c248a am d2de8033: am a8d63ec9: Merge "Disable adding keyguard widgets until setup is done" into jb-mr1.1-dev 
* commit 'd2de8033a304e951426e66e1f2c800402271c5e3':
  Disable adding keyguard widgets until setup is done
 2012-11-29 15:56:34 -08:00
Adam Powell
03919d4084 am 2a1f11e9: am 57c23a46: am 10479a29: Merge "Clean up behavior of type arguments for MediaRouter#getSelectedRoute" into jb-mr1.1-dev 
* commit '2a1f11e9750951d072d04155cfe3b7b7f7b96bb7':
  Clean up behavior of type arguments for MediaRouter#getSelectedRoute
 2012-11-29 14:33:00 -08:00
Adam Cohen
70a649ca51 am 20b9edd8: am 224daede: am 035352b4: Merge "Making sure keyguard and homescreen only display eligible widgets (issue 7550090)" into jb-mr1.1-dev 
* commit '20b9edd805777bf9e603d8008650c23b031dac79':
  Making sure keyguard and homescreen only display eligible widgets (issue 7550090)
 2012-11-29 14:32:41 -08:00
Dianne Hackborn
36893b16ce am 221d59f7: am afdd978c: am 68e0da7e: Merge "Quiet down a lot of logging." into jb-mr1.1-dev 
* commit '221d59f723584d316ea225bdaf1bc75cbfd7a794':
  Quiet down a lot of logging.
 2012-11-29 14:32:25 -08:00
Adam Powell
2a1f11e975 am 57c23a46: am 10479a29: Merge "Clean up behavior of type arguments for MediaRouter#getSelectedRoute" into jb-mr1.1-dev 
* commit '57c23a464a8428f089531a5d3cab20c81eb6ccee':
  Clean up behavior of type arguments for MediaRouter#getSelectedRoute
 2012-11-29 14:26:57 -08:00
Adam Cohen
20b9edd805 am 224daede: am 035352b4: Merge "Making sure keyguard and homescreen only display eligible widgets (issue 7550090)" into jb-mr1.1-dev 
* commit '224daede9e49f53ca5246aed66d152bfcc6d64e1':
  Making sure keyguard and homescreen only display eligible widgets (issue 7550090)
 2012-11-29 14:26:29 -08:00
Dianne Hackborn
221d59f723 am afdd978c: am 68e0da7e: Merge "Quiet down a lot of logging." into jb-mr1.1-dev 
* commit 'afdd978ccd8d45ac789873dd4cf0ab0dd3f46d20':
  Quiet down a lot of logging.
 2012-11-29 14:25:40 -08:00
Michael Jurka
fff5614cae Disable adding keyguard widgets until setup is done 
Bug: 7504154

Change-Id: I865f0139bb328e6b9b19493e0d8f9f086e2ebc38
 2012-11-29 13:15:39 -08:00
Adam Powell
10479a29cb Merge "Clean up behavior of type arguments for MediaRouter#getSelectedRoute" into jb-mr1.1-dev 2012-11-28 19:03:01 -08:00
Adam Cohen
035352b4d6 Merge "Making sure keyguard and homescreen only display eligible widgets (issue 7550090)" into jb-mr1.1-dev 2012-11-28 17:47:22 -08:00
Adam Cohen
d9e5af3851 Making sure keyguard and homescreen only display eligible widgets (issue 7550090) 
Change-Id: I25acb7bde2e8e5ac3185a009f5c7151b81f0ae19
 2012-11-28 16:36:56 -08:00
Adam Powell
1cf2ca8358 Clean up behavior of type arguments for MediaRouter#getSelectedRoute 
MediaRouter's policy so far has been around a single selected route,
but when route types are entirely orthogonal this should not be the
case. However we still don't want to get into a situation where we
have multiple, very different routes selected for different types at
the same time, we still want to have more of an element of
predictability.

Behavior of getSelectedRoute is now:

* If the selected route matches at least one type with the requested
  type flags, it is still considered selected for that request.

* If the caller specifically requested the selected user route and the
  currently selected route is not a user route, return null.

* If the requested type flags do not match any types with the selected
  route, return the default system route.

Note that this is "any" behavior instead of "all" - this matches
existing usage of the method. We may consider adding an "all" variant
later on.

Bug 7588042

Change-Id: I3a79d8153ca6b882fd3ef6b9b1de8f538873dec2
 2012-11-28 11:22:01 -08:00
Dianne Hackborn
40e9f2922c Quiet down a lot of logging. 
Also fix a little problem where the USER_STARTED broadcasts
were not being sent as ordered broadcasts(!).

Change-Id: I3aa3e0a9b3900967cdd2d115ee103371b0a50c41
 2012-11-27 19:12:23 -08:00
Dianne Hackborn
816a5d9c27 am 360acd03: am 78551bc7: am ba4ac518: Merge "Improve debugging for issue #7586414: AlarmManager wakelocks held" into jb-mr1.1-dev 
* commit '360acd03bfe0d597ee845d2392d715633a89e12b':
  Improve debugging for issue #7586414: AlarmManager wakelocks held
 2012-11-27 17:34:11 -08:00
Winson Chung
fb8ca912e8 am d0079891: am 9f6e8ddf: am 2b847c39: Merge "Removing unecessary additional lock metadata from QuickSettings user tile." into jb-mr1.1-dev 
* commit 'd0079891e3a8034f560eaf88d5be692b61ca4b9a':
  Removing unecessary additional lock metadata from QuickSettings user tile.
 2012-11-27 17:33:46 -08:00
Romain Guy
a8f6d5f072 Add support for face attribute to HTML string resources 
Bug #7480719

This change also adds the alias "color" for the attribute "fgcolor".
This change also unifies HTML colors parsing between the Html class
and StringBlock for consistency.

Change-Id: I696a6e080387901d88e9baf7cb989b892f14b9db
 2012-11-27 14:34:33 -08:00
Dianne Hackborn
360acd03bf am 78551bc7: am ba4ac518: Merge "Improve debugging for issue #7586414: AlarmManager wakelocks held" into jb-mr1.1-dev 
* commit '78551bc7d5541c86503b32db0e3e2564218bf179':
  Improve debugging for issue #7586414: AlarmManager wakelocks held
 2012-11-27 11:36:34 -08:00
Winson Chung
d0079891e3 am 9f6e8ddf: am 2b847c39: Merge "Removing unecessary additional lock metadata from QuickSettings user tile." into jb-mr1.1-dev 
* commit '9f6e8ddf5d48a695b26f1d9759696b56952177bd':
  Removing unecessary additional lock metadata from QuickSettings user tile.
 2012-11-27 11:36:13 -08:00
Dianne Hackborn
ba4ac51823 Merge "Improve debugging for issue #7586414: AlarmManager wakelocks held" into jb-mr1.1-dev 2012-11-27 11:06:35 -08:00
Dianne Hackborn
8103890a59 Improve debugging for issue #7586414: AlarmManager wakelocks held 
In alarm manager, print a summary of the top 10 alarms by time
being executed.  Keep track of execution time (and wake count) of
each type of alarm for each application so this can be printed in
the summary (and used to compute the top 10 alarms).  Rework how
the alarm summary stats are tracked so that we don't need to hold
on to the full Intent for each stat and can get the Intent information
at the time the alarm is sent rather than waiting for whatever Intent
comes back in the result.

Also in the battery stats: sort the kernel wake locks by time, add
a new section showing all partial wake locks across all applications
sorted by time.

Finally a new LocalLog class that is used by AlarmManager to log
important warning messages, so these can also be later found in
its dumpsys output.

Change-Id: Icc07810053e60fb623a49937e696819cb8352b06
 2012-11-27 11:05:42 -08:00
Winson Chung
f7614fc744 Removing unecessary additional lock metadata from QuickSettings user tile. 
Change-Id: I89ec94385eb3cdd46ad6942bf8989fb04d5c0370
 2012-11-26 14:44:03 -08:00
Adam Powell
732e589c10 am 6e8c1495: Merge "Re-read shortcut labels if the language has changed" 
* commit '6e8c1495f6a65124750155409ce326736744a42b':
  Re-read shortcut labels if the language has changed
 2012-11-20 15:05:13 -08:00
Mattias Falk
eb573418a7 Re-read shortcut labels if the language has changed 
The shortcut label isn't updated to the current language
if the phone's language has changed.

The problem was that the shortcut label is stored in a
static variable which is set once and kept throughout the
life time of the process.

Change-Id: I89c5875fbf28fb82e073166c472ca205d28674fb
 2012-11-19 09:31:19 +01:00
Michael Jurka
3366a5d54e am cf474b1a: am 7b0c8779: Merge "Delete appWidgetId when removing lockscreen widgets" into jb-mr1.1-dev 
* commit 'cf474b1a10a1349d0d6d6f7cbb5d48489bacfb09':
  Delete appWidgetId when removing lockscreen widgets
 2012-11-16 15:34:20 -08:00
Michael Jurka
75b5cfb4a4 Delete appWidgetId when removing lockscreen widgets 
Bug: 7550012

Change-Id: Ia9f5266256016eb91bfd6a2d5a7f910c42948f1e
 2012-11-16 15:22:06 -08:00
Jeff Sharkey
9634e97067 am bfea4f04: am f5377a72: Merge "Useful annotations for code documentation." into jb-mr1.1-dev 
* commit 'bfea4f04f226f1adf374412628d5945c380382a7':
  Useful annotations for code documentation.
 2012-11-15 11:56:19 -08:00
Jeff Sharkey
8b2c3a1460 Useful annotations for code documentation. 
Bug: 6537978
Change-Id: I806c3c09e3255f8789455f13bf37c1dde2a93f1f
 2012-11-12 12:42:17 -08:00
Dianne Hackborn
e0d454d2e8 am 72325cdb: am 63bc6c12: am a46a74fc: Merge "Remove extraneous logs." into jb-mr1-dev 
* commit '72325cdb65a321df7755ba214efd9be42ce828d5':
  Remove extraneous logs.
 2012-11-08 15:47:46 -08:00
Jim Miller
23b94022ba am 3a191b49: am f3add313: am 3c9297c3: Merge "Attempt to fix NegativeArraySizeException crash in keyguard" into jb-mr1-lockscreen-dev 
* commit '3a191b495c886a654f33fe717467a74975137e58':
  Attempt to fix NegativeArraySizeException crash in keyguard
 2012-11-08 15:46:07 -08:00
Svetoslav Ganov
09b6f4bbff am 8fa69381: am 0e538548: am cd1f3095: Merge "Slide unlock cannot get accessibility focus." into jb-mr1-lockscreen-dev 
* commit '8fa69381f212b85ec9156e0a95382cd3ff312444':
  Slide unlock cannot get accessibility focus.
 2012-11-08 15:45:48 -08:00
Adam Cohen
92f828f2a4 am 24b1764e: am 9477f8de: am 3e66286f: Merge "Fixing up glowpad scaling issues (issue 7494378)" into jb-mr1-lockscreen-dev 
* commit '24b1764e6c1996926ecba280f236ab05cec68b2c':
  Fixing up glowpad scaling issues (issue 7494378)
 2012-11-08 15:45:35 -08:00
Michael Jurka
9d15b4cb70 am 5dc8ce48: am c7037934: am cabcc590: Merge "Allowing rotation while adding lockscreen widgets" into jb-mr1-lockscreen-dev 
* commit '5dc8ce48d80c339070b626903a57846d4357c2f2':
  Allowing rotation while adding lockscreen widgets
 2012-11-08 15:33:16 -08:00
Adam Cohen
0c06c2b35c am 580657a3: am 96c3f7e5: am 1361758f: Merge "Giving glow pad the brains to scale itself dynamically (issue 7449554)" into jb-mr1-lockscreen-dev 
* commit '580657a34851c29f013586578241d2f4d6dc4f5d':
  Giving glow pad the brains to scale itself dynamically (issue 7449554)
 2012-11-08 15:33:13 -08:00
Michael Jurka
d31bc8ca2c am f1424272: am 1aad5be9: am 835579e8: Merge "Removing sticky widgets in lockscreen" into jb-mr1-lockscreen-dev 
* commit 'f142427244dde3e467b126df4840f496e09cef56':
  Removing sticky widgets in lockscreen
 2012-11-08 15:32:53 -08:00
Jim Miller
fcb8042316 am 8920c259: am 259e3121: am 51117262: Handle DevicePolicyManagement and safe mode when inflating widgets 
* commit '8920c259c8f5c63e4fae40f00afb185daa8008fb':
  Handle DevicePolicyManagement and safe mode when inflating widgets
 2012-11-08 15:32:40 -08:00
Dianne Hackborn
a46a74fcd6 Merge "Remove extraneous logs." into jb-mr1-dev 2012-11-08 13:16:10 -08:00
Dianne Hackborn
7ff30113de Remove extraneous logs. 
Change-Id: I4c47d36748de91bd6fddc419afbf59552bf63e9a
 2012-11-08 13:13:48 -08:00
Jim Miller
3c9297c3cb Merge "Attempt to fix NegativeArraySizeException crash in keyguard" into jb-mr1-lockscreen-dev 2012-11-07 18:09:14 -08:00
Svetoslav Ganov
7ce0c13c0e Slide unlock cannot get accessibility focus. 
1. There are two overlaid views, one is the GlowPadView and the
   other is the SlidingChallengeLayout. Since the GlowPadView is
   on top of the other view it has to consume the hover events or
   they will be dispatched to the view behind it which results
   the the GlowPadView not getting accessibility focus.

bug:7496770

Change-Id: Iae3b1777e490c56e33560a016fc04a92226bfb66
 2012-11-07 15:55:02 -08:00
Adam Cohen
3e66286f7c Merge "Fixing up glowpad scaling issues (issue 7494378)" into jb-mr1-lockscreen-dev 2012-11-07 14:44:12 -08:00
Adam Cohen
f988bdfbae Fixing up glowpad scaling issues (issue 7494378) 
Change-Id: I55c0f7a3774d42d4f5893b12bc0c08690268e351
 2012-11-07 14:43:33 -08:00
Kenny Root
58ed5d748c am 768d9e1a: Merge "Correct executable bit for source files" 
* commit '768d9e1a72ceee7d4a5f608776b87b62d6ce4a04':
  Correct executable bit for source files
 2012-11-07 11:52:12 -08:00
Kenny Root
3a084af2e9 Correct executable bit for source files 
Many media files and source code files were marked as executable in Git.
Remove those.

Also a shell script and python script were not marked as executable.

Change-Id: Ieb51bafb46c895a21d2e83696f5a901ba752b2c5
 2012-11-07 10:27:31 -08:00
Michael Jurka
cabcc59007 Merge "Allowing rotation while adding lockscreen widgets" into jb-mr1-lockscreen-dev 2012-11-07 01:16:11 -08:00
Michael Jurka
192d6d4ee2 Allowing rotation while adding lockscreen widgets 
Also cleaning up some unused code

Bug: 7468012
 2012-11-07 01:12:26 -08:00
Adam Cohen
e41dd0f195 Giving glow pad the brains to scale itself dynamically (issue 7449554) 
Change-Id: I44f31d354171c01b607871d6a9e1e9d06a49ffc8
 2012-11-06 23:06:44 -08:00
Jim Miller
a976860962 Attempt to fix NegativeArraySizeException crash in keyguard 
Fixes bug 7490924

Change-Id: I974c9b7a4fb3de536efe9d47cdd480190772a1be
 2012-11-06 22:17:25 -08:00
Michael Jurka
76017cad4f Removing sticky widgets in lockscreen 
Also adding mechanism to show a widget after
adding it

Change-Id: Ic4d49e6ef1343c38fa731b0ed2a327c55b678abf
 2012-11-06 18:56:41 -08:00
Jim Miller
51117262c8 Handle DevicePolicyManagement and safe mode when inflating widgets 
Bug 7459120
Bug 7444159
Bug 7444016

Change-Id: I7966ec510da8113ac571b5a4b9dc48dd291396e8
Conflicts:
	policy/src/com/android/internal/policy/impl/keyguard/KeyguardWidgetPager.java
 2012-11-06 17:04:26 -08:00