Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
196,078 Commits 3 Branches 0 Tags
183f8fa450ededc74dad717664e02ec804e8fe76
Commit Graph

4454 Commits

Author SHA1 Message Date
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
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
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
Paul McLean
afe55a5ce9 Turning off logging in ALSA device connection routines. 
bug: 21298614
Change-Id: Ia88393698072af8f7c101382f180192646bf713e
 2015-05-19 10:32:13 -07:00
Abodunrinwa Toki
378939ad14 Merge "Hide floating toolbar when selection is out of bounds." into mnc-dev 2015-05-19 17:00:07 +00:00
Abodunrinwa Toki
737c6f16a5 Merge "Fix wrong delay values for floatingtoolbar.hide/dismiss" into mnc-dev 2015-05-19 16:45:20 +00:00
Dianne Hackborn
8e3f29540d Merge "Update power manager to track uid state like netstats." into mnc-dev 2015-05-19 16:44:12 +00:00
Abodunrinwa Toki
4ce050bd83 Fix wrong delay values for floatingtoolbar.hide/dismiss 
Change-Id: Ie16b5f49babd0df0c70b188c9637e17c661e029c
 2015-05-19 17:36:55 +01:00
Xiyuan Xia
50d8d16ee4 am d02a287e: am 00d1fcf7: Merge "No input instead of disabling password entry" into mnc-dev 
* commit 'd02a287e431ce95eb2f14177ca528e3cf61ecbc6':
  No input instead of disabling password entry
 2015-05-19 16:30:59 +00:00
Xiyuan Xia
00d1fcf737 Merge "No input instead of disabling password entry" into mnc-dev 2015-05-19 16:06:06 +00:00
Xiyuan Xia
cead91974a No input instead of disabling password entry 
So that the keyboard does not come and go all the time.

Bug:21271425
Change-Id: I9ba2fa7034777885a6e53f135eca31fc89568e9d
 2015-05-19 09:04:43 -07:00
Abodunrinwa Toki
56546bd883 am 785c0a02: am 1f21d2a8: Merge "Hide floating toolbar when user interacts with screen." into mnc-dev 
* commit '785c0a02c0016fc6c1981bd3e509948d1c1cb227':
  Hide floating toolbar when user interacts with screen.
 2015-05-19 14:28:57 +00:00
Abodunrinwa Toki
a8151e4ef7 Hide floating toolbar when selection is out of bounds. 
Bug: 20212141
Change-Id: I7844308e339ba9a5027c629da8090053011e019d
 2015-05-19 15:21:10 +01:00
Abodunrinwa Toki
1f21d2a8b1 Merge "Hide floating toolbar when user interacts with screen." into mnc-dev 2015-05-19 14:06:46 +00:00
Abodunrinwa Toki
fd3a3a1163 Hide floating toolbar when user interacts with screen. 
- Adds an ActionMode.snooze(int) API.
- Clients call this to hide the floating toolbar on DOWN touch event.
- This is called repeatedly as a snooze timeout will re-show the
  toolbar.
- ActionMode.snooze(0) will "wake" the toolbar, reshowing it.
- Clients call this to re-show the toolbar on UP touch event.
- This CL also adds code to hide the toolbar when the "content rect"
  is changing.

Bug: 20148125
Change-Id: If5a9a15f72c73cad8ca01a4328a58570b3e29f66
 2015-05-19 14:25:39 +01:00
Jorim Jaggi
0f9d315217 am 06ac707d: am c6767354: Merge "Add setting to disable assist data (1/2)" into mnc-dev 
* commit '06ac707daf039a08367fe9127767434a3e58f758': (30 commits)
  Add setting to disable assist data (1/2)
  Make all icon fields & extras sent to listeners backward-compatible.
  Revert "Fix IMMS#mInputShown state inconsistency."
  Fix bug with jobservice context giving wrong value
  camera2: Fix work-profile eviction handling.
  Fix missing break in Icon class
  Fix post dial for remote connections
  Fix build: udpate parser factory method
  Don't keep LayoutlibCallback reference.
  Adjust lockscreen style to spec
  [RenderScript] Add dummy getMinorID to maintain compatible with old RS compat lib.
  Change the location of Brandmaster statement file.
  Revert "Update IME focus when the active view is losing the focus."
  Revert "Icon support comes to Notification."
  Fix icon-related crash.
  Don't display the "no Internet access" prompt on captive portals.
  Rewriting should fail when any paths are null.
  Ignore abandon after install relinquished.
  Fix build - Revert "Revert "Use default constructor to get anti-aliasing""
  Fix crash in setup wizard
  ...
 2015-05-19 05:02:29 +00:00
Jorim Jaggi
c6767354c5 Merge "Add setting to disable assist data (1/2)" into mnc-dev 2015-05-19 04:40:15 +00:00
Jorim Jaggi
9d91083034 Add setting to disable assist data (1/2) 
Bug: 20944446
Change-Id: I8050df3177b6d540829c3f0989a4e4b1381c87ec
 2015-05-18 21:39:05 -07:00
Adam Powell
ac6122c042 am 5418cde8: am f9a0d44d: Merge "Migrate uses of config_windowIsRound to Configuration.isScreenRound" into mnc-dev 
* commit '5418cde8aac5f239bfab2056767e42a5e2aeb270':
  Migrate uses of config_windowIsRound to Configuration.isScreenRound
 2015-05-19 01:24:18 +00:00
Dianne Hackborn
d23e0d6901 Update power manager to track uid state like netstats. 
To follow the correct semantics for when restricts due to
device idle can be applied, power manager need to know about
uid process states like net policy so that it can allow
wake locks from apps that are in the foreground.

Since this is being added to a second place, I reworked things
so that the activity manager now keeps track of per-uid process
states and allows apps to register to listen to those, rather
than having to track lower-level process states and transform
them into an overall uid state.  Both net policy and power
manager use this new facility.

Change-Id: I77359164c40d0f36fe1ef296dd9f9c3062431148
 2015-05-18 18:13:41 -07:00
Adam Powell
f9a0d44d2e Merge "Migrate uses of config_windowIsRound to Configuration.isScreenRound" into mnc-dev 2015-05-19 01:10:55 +00:00
Stefan Kuhne
332914448a am c1523029: am a2968ad5: Merge "Revert "Backup/restore recents task list"" into mnc-dev 
* commit 'c15230299f9c9130af74712be5f866a50196f286':
  Revert "Backup/restore recents task list"
 2015-05-19 00:05:15 +00:00