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

4613 Commits

Author SHA1 Message Date
Ruben Brunk
8b2cf64630 am cf4a301f: am 11df5b66: Merge "Track camera and flashlight usage in battery stats." into mnc-dev 
* commit 'cf4a301fa94f71e46cccbceeb8e8e9910eeb714a':
  Track camera and flashlight usage in battery stats.
 2015-06-02 14:24:01 +00:00
Adrian Roos
97e5851aec am c474645a: am c45d6c30: Merge "Translucent bars in landscape" into mnc-dev 
* commit 'c474645ab8555ce1226f5f72a8a9fafe18965bbf':
  Translucent bars in landscape
 2015-06-02 14:22:20 +00:00
Adam Powell
a974b09c67 am ecb6be7d: am dc49d5f8: Merge "Fix one-action choosers with EXTRA_INITIAL_INTENTS" into mnc-dev 
* commit 'ecb6be7d2889c2bb09179239817578fbb465bc99':
  Fix one-action choosers with EXTRA_INITIAL_INTENTS
 2015-06-02 14:21:46 +00:00
Ruben Brunk
11df5b66ef Merge "Track camera and flashlight usage in battery stats." into mnc-dev 2015-06-02 01:48:27 +00:00
Ruben Brunk
6d2c363fd5 Track camera and flashlight usage in battery stats. 
Bug: 15986092

Change-Id: Idf03981271721c44fd43327d5d90cf6f3fecfacb
 2015-06-01 16:54:23 -07:00
Adrian Roos
c45d6c30a5 Merge "Translucent bars in landscape" into mnc-dev 2015-06-01 23:25:35 +00:00
Abodunrinwa Toki
4af95ede5b am d9b74249: am bdd500ec: Merge "Fix FloatingToolbar look and animation for RTL." into mnc-dev 
* commit 'd9b7424923662e465fe2cf155cb7a9e6eef434c0':
  Fix FloatingToolbar look and animation for RTL.
 2015-06-01 23:22:06 +00:00
Adrian Roos
8a8ffd4e9b Translucent bars in landscape 
Bug: 18739556
Change-Id: Ib9602a9d1f09e6bd6c1306927990676120dff012
 2015-06-01 15:42:26 -07:00
Adam Powell
dc49d5f8ae Merge "Fix one-action choosers with EXTRA_INITIAL_INTENTS" into mnc-dev 2015-06-01 22:37:38 +00:00
Abodunrinwa Toki
bdd500ecd4 Merge "Fix FloatingToolbar look and animation for RTL." into mnc-dev 2015-06-01 21:31:20 +00:00
Jorim Jaggi
6c49882975 am c8d5901b: am 1e47a8e0: Merge "Cleanup Keyguard handling when turning off screen" into mnc-dev 
* commit 'c8d5901bc83814c0dab281fc108de643cdd7b09d':
  Cleanup Keyguard handling when turning off screen
 2015-06-01 19:29:19 +00:00
Filip Gruszczynski
f02ace9b9b am 49895c6e: am 29c840eb: am 11d50c9c: am 06756f35: Dismiss or cancel in SwipeDismissLayout on screen off. 
* commit '49895c6eadcca35bfe4369b53c8fc2e13a603520':
  Dismiss or cancel in SwipeDismissLayout on screen off.
 2015-06-01 19:29:14 +00:00
Jorim Jaggi
1e47a8e096 Merge "Cleanup Keyguard handling when turning off screen" into mnc-dev 2015-06-01 19:13:11 +00:00
Filip Gruszczynski
29c840ebb0 am 11d50c9c: am 06756f35: Dismiss or cancel in SwipeDismissLayout on screen off. 
* commit '11d50c9cc6f9990af5b9abf2058f6b7d4a5c8ae0':
  Dismiss or cancel in SwipeDismissLayout on screen off.
 2015-06-01 19:09:57 +00:00
Filip Gruszczynski
11d50c9cc6 am 06756f35: Dismiss or cancel in SwipeDismissLayout on screen off. 
* commit '06756f352d2046246bc147fa1f55d1dfbfcb37f5':
  Dismiss or cancel in SwipeDismissLayout on screen off.
 2015-06-01 18:57:21 +00:00
Filip Gruszczynski
183f8fa450 am 21605b33: am 99bcc3ee: Merge "Revert "Revert "resolved conflicts for merge of 47249f2a to mnc-dev""" into mnc-dev 
* commit '21605b3395372b1ee1dd645bb8d9e50c7e7e9460':
  Revert "Revert "resolved conflicts for merge of 47249f2a to mnc-dev""
 2015-06-01 18:49:47 +00:00
Filip Gruszczynski
06756f352d Dismiss or cancel in SwipeDismissLayout on screen off. 
Fix for situation where you palm the device while swiping away an
ambiactive activity (or rather, when you swipe slightly an ambiactive
activity during palm gesture). This would make the activity stay in half
dismissed state. Instead when the screen goes off, we either dismiss or
cancel the dismissal.

Change-Id: I82e699c00c25bc97dd95bc6473a17e5817f7667a
 2015-06-01 10:09:45 -07:00
Abodunrinwa Toki
6c5ac8e9e6 Fix FloatingToolbar look and animation for RTL. 
- Fix positioning issues which causes the toolbar to appear cut
since it extends beyond its containing window.
- Fix the open/close overflow animations to open to left (instead
  or right) for RTL.

Bug: 21455067
Change-Id: I799b74c67c96b03bca4b2c9fbb6e1165b651ac7f
 2015-06-01 17:35:34 +01:00
Jorim Jaggi
d175b6cfe0 Cleanup Keyguard handling when turning off screen 
Before, Keyguard was shown whenever PhoneWindowManager went to sleep.
However, this was too early on some devices, and too late on others.
Now, the callbacks are split up into two phases: startedGoingToSleep
and finishedGoingToSleep. In the first callback, we decide what to
do and play the lock sound if necessary. In the second callback, we
actually show the Keyguard, or reset its state necessary, so it
doesn't interfere with the screen off animation.

Bug: 17929748
Bug: 20782303
Change-Id: I4c4406595b07b7589d64f380cd3fa96bed3d20ee
 2015-05-30 00:41:07 +00:00
David Srbecky
9d698acfc4 am efe01cc6: am 3976a569: Merge "Replace --include-cfi with --generate-debug-info." 
* commit 'efe01cc62ee49f57c34726ec9c13ddaa9c1b1d8b':
  Replace --include-cfi with --generate-debug-info.
 2015-05-28 20:16:45 +00:00
David Srbecky
f39477b592 Replace --include-cfi with --generate-debug-info. 
This follows a change in dex2oat.

Change-Id: I46b61298ca00bee2e83080456b180d63efd95b8f
 2015-05-28 17:16:09 +01:00
Filip Gruszczynski
2217f61e51 Revert "Revert "resolved conflicts for merge of 47249f2a to mnc-dev"" 
This includes the fix for the broken dialog windows. The outsets will
only be calculated and applied if the window is full screen, since
they don't make much sense otherwise.

This reverts commit 4bb6b751fb.

Change-Id: I977a85a78c990c1840784dc0be0dddd5a6d84e6b
 2015-05-27 15:36:10 -07:00
Andres Morales
d8e796855f am 838cd2e4: am 5ccfe51d: Merge "[LockSettings] migrate password attempt throttling to hardware" into mnc-dev 
* commit '838cd2e467690492e89f5f53f60b3b4dc42c720b':
  [LockSettings] migrate password attempt throttling to hardware
 2015-05-27 20:40:48 +00:00
Andres Morales
5ccfe51d8b Merge "[LockSettings] migrate password attempt throttling to hardware" into mnc-dev 2015-05-27 18:37:32 +00:00
Alan Viverette
dc870638ff am 1ed681dd: am 165229ba: Merge "Add workaround for measuring stacked button bar layout" into mnc-dev 
* commit '1ed681dd2a3daa0cc109177703f2433ec354de58':
  Add workaround for measuring stacked button bar layout
 2015-05-27 18:01:09 +00:00
Alan Viverette
cffaf7e7e4 Add workaround for measuring stacked button bar layout 
Bug: 21300645
Change-Id: If9544da4995c3dce118dd9e36d42764662b3aecd
 2015-05-27 10:28:05 -07:00
Andres Morales
2397427cb1 [LockSettings] migrate password attempt throttling to hardware 
leverage root protected, cryptographically secured hardware
if available

Bug: 21118563
Change-Id: Ifa804c5a0728bfd14466eb2a84051bace6d33d57
 2015-05-26 19:48:51 -07:00
Adam Powell
5007735782 Fix one-action choosers with EXTRA_INITIAL_INTENTS 
Fix a bug where initial intents weren't respected as valid options
when there is only one choice available.

Bug 21304304

Change-Id: I304ee6acf20a367da6296132f85d913ad9fce127
 2015-05-26 18:13:47 -07:00
Paul Lawrence
bd678c2aaa am 090a0636: am 3452d2d0: Merge "Honor password visible setting in CryptKeeper" into mnc-dev 
* commit '090a06365f958908bef4c399f82a32c79600a4e8':
  Honor password visible setting in CryptKeeper
 2015-05-26 22:20:57 +00:00
Abodunrinwa Toki
dd98935f7b am 71eca132: am 4d2fc599: Merge "Hide the floatingtoolbar when content rect is invisible." into mnc-dev 
* commit '71eca132c7e8b97e435487b9761492d0d4bd7464':
  Hide the floatingtoolbar when content rect is invisible.
 2015-05-26 21:58:48 +00:00
Paul Lawrence
3452d2d0db Merge "Honor password visible setting in CryptKeeper" into mnc-dev 2015-05-26 21:52:58 +00:00
Abodunrinwa Toki
4d2fc599cf Merge "Hide the floatingtoolbar when content rect is invisible." into mnc-dev 2015-05-26 21:31:36 +00:00
Abodunrinwa Toki
6a0b277c7c Hide the floatingtoolbar when content rect is invisible. 
Hide the floating toolbar when the content rect is outside the
source view's visible area.

Bug: 21304845
Change-Id: I0dd10ad2cda7a8d9b05c81334cdfbd68c22dbc6a
 2015-05-26 21:35:18 +01:00
Abodunrinwa Toki
70e4baa39e am b301b64a: am da1b3981: Merge "Support icons in the FloatingToolbar" into mnc-dev 
* commit 'b301b64ae9e1db4e4bc39f4cfd97dbaeaafeec51':
  Support icons in the FloatingToolbar
 2015-05-26 18:52:01 +00:00
Abodunrinwa Toki
b21562c465 Support icons in the FloatingToolbar 
Bug: 20202541
Change-Id: Id4d27851739ba557c7f7348094d79f0c5f782e6b
 2015-05-26 12:55:17 +01:00
Dianne Hackborn
a597200a60 am 54d803c0: am dd5ee4b8: Merge "Revert "resolved conflicts for merge of 47249f2a to mnc-dev"" into mnc-dev 
* commit '54d803c0274137998c7dbb9d7b8af58de13be5b6':
  Revert "resolved conflicts for merge of 47249f2a to mnc-dev"
 2015-05-23 00:58:27 +00:00
Dianne Hackborn
4bb6b751fb Revert "resolved conflicts for merge of 47249f2a to mnc-dev" 
This reverts commit c7becb7ee7, reversing
changes made to 8562b08f04.
 2015-05-22 16:34:44 -07:00
Wojciech Staszkiewicz
4f11754f72 Pass charset to XmlPullParser.setInput instead of null 
Passing null to XmlPullParser.setInput forces it to do additional
work, which can be easily avoided if we know the charset beforehand.

bug: b/20849543

(cherry picked from commit 9e9e2e73c6)

Change-Id: Iaff97be9df2d0f99d7af8f19f65934439c9658e2
 2015-05-22 10:26:31 +01:00
Filip Gruszczynski
76173cc89f am b0edb78e: am 91e5b0f5: Merge "resolved conflicts for merge of 47249f2a to mnc-dev" into mnc-dev 
* commit 'b0edb78e5cfd793ff7848b14962f1cf7ca509eff':
  Support for devices with a chin.
 2015-05-22 00:23:41 +00:00
Filip Gruszczynski
c7becb7ee7 resolved conflicts for merge of 47249f2a to mnc-dev 
This is a merge of chin support.

Change-Id: I436b751b3c4aaa6b46cfcdb475e02eedfa5a5635
 2015-05-20 20:15:29 -07:00
Filip Gruszczynski
47249f2a9e am cb89ac84: Merge "Support for devices with a chin." into cw-d-mr1-dev 
* commit 'cb89ac84c621e047d81873428325dfd747b90a6b':
  Support for devices with a chin.
 2015-05-20 22:54:14 +00:00
Filip Gruszczynski
3e11bf33a6 Support for devices with a chin. 
Information about the chin is now part of the config.xml instead of the
theme. It is retrieved by WindowManagerService and passed to the clients
as insets. Clients can adjust their behavior in a way that makes it
invisible to the user, that part of the surface doesn't actually exist.

Bug: 19908853

Change-Id: Iedf57bf3c848201b854f91ffeb3b59187d375c1f
 2015-05-20 14:20:30 -07:00
Jorim Jaggi
529df4ffc8 am 112f328f: am 52a66ae4: Merge "Follow up for I8050df3177b6d540829c3f0989a4e4b1381c87ec (1/2)" into mnc-dev 
* commit '112f328f2d6f5ca1ace4bdfbac3dd388018b48da':
  Follow up for I8050df3177b6d540829c3f0989a4e4b1381c87ec (1/2)
 2015-05-20 19:20:14 +00:00
Jorim Jaggi
52a66ae41c Merge "Follow up for I8050df3177b6d540829c3f0989a4e4b1381c87ec (1/2)" into mnc-dev 2015-05-20 19:01:53 +00:00
Paul McLean
6548c73d65 am 4084a917: am 6f421764: Merge "Turning off logging in ALSA device connection routines." into mnc-dev 
* commit '4084a91725889a9364fda6d254ad31166bfe10c3':
  Turning off logging in ALSA device connection routines.
 2015-05-19 22:50:53 +00:00
Abodunrinwa Toki
4792e36654 am 3ce44e86: am 378939ad: Merge "Hide floating toolbar when selection is out of bounds." into mnc-dev 
* commit '3ce44e867e79ea195825d85599c1db79fb11a8a5':
  Hide floating toolbar when selection is out of bounds.
 2015-05-19 22:49:23 +00:00
Abodunrinwa Toki
ac4bf450c3 am c9a08d24: am 737c6f16: Merge "Fix wrong delay values for floatingtoolbar.hide/dismiss" into mnc-dev 
* commit 'c9a08d24042922e7d6212301cc2e5068a92a4f97':
  Fix wrong delay values for floatingtoolbar.hide/dismiss
 2015-05-19 22:49:09 +00:00
Dianne Hackborn
a7c407d7d4 am 1e338c0f: am 8e3f2954: Merge "Update power manager to track uid state like netstats." into mnc-dev 
* commit '1e338c0f3ba6366bec3ec4bf9034cb2135f16a7d':
  Update power manager to track uid state like netstats.
 2015-05-19 22:49:03 +00:00
Jorim Jaggi
10449c1d15 Follow up for I8050df3177b6d540829c3f0989a4e4b1381c87ec (1/2) 
Change-Id: I071282032b4c4d6e19b5093a25cc541b0e83ebb4
 2015-05-19 14:01:07 -07:00
Paul McLean
6f421764fe Merge "Turning off logging in ALSA device connection routines." into mnc-dev 2015-05-19 18:21:38 +00:00