Merge "Change desk dock to use accelerometer by default."

    <integer name="config_carDockKeepsScreenOn">1</integer>

    <!-- Control whether being in the desk dock should enable accelerometer

         based screen orientation.  Note this should probably default to true

         like car dock, but we haven't had a chance to test it. -->

    <bool name="config_deskDockEnablesAccelerometer">false</bool>

         based screen orientation.  This defaults to true because it is

         common for desk docks to be sold in a variety of form factors

         with different orientations.  Since we cannot always tell these docks

         apart and the docks cannot report their true orientation on their own,

         we rely on gravity to determine the effective orientation. -->

    <bool name="config_deskDockEnablesAccelerometer">true</bool>

    <!-- Control whether being in the car dock should enable accelerometer based

         screen orientation.  This defaults to true because putting a device in