Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
201,932 Commits 3 Branches 0 Tags
396da07e7992f8a5877162d40ba02dd0e0987fc4
Commit Graph

53901 Commits

Author SHA1 Message Date
Lorenzo Colitti
08ef66bbbc am 62ca62b3: am e288b3af: Merge changes I5c994de5,I6cb0dd84 into mnc-dev 
* commit '62ca62b32aae083c0f2d8b0bbec1fbd7d698f4ad':
  Add a test for public bugs 2111 and 2136.
  Always check off-link connectivity in NetworkDiagnostics.
 2015-07-28 01:33:03 +00:00
Lorenzo Colitti
62ca62b32a am e288b3af: Merge changes I5c994de5,I6cb0dd84 into mnc-dev 
* commit 'e288b3af14421731d8f477b97e8d77588f20498b':
  Add a test for public bugs 2111 and 2136.
  Always check off-link connectivity in NetworkDiagnostics.
 2015-07-28 01:20:16 +00:00
Lorenzo Colitti
e288b3af14 Merge changes I5c994de5,I6cb0dd84 into mnc-dev 
* changes:
  Add a test for public bugs 2111 and 2136.
  Always check off-link connectivity in NetworkDiagnostics.
 2015-07-28 01:03:44 +00:00
Mady Mellor
840b524efb am 9659297d: am beb6e668: Merge "Allow text selection handles to scroll horizontally" into mnc-dev 
* commit '9659297d9c26a8a2fdfa3c0e23b92e0fb72398ca':
  Allow text selection handles to scroll horizontally
 2015-07-28 00:31:14 +00:00
Filip Gruszczynski
5a8e31efce am 3bb0bb3a: am f63800dd: Merge "Remove unnecessary relayout call from traversals." into mnc-dev 
* commit '3bb0bb3afc46f88e4372f6912bd4c18547de5a78':
  Remove unnecessary relayout call from traversals.
 2015-07-28 00:30:59 +00:00
Mady Mellor
9659297d9c am beb6e668: Merge "Allow text selection handles to scroll horizontally" into mnc-dev 
* commit 'beb6e66817e084c8a1ac92ecaeb6f0c73d11cc49':
  Allow text selection handles to scroll horizontally
 2015-07-28 00:22:32 +00:00
Mady Mellor
beb6e66817 Merge "Allow text selection handles to scroll horizontally" into mnc-dev 2015-07-28 00:16:49 +00:00
Filip Gruszczynski
3bb0bb3afc am f63800dd: Merge "Remove unnecessary relayout call from traversals." into mnc-dev 
* commit 'f63800ddcc68944532f7842b6ebf80898147ed4d':
  Remove unnecessary relayout call from traversals.
 2015-07-28 00:16:34 +00:00
Filip Gruszczynski
f63800ddcc Merge "Remove unnecessary relayout call from traversals." into mnc-dev 2015-07-28 00:04:44 +00:00
Raph Levien
78c0a0448e am 9c9c0eb8: am e827c252: Merge "Allow soft hyphens in languages without patterns" into mnc-dev 
* commit '9c9c0eb88533dcaae45c128c076660e08e0746d2':
  Allow soft hyphens in languages without patterns
 2015-07-27 22:13:12 +00:00
Raph Levien
9c9c0eb885 am e827c252: Merge "Allow soft hyphens in languages without patterns" into mnc-dev 
* commit 'e827c2525a6b76c130d2b877fbcdcf62b0ce42eb':
  Allow soft hyphens in languages without patterns
 2015-07-27 21:56:43 +00:00
Raph Levien
e827c2525a Merge "Allow soft hyphens in languages without patterns" into mnc-dev 2015-07-27 21:50:16 +00:00
Raph Levien
a00896198d Allow soft hyphens in languages without patterns 
This patch sets up an "empty" hyphenator, which it uses by default
for locales in which there is no hyphenation pattern data. This has
the effect of enabling soft hyphens (U+00AD), which were otherwise
disabled, because the "no-hyphen" code path didn't consider them.

Bug: 19605972
Change-Id: I4dcb95cee8edc48495f7c38736f5abf26fa04935
 2015-07-27 13:06:24 -07:00
Jorim Jaggi
f040100cbd am 6a601960: am 9e49b5d6: Merge "Move PIN/Pattern appear animation to RenderThread (1/2)" into mnc-dev 
* commit '6a601960a3cbfbed1f0ac6df65791a3149eec92e':
  Move PIN/Pattern appear animation to RenderThread (1/2)
 2015-07-27 19:35:06 +00:00
Jorim Jaggi
6a601960a3 am 9e49b5d6: Merge "Move PIN/Pattern appear animation to RenderThread (1/2)" into mnc-dev 
* commit '9e49b5d679672ea4a64382f9a36663c73603961b':
  Move PIN/Pattern appear animation to RenderThread (1/2)
 2015-07-27 19:18:37 +00:00
Jorim Jaggi
9e49b5d679 Merge "Move PIN/Pattern appear animation to RenderThread (1/2)" into mnc-dev 2015-07-27 18:55:29 +00:00
Filip Gruszczynski
9b621a72e2 Remove unnecessary relayout call from traversals. 
All the necessary information (most importantly outsets) arrives in
addWindowToDisplay that is happening a few lines earlier.

Bug: 22073222
Change-Id: I483e98808877f32812c0e959cdfc14b4e0ca5e62
 2015-07-27 11:44:31 -07:00
Phil Burk
5821d548c6 am 21fdbd91: am fef1b289: Merge "MIDI: fix running status parser" into mnc-dev 
* commit '21fdbd91797dc026eacd1e057f94d1c2b1db6231':
  MIDI: fix running status parser
 2015-07-27 18:18:54 +00:00
Phil Burk
21fdbd9179 am fef1b289: Merge "MIDI: fix running status parser" into mnc-dev 
* commit 'fef1b28917df9a23b28ec5e5e7f83097b8574550':
  MIDI: fix running status parser
 2015-07-27 18:05:48 +00:00
Phil Burk
fef1b28917 Merge "MIDI: fix running status parser" into mnc-dev 2015-07-27 17:15:04 +00:00
Tim Volodine
15a4320e73 am 2f6d6742: am 91b31b53: Merge "Revert "Invoke geolocation permissions callback with denied state by default."" into mnc-dev 
* commit '2f6d674256cde89008c4457998b70d27721cdc64':
  Revert "Invoke geolocation permissions callback with denied state by default."
 2015-07-27 17:14:01 +00:00
Tim Volodine
2f6d674256 am 91b31b53: Merge "Revert "Invoke geolocation permissions callback with denied state by default."" into mnc-dev 
* commit '91b31b53127aafbf3ed34b98f405d6e750627050':
  Revert "Invoke geolocation permissions callback with denied state by default."
 2015-07-27 16:57:07 +00:00
Tim Volodine
91b31b5312 Merge "Revert "Invoke geolocation permissions callback with denied state by default."" into mnc-dev 2015-07-27 16:37:57 +00:00
Tim Volodine
4961105a7d Revert "Invoke geolocation permissions callback with denied state by default." 
This reverts commit 954d1333c4.

The revert is due to apps calling super.onGeolocationPermissionsShowPrompt see b/22685046

Bug: 22685046
Change-Id: I2a9f42b432a010828a0cafaee064480bb0f91cbe
(cherry picked from commit 0bb7d2e467)
 2015-07-27 16:20:29 +00:00
Chris Wren
eae9d6dae3 am 3dad6c66: am 45a0bb18: Merge "add ticker to enqueue message for easier debugging" into mnc-dev 
* commit '3dad6c661f76b69475bb38b950d74f5de3bb8a8f':
  add ticker to enqueue message for easier debugging
 2015-07-27 13:35:47 +00:00
Chris Wren
3dad6c661f am 45a0bb18: Merge "add ticker to enqueue message for easier debugging" into mnc-dev 
* commit '45a0bb18fec5b137a540e160cecd4ffd091098d9':
  add ticker to enqueue message for easier debugging
 2015-07-27 13:21:35 +00:00
Chris Wren
45a0bb18fe Merge "add ticker to enqueue message for easier debugging" into mnc-dev 2015-07-27 13:09:15 +00:00
Lorenzo Colitti
87cfc70b73 Always check off-link connectivity in NetworkDiagnostics. 
Currently, NetworkDiagnostics only checks off-link connectivity if
one of the DNS servers is off-link. Make it check off-link
connectivity in all cases by sending probes to Google Public DNS
if off-link DNS servers are not specified.

Bug: 22569331
Bug: 22641669
Bug: 22748900
Change-Id: I6cb0dd8491bc0c1a488631deca56722b9c1d2b3f
 2015-07-27 16:41:44 +09:00
Jeff Sharkey
4c864be103 am 35f4b6a2: am 8be305dd: Merge "Also check app-ops on path-permissions." into mnc-dev 
* commit '35f4b6a2460ef702bae604ca87b6c7a70f61c0f7':
  Also check app-ops on path-permissions.
 2015-07-25 15:55:04 +00:00
Jeff Sharkey
35f4b6a246 am 8be305dd: Merge "Also check app-ops on path-permissions." into mnc-dev 
* commit '8be305dd6582f154c5a5894034a35fc8ec225b71':
  Also check app-ops on path-permissions.
 2015-07-25 02:20:25 +00:00
Jeff Sharkey
8be305dd65 Merge "Also check app-ops on path-permissions." into mnc-dev 2015-07-25 02:05:56 +00:00
Jeff Sharkey
0e621c3921 Also check app-ops on path-permissions. 
Any place that we check permissions we also need to check any
app-ops associated with those permissions.  In the case of providers
with both <provider> and <path-permission> permissions, track and
report the strongest app-ops denial.

Bug: 22718722
Change-Id: I45e62de39b04d16d071558ad980b701667cfcb9a
 2015-07-24 15:16:11 -07:00
Phil Burk
98e94aead7 MIDI: fix running status parser 
Running status was being parsed incorrectly.
This could cause stuck notes or exceptions when sending running
status messages to a Bluetooth MIDI device.

Bug: 22689606
Change-Id: I9f7abce9758927be587eead9614617d5b0076353
Signed-off-by: Phil Burk <philburk@google.com>
 2015-07-24 14:11:01 -07:00
Robert Greenwalt
98961ea000 am 7385aca1: am f0bead28: Merge "DO NOT MERGE Enhance local log." into mnc-dev 
* commit '7385aca1a2bcb702cbf49b4cd3d1cf60972f9407':
  DO NOT MERGE Enhance local log.
 2015-07-24 20:22:48 +00:00
Mady Mellor
42390aab46 Allow text selection handles to scroll horizontally 
When selecting text and expanding the selection, the handles snap
to the end (or start) of words. The handles don't snap until the
user has moved halfway through the word.

In horizontally scrolling text views, where some of the text is
cut off, the user cannot be halfway through the word, this causes
the selection to get stuck unless the user scrolls the view and then
continues selecting.

This CL does two things:

1) Checks if the user is close to the edge of the view when the
view can scroll horizontally, and places the cursor at next offset
if available.

2) Moves the code to check if handles are crossing into own method
this should be done each time the cursor is placed and avoids the
need to duplicate the check throughout updatePosition code.

Bug: 22657879
Change-Id: Ic14cb0994cd202a897bf6532f3832bb93ed49bfb
 2015-07-24 13:08:42 -07:00
Robert Greenwalt
7385aca1a2 am f0bead28: Merge "DO NOT MERGE Enhance local log." into mnc-dev 
* commit 'f0bead280154fd9a5d2c07b1186e10fcfeed55fc':
  DO NOT MERGE Enhance local log.
 2015-07-24 20:06:31 +00:00
Robert Greenwalt
f0bead2801 Merge "DO NOT MERGE Enhance local log." into mnc-dev 2015-07-24 19:54:07 +00:00
Robert Greenwalt
dd6f844129 DO NOT MERGE Enhance local log. 
to be reverted with ag/733658
bug:22632129

Change-Id: Id3899ee8e987ccc469394dd4d0c41465c48dc37e
 2015-07-24 12:44:03 -07:00
Andrei Stingaceanu
31006d9243 am afad464c: am 45794910: Merge "Disallow dragging text in extracted mode" into mnc-dev 
* commit 'afad464c1b73540941e052e33ba6ab318426ff80':
  Disallow dragging text in extracted mode
 2015-07-24 15:00:11 +00:00
Andrei Stingaceanu
afad464c1b am 45794910: Merge "Disallow dragging text in extracted mode" into mnc-dev 
* commit '45794910031ce2a0e2df3d1694783da7e3c4352b':
  Disallow dragging text in extracted mode
 2015-07-24 14:47:48 +00:00
Andrei Stingaceanu
4579491003 Merge "Disallow dragging text in extracted mode" into mnc-dev 2015-07-24 14:35:48 +00:00
Jim Miller
56e1be700d am ecfbd588: am abd35bfc: Merge "Add FEATURE_FINGERPRINT to PackageManager\'s feature list" into mnc-dev 
* commit 'ecfbd58887114aa0626d6ec0f3f5e55e48ec4a49':
  Add FEATURE_FINGERPRINT to PackageManager's feature list
 2015-07-24 03:22:48 +00:00
Yohei Yukawa
646f9da9e2 am 4ff108f0: am 0526ee52: Merge "Don\'t rely on broadcast intent for waking up input method." into mnc-dev 
* commit '4ff108f0828f9c830aa93a3269c071522dae40ad':
  Don't rely on broadcast intent for waking up input method.
 2015-07-24 03:11:42 +00:00
Svetoslav Ganov
3fce45b661 am 54f1db79: am 607bc34f: Merge "Reset permissions and app links when clearing app preferences - framework" into mnc-dev 
* commit '54f1db793264192017c588b618c7d4cb311482c0':
  Reset permissions and app links when clearing app preferences - framework
 2015-07-24 03:10:58 +00:00
Svetoslav Ganov
dd12420e27 am f9044dcc: am 258e630a: Merge "Shut down UiAutomationConnection without a lock held" into mnc-dev 
* commit 'f9044dcc2752be620b8f6b0a6ead0e7fef9b2c10':
  Shut down UiAutomationConnection without a lock held
 2015-07-24 03:10:52 +00:00
Junda Liu
e77b00cef3 am e1ebca6c: am 859551f7: Merge "Remove volte_feature_disabled as carrier config handled it." into mnc-dev 
* commit 'e1ebca6c1ecbec72e89b9f621592de41cb184d7e':
  Remove volte_feature_disabled as carrier config handled it.
 2015-07-24 03:08:16 +00:00
Dianne Hackborn
86f88bc460 am b572b950: am 4a368659: Merge "Fix issue #22414729: Checkin start clock time is different from hsitory reset time" into mnc-dev 
* commit 'b572b950ad7b58463ad9193f79ceed7d2c2e4be5':
  Fix issue #22414729: Checkin start clock time is different from hsitory reset time
 2015-07-24 03:07:23 +00:00
Dianne Hackborn
47fefc5c31 am a45fc6e2: am 5507bb41: Merge "Fix issue #22653116: Google App crashing on NYT app" into mnc-dev 
* commit 'a45fc6e2ae855756ce71c9021c677cc06422de5a':
  Fix issue #22653116: Google App crashing on NYT app
 2015-07-24 03:07:11 +00:00
Svetoslav Ganov
059841e213 am 586116a5: am 41a62e11: Merge "Do not show normal permissions in sideloading UI" into mnc-dev 
* commit '586116a59ea09ec40e31a0972b629caac6348549':
  Do not show normal permissions in sideloading UI
 2015-07-24 03:07:03 +00:00
Adam Lesinski
898e3dda94 am 92638a0c: am 6625047a: Merge "BatteryStats: Use English locale for dump and checkin data" into mnc-dev 
* commit '92638a0ca9c7c2125c624e457e79088b9892d4e0':
  BatteryStats: Use English locale for dump and checkin data
 2015-07-24 03:06:22 +00:00