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

159647 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jae Seo
89d8fb555a am 7edaf55a: Merge "TIF: fix setSurface() logic" into lmp-mr1-dev 
* commit '7edaf55aab6fb14a640904015e10e2f5c9299423':
  TIF: fix setSurface() logic
 2014-11-20 18:54:52 +00:00
Winson Chung
de04d5573a am 7c122b60: Merge "Use SystemClock time to keep track of last event times. (Bug 17995039)" into lmp-mr1-dev 
* commit '7c122b60b93c9ef4fa428bc142ea61bf4252b70b':
  Use SystemClock time to keep track of last event times. (Bug 17995039)
 2014-11-20 18:54:47 +00:00
Jae Seo
7edaf55aab Merge "TIF: fix setSurface() logic" into lmp-mr1-dev 2014-11-20 18:51:32 +00:00
Winson Chung
7c122b60b9 Merge "Use SystemClock time to keep track of last event times. (Bug 17995039)" into lmp-mr1-dev 2014-11-20 18:50:50 +00:00
Geoffrey Borggaard
c2af9be62c am bfab323c: Merge "Setting ADB_ENABLED may result in a SecurityException." into lmp-mr1-dev 
* commit 'bfab323cb59f2ff4a1ed64a22a5d0c2434e302c1':
  Setting ADB_ENABLED may result in a SecurityException.
 2014-11-20 18:50:38 +00:00
Geoffrey Borggaard
bfab323cb5 Merge "Setting ADB_ENABLED may result in a SecurityException." into lmp-mr1-dev 2014-11-20 18:44:49 +00:00
Dianne Hackborn
42d9bf6655 am a6d2789c: Merge "Add new empty app test entry points." into lmp-mr1-dev 
* commit 'a6d2789c954698f6dca5479b305689d22fc05d80':
  Add new empty app test entry points.
 2014-11-20 18:33:39 +00:00
Dianne Hackborn
42fec57f3a am d9968438: Merge "Fix issue with call backs from media process." into lmp-mr1-dev 
* commit 'd9968438bcf439e7a8c6058a95b85286a632dc1c':
  Fix issue with call backs from media process.
 2014-11-20 18:33:34 +00:00
Dianne Hackborn
a6d2789c95 Merge "Add new empty app test entry points." into lmp-mr1-dev 2014-11-20 18:29:28 +00:00
Dianne Hackborn
d9968438bc Merge "Fix issue with call backs from media process." into lmp-mr1-dev 2014-11-20 18:29:15 +00:00
Martijn Coenen
a603f083ff am 2bf6529b: Merge "Verify NFC permission immediately on API calls." into lmp-mr1-dev 
* commit '2bf6529bf8f81d1b9f0ff103f12d004937d0f59f':
  Verify NFC permission immediately on API calls.
 2014-11-20 18:05:04 +00:00
RoboErik
3ef3a9bff3 am ac4af18b: Merge "Handle volume events on master volume devices correctly" into lmp-mr1-dev 
* commit 'ac4af18bbb077a89696260e595fc130d9c172f79':
  Handle volume events on master volume devices correctly
 2014-11-20 18:04:59 +00:00
RoboErik
50b02d61dc am 5b881d43: Merge "Scale bitmaps in metadata sent to the system" into lmp-mr1-dev 
* commit '5b881d43ece280fdf46455a45393c3341e1feae7':
  Scale bitmaps in metadata sent to the system
 2014-11-20 18:04:54 +00:00
Martijn Coenen
2bf6529bf8 Merge "Verify NFC permission immediately on API calls." into lmp-mr1-dev 2014-11-20 17:59:24 +00:00
RoboErik
ac4af18bbb Merge "Handle volume events on master volume devices correctly" into lmp-mr1-dev 2014-11-20 17:59:14 +00:00
RoboErik
5b881d43ec Merge "Scale bitmaps in metadata sent to the system" into lmp-mr1-dev 2014-11-20 17:58:36 +00:00
Shishir Agrawal
0783a61d8a am a9b67771: Merge "Carrierprivileges: Addressing API council suggestions." into lmp-mr1-dev 
* commit 'a9b67771547a89ad08ffb5008adb89dde4009d9a':
  Carrierprivileges: Addressing API council suggestions.
 2014-11-20 17:50:25 +00:00
Chris Craik
57b641a2ed am 3b2ba44b: Merge "Improve logging around performance critical events" into lmp-mr1-dev 
* commit '3b2ba44be3699a4e133d7a09cb4ed182405d7ff9':
  Improve logging around performance critical events
 2014-11-20 17:50:20 +00:00
Shishir Agrawal
a9b6777154 Merge "Carrierprivileges: Addressing API council suggestions." into lmp-mr1-dev 2014-11-20 17:44:36 +00:00
Chris Craik
3b2ba44be3 Merge "Improve logging around performance critical events" into lmp-mr1-dev 2014-11-20 17:36:26 +00:00
Jorim Jaggi
6456513f6f am bf1960ce: Merge "Fade notifications when exiting dozing" into lmp-mr1-dev 
* commit 'bf1960ce9c353267490d65cc1b8beacc7dd85347':
  Fade notifications when exiting dozing
 2014-11-20 17:31:55 +00:00
Jorim Jaggi
bf1960ce9c Merge "Fade notifications when exiting dozing" into lmp-mr1-dev 2014-11-20 17:25:49 +00:00
Selim Cinek
c9a39c7dd1 am b18cbb9a: Merge "Fixed a bug where the notifications were not animating" into lmp-mr1-dev 
* commit 'b18cbb9a19d2213c0a5b1feecee5e9d4e88125c4':
  Fixed a bug where the notifications were not animating
 2014-11-20 17:06:08 +00:00
Selim Cinek
b18cbb9a19 Merge "Fixed a bug where the notifications were not animating" into lmp-mr1-dev 2014-11-20 17:01:24 +00:00
Geoffrey Borggaard
b66252fb42 Setting ADB_ENABLED may result in a SecurityException. 
If the restriction UserManager.DISALLOW_DEBUGGING_FEATURES is enforced,
then any attempt to set ADB_ENABLED will result in a SecurityException.
This can result in the device not being able to boot.
Bug: 18433477

Change-Id: I21e4b406ad0fa89b7d4b678eac1baf212a3c7acd
(cherry picked from commit ba45b96a378623e3392da65e81e67dabdf4f0678)
 2014-11-20 15:39:23 +00:00
George Mount
bf50b88ed7 am 41975454: Merge "Reset the transitionAlpha after the transition completes." into lmp-mr1-dev 
* commit '419754545ea0768a7fa715daddedef75b7b31bfa':
  Reset the transitionAlpha after the transition completes.
 2014-11-20 15:33:13 +00:00
George Mount
419754545e Merge "Reset the transitionAlpha after the transition completes." into lmp-mr1-dev 2014-11-20 15:29:26 +00:00
George Mount
b8835791e2 am 485ac778: Merge "Slide supports Gravity.START and Gravity.END." into lmp-mr1-dev 
* commit '485ac7782ed7605507bf2186246f59c537f8b578':
  Slide supports Gravity.START and Gravity.END.
 2014-11-20 15:27:38 +00:00
George Mount
485ac7782e Merge "Slide supports Gravity.START and Gravity.END." into lmp-mr1-dev 2014-11-20 15:23:55 +00:00
Selim Cinek
7b8157ef23 Fixed a bug where the notifications were not animating 
Bug: 18463381
Change-Id: I1064535f120dbc334a10d70b7fef232adb08a45f
 2014-11-20 16:04:00 +01:00
Adrian Roos
71cf9e58a1 am cbd48c72: Merge "Honey I shrunk the navigation bar" into lmp-mr1-dev 
* commit 'cbd48c722a40aff8bc2855d735bd34159b5df8ba':
  Honey I shrunk the navigation bar
 2014-11-20 14:58:49 +00:00
Adrian Roos
cbd48c722a Merge "Honey I shrunk the navigation bar" into lmp-mr1-dev 2014-11-20 14:54:32 +00:00
Adrian Roos
306354f040 Honey I shrunk the navigation bar 
Bug: 18412658
Bug: 18463755
Change-Id: I3e379bf22f0d83a3c7c477908b0847fc18325f12
 2014-11-20 14:31:02 +00:00
John Spurlock
ae08003115 am ef86a828: Merge "QS: Inversion tile: Don\'t consider initial 0 setting trackable." into lmp-mr1-dev 
* commit 'ef86a828146d28755b7dc1e0f5a5a41d0a9fc56f':
  QS: Inversion tile: Don't consider initial 0 setting trackable.
 2014-11-20 13:24:03 +00:00
John Spurlock
ef86a82814 Merge "QS: Inversion tile: Don't consider initial 0 setting trackable." into lmp-mr1-dev 2014-11-20 13:20:08 +00:00
Wonsik Kim
b429c01558 am 59d36695: Merge "TIF: set audio gain properly" into lmp-mr1-dev 
* commit '59d3669512b4fdff262ec6fe2760c9ae967eca95':
  TIF: set audio gain properly
 2014-11-20 07:07:51 +00:00
Wonsik Kim
59d3669512 Merge "TIF: set audio gain properly" into lmp-mr1-dev 2014-11-20 07:04:25 +00:00
Wonsik Kim
102670f16a TIF: fix setSurface() logic 
Bug: 18457632
Change-Id: I8c25a355c71b5f820a1599fd365e5ae62a9a5eeb
 2014-11-20 15:09:13 +09:00
Tyler Gunn
ce5a8e861d am d4340f89: Merge "Change Connections to allow setting conferenceable with conferences." into lmp-mr1-dev 
* commit 'd4340f89f830e9caec3230cba01dfae79580d8aa':
  Change Connections to allow setting conferenceable with conferences.
 2014-11-20 03:44:02 +00:00
Tyler Gunn
d4340f89f8 Merge "Change Connections to allow setting conferenceable with conferences." into lmp-mr1-dev 2014-11-20 03:40:10 +00:00
John Spurlock
18764bf551 QS: Inversion tile: Don't consider initial 0 setting trackable. 
For usage tracking purposes, seeing a setting value of 1 is always
considered trackable.

However, only consider a setting value of 0 as trackable if we've
observed a change (from 1).  Avoids tracking a db update from null
to 0 (via settings cmd or a restore).

Bug: 18062541
Change-Id: Ic8413b1770040f9ef28041bbadb4e5fb62d1c014
 2014-11-19 21:07:04 -05:00
Wale Ogunwale
005080e5f8 am 70273e05: Merge "Stop activity onVisibleBehindCanceled()" into lmp-mr1-dev 
* commit '70273e05b26f671dcec9ff1aa4bafabb5e407895':
  Stop activity onVisibleBehindCanceled()
 2014-11-20 01:49:37 +00:00
Wale Ogunwale
70273e05b2 Merge "Stop activity onVisibleBehindCanceled()" into lmp-mr1-dev 2014-11-20 01:46:28 +00:00
RoboErik
b9c87fb403 Scale bitmaps in metadata sent to the system 
This scales down any MediaMetadata bitmaps that are sent to the system
through MediaSession.

bug:18114918
bug:18084448
Change-Id: Ib7b040cd8245108ad2dd56afe2499290d2b49f51
 2014-11-19 17:27:43 -08:00
Chris Craik
70850ea258 Improve logging around performance critical events 
bug:17702227

Add details useful to developers (such as layer size/View name), and
switch away from logging implementation names/details, since they
are generally not relevant to developers.

Change-Id: Iee605d182f241450f7e75a6d0c283d51fa1312f5
 2014-11-19 17:24:30 -08:00
Wonsik Kim
71dfa96f53 TIF: set audio gain properly 
Bug: 18392706
Change-Id: I56c21c156a54e7d6dcf787f6b3ab4b901843b922
 2014-11-20 09:54:36 +09:00
George Mount
6c211ff43e Reset the transitionAlpha after the transition completes. 
Bug 18423893

Change-Id: I2ea30c3b7c45eca70d1518e73f814b827f519fa0
 2014-11-19 16:39:16 -08:00
Wale Ogunwale
1f4c02bb18 Stop activity onVisibleBehindCanceled() 
Once an activity is no longer visible behind and has released
its background resources, it is added to the list of activities
that can be stopped, but not actually stopped until the next
major event (like another activity starting). We now schedule
the idle processing once the background resources have been
released so the activity can be stopped as soon as possible.

Bug: 18191707
Change-Id: I472eee949c1a78b4d944454463f03c90e7d2618b
 2014-11-19 16:25:51 -08:00
Pavel Zhamaitsiak
0208d3c823 am c7ffe5e2: Merge "TTY over IMS: Add messages about change of TTY mode in the repote device" into lmp-mr1-dev 
* commit 'c7ffe5e2febbdb5abc3da98c6299fde8a61aa106':
  TTY over IMS: Add messages about change of TTY mode in the repote device
 2014-11-20 00:07:55 +00:00
Chet Haase
a79d2e8664 am 85603a7f: Merge "Fix seeking and scaled duration behavior" into lmp-mr1-dev 
* commit '85603a7faf0a8067803ae6424bc590f6e2a17e07':
  Fix seeking and scaled duration behavior
 2014-11-20 00:07:50 +00:00