Projects information

Chunk

Conflicting content
* * The screen density of a device is based on the screen resolution. A screen with low density * has fewer available pixels per inch, where a screen with high density <<<<<<< HEAD * has more - sometimes significantly more - pixels per inch. The density of a ======= * has more — sometimes significantly more — pixels per inch. The density of a >>>>>>> f37cbe6bb624648053ab9756831450305197a9b8 * screen is important because, other things being equal, a UI element (such as a button) whose * height and width are defined in terms of screen pixels will appear larger on the lower density * screen and smaller on the higher density screen.

Conflicting content

 *
 * The screen density of a device is based on the screen resolution. A screen with low density
 * has fewer available pixels per inch, where a screen with high density
<<<<<<< HEAD
 * has more - sometimes significantly more - pixels per inch. The density of a
=======
 * has more — sometimes significantly more — pixels per inch. The density of a
>>>>>>> f37cbe6bb624648053ab9756831450305197a9b8
 * screen is important because, other things being equal, a UI element (such as a button) whose
 * height and width are defined in terms of screen pixels will appear larger on the lower density
 * screen and smaller on the higher density screen.

Solution content
* * The screen density of a device is based on the screen resolution. A screen with low density * has fewer available pixels per inch, where a screen with high density * has more — sometimes significantly more — pixels per inch. The density of a * screen is important because, other things being equal, a UI element (such as a button) whose * height and width are defined in terms of screen pixels will appear larger on the lower density * screen and smaller on the higher density screen.

Solution content

* *

The screen density of a device is based on the screen resolution. A screen with low density * has fewer available pixels per inch, where a screen with high density * has more — sometimes significantly more — pixels per inch. The density of a * screen is important because, other things being equal, a UI element (such as a button) whose * height and width are defined in terms of screen pixels will appear larger on the lower density * screen and smaller on the higher density screen.

File
WebView.java

Developer's decision
Version 2

Kind of conflict
Comment

Projects >> frameworks_base_disabled >>b60c941811cc15ab34fcc2f038aba56f862659b8