Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
172,180 Commits 3 Branches 0 Tags
bdc399299edf7f5f86c816dafe581e85e65dd2bd
Commit Graph

43484 Commits

Author SHA1 Message Date
Michael Wright
342e903000 am 95700457: am a33424a5: Merge "Add MEDIA_PROJECTION_SERVICE to the ServiceName list." into lmp-mr1-dev 
* commit '95700457139803af54a5e731816cedf1c924f3a6':
  Add MEDIA_PROJECTION_SERVICE to the ServiceName list.
 2014-12-30 19:51:20 +00:00
Michael Wright
9570045713 am a33424a5: Merge "Add MEDIA_PROJECTION_SERVICE to the ServiceName list." into lmp-mr1-dev 
* commit 'a33424a540ea725d4b513ee713931c66e62721a2':
  Add MEDIA_PROJECTION_SERVICE to the ServiceName list.
 2014-12-30 19:45:47 +00:00
Michael Wright
a33424a540 Merge "Add MEDIA_PROJECTION_SERVICE to the ServiceName list." into lmp-mr1-dev 2014-12-30 19:40:52 +00:00
Svetoslav
1261ee87a8 am 72da9ed8: am e5ea48a7: Fix a race in accessibility manager. 
* commit '72da9ed8867a3b3d6a9ae829b9a0ae526c16915c':
  Fix a race in accessibility manager.
 2014-12-29 18:30:47 +00:00
Svetoslav
72da9ed886 am e5ea48a7: Fix a race in accessibility manager. 
* commit 'e5ea48a7fe295a2815bab57f2e870901ce48b312':
  Fix a race in accessibility manager.
 2014-12-29 18:23:54 +00:00
Svetoslav
e5ea48a7fe Fix a race in accessibility manager. 
The accessibility manager has APIs for clients to observe changes
in accessibility, touch exploration, and high contrast states. The
notification of the listeners has to be done with no lock held but
in an attempt to do that the code was incorrectly iterating over
the copy on write collection.

bug:18840784

Change-Id: I6803ff1657fbf6b0cc7936671d5bbdebb5cbf6bb
 2014-12-29 09:40:46 -08:00
Narayan Kamath
1539c267c7 am be8053a2: am 5ae63a25: Merge "Fixed grammar in the comment that introduces the Debug.MemoryInfo class." 
* commit 'be8053a23c0f0b15697176f0cd5e322b30d474e1':
  Fixed grammar in the comment that introduces the Debug.MemoryInfo class.
 2014-12-29 12:20:16 +00:00
Narayan Kamath
5ae63a258b Merge "Fixed grammar in the comment that introduces the Debug.MemoryInfo class." 2014-12-29 12:08:58 +00:00
Narayan Kamath
7e6ae353f0 am 7d019394: am 712a0205: Merge "Correct a mistyped word "MSG_SET_CLEINT" to "MSG_SET_CLIENT"" 
* commit '7d019394f7ca2f047e9c3d2a98b5c23b223c6689':
  Correct a mistyped word "MSG_SET_CLEINT" to "MSG_SET_CLIENT"
 2014-12-29 10:12:55 +00:00
Narayan Kamath
712a02050e Merge "Correct a mistyped word "MSG_SET_CLEINT" to "MSG_SET_CLIENT"" 2014-12-29 10:02:28 +00:00
Elliott Hughes
38cba11ba9 am f9f41951: am ee435b16: Merge "telephony: Update comments for preferred network mode" 
* commit 'f9f41951701f5e47b454b7c3f4e7d4654a9c4a3e':
  telephony: Update comments for preferred network mode
 2014-12-26 18:59:22 +00:00
Elliott Hughes
ee435b16d8 Merge "telephony: Update comments for preferred network mode" 2014-12-26 18:48:57 +00:00
Sungmin Choi
e099ab18e6 telephony: Update comments for preferred network mode 
Change-Id: I4718674ff73116cc6bbec4540c3450ed14663c0d
 2014-12-25 07:39:37 +00:00
Michael Wright
446e019a06 Add MEDIA_PROJECTION_SERVICE to the ServiceName list. 
This prevents our lint tooling from complaining that we're passing
invalid values when trying to get the MediaProjectionManager.

Bug: 18830590
Change-Id: I34633248e895b0ac7f5083e18a7d2385ca6f8adb
 2014-12-23 17:01:49 -08:00
Svet Ganov
19ecc7847f am f64d26fc: am e130d6c1: Merge "Remove a bad heuristic when determining click location for accessibility." into lmp-mr1-dev 
* commit 'f64d26fce002019f390b4f9f37c8edf965c362c5':
  Remove a bad heuristic when determining click location for accessibility.
 2014-12-19 22:43:30 +00:00
Svet Ganov
f64d26fce0 am e130d6c1: Merge "Remove a bad heuristic when determining click location for accessibility." into lmp-mr1-dev 
* commit 'e130d6c14ae2d4a6f703ef452a7e5741d84936a0':
  Remove a bad heuristic when determining click location for accessibility.
 2014-12-19 22:36:56 +00:00
Svet Ganov
257ffbda60 Remove a bad heuristic when determining click location for accessibility. 
As a bride-gap solution to click on partially covered views in accessibility
mode we compute a point on the screen where to send a down/up event pair.
A heuristic we used was that if the action target is covered by a view that
that has a touch listener we consider the target obscured by the one with
the listener. However, this generates false positives, for example the target
is covered by a view that observers touches for scrolling but not clicking.

bug:18782023

Change-Id: I31ff34011d45667f1eddda47373ec00e4a23dbf6
 2014-12-19 11:59:21 -08:00
Winson Chung
5d40d0b645 am 4edaa5e4: am a320b217: Merge "Bug 18784289: Fix issue with transition animation callback." into lmp-mr1-dev 
* commit '4edaa5e4b65c9bac4ab9bdc26b4cdde217a9053a':
  Bug 18784289: Fix issue with transition animation callback.
 2014-12-18 21:53:36 +00:00
Winson Chung
4edaa5e4b6 am a320b217: Merge "Bug 18784289: Fix issue with transition animation callback." into lmp-mr1-dev 
* commit 'a320b2176c9e6a5b3f2c3fe6f80ca9b14e088e9a':
  Bug 18784289: Fix issue with transition animation callback.
 2014-12-18 20:25:55 +00:00
Winson Chung
a320b2176c Merge "Bug 18784289: Fix issue with transition animation callback." into lmp-mr1-dev 2014-12-18 19:30:40 +00:00
Winson Chung
e494c382c0 Bug 18784289: Fix issue with transition animation callback. 
This is a regression where we changed the source view for the transition
to dummy view, but since it was not yet attached, it could not get the
handler implicitly to post the onAnimationCompleted callback.  This CL
modifies these ActivityOption transitions to also take an explicit
handler to process the callback on.

Bug: 18784289

Change-Id: I73f745c33b9f8aed91f8d9cd975f37cf7e4128f1
 2014-12-18 11:27:18 -08:00
Winson Chung
a4fe261ec0 am 9f48e316: am e2ed349c: Merge "Removing context ref from AppWidgetHost. (Bug 18769791)" into lmp-mr1-dev 
* commit '9f48e3160f2768d3322670cbbcc606c9eef76bad':
  Removing context ref from AppWidgetHost. (Bug 18769791)
 2014-12-18 00:26:16 +00:00
Winson Chung
9f48e3160f am e2ed349c: Merge "Removing context ref from AppWidgetHost. (Bug 18769791)" into lmp-mr1-dev 
* commit 'e2ed349cfa838223160e83be7df144e2265cdce4':
  Removing context ref from AppWidgetHost. (Bug 18769791)
 2014-12-18 00:18:53 +00:00
Winson Chung
e2ed349cfa Merge "Removing context ref from AppWidgetHost. (Bug 18769791)" into lmp-mr1-dev 2014-12-18 00:15:42 +00:00
Raph Levien
d946753aa4 am 3ac280c9: am 078ce5fc: Merge "Revert "Change Linkify leniency to VALID"" into lmp-mr1-dev 
* commit '3ac280c93bdebe4ca698e9a2e3d6d2daf3598e7a':
  Revert "Change Linkify leniency to VALID"
 2014-12-17 23:19:25 +00:00
Raph Levien
3ac280c93b am 078ce5fc: Merge "Revert "Change Linkify leniency to VALID"" into lmp-mr1-dev 
* commit '078ce5fc820d4744f5b1af384e427cedb7e90643':
  Revert "Change Linkify leniency to VALID"
 2014-12-17 23:14:13 +00:00
Raph Levien
078ce5fc82 Merge "Revert "Change Linkify leniency to VALID"" into lmp-mr1-dev 2014-12-17 23:08:51 +00:00
Raph Levien
047e816fe2 Revert "Change Linkify leniency to VALID" 
This reverts commit 9dfe86d410.

That change moved the lenience from POSSIBLE to VALID, which eliminated
false positive links, especially 4 digit phone numbers, but caused
significant false negatives, leading to CTS test failures
(android.text.util.cts.LinkifyTest#testAddLinks7 in particular).

The true fix requires new functionality to validate phone numbers in
a mobile context. In the meantime, the best solution is to revert.

Bug: 18708556
 2014-12-17 14:31:39 -08:00
Olawale Ogunwale
a230a43204 am 486a9942: Merge "[ActivityManager] Use synchronized to protect object" 
automerge: e3b07b4

* commit 'e3b07b4856d55f7d96dcb25e3749c7cce1a1cd3d':
  [ActivityManager] Use synchronized to protect object
 2014-12-17 21:50:31 +00:00
Olawale Ogunwale
486a9942eb Merge "[ActivityManager] Use synchronized to protect object" 2014-12-17 21:42:44 +00:00
Jeff Davidson
38e8763df5 am 0b3718d6: Merge "Add global setting for ephemeral network timeout." into lmp-mr1-dev automerge: cc4f183 
* commit '0b3718d6b157bf15db9d709d50019f81f06195b9':
  Add global setting for ephemeral network timeout.
 2014-12-17 20:58:44 +00:00
Jeff Davidson
0b3718d6b1 Merge "Add global setting for ephemeral network timeout." into lmp-mr1-dev 
automerge: cc4f183

* commit 'cc4f18309a2a576b282a399a97a9d64d66713b89':
  Add global setting for ephemeral network timeout.
 2014-12-17 20:52:19 +00:00
Jeff Davidson
cc4f18309a Merge "Add global setting for ephemeral network timeout." into lmp-mr1-dev 2014-12-17 20:51:12 +00:00
Jorim Jaggi
3a70523eb6 am 4a5129c8: am c3059b44: Merge "Fix colored icons in doze mode" into lmp-mr1-dev 
* commit '4a5129c83b92e7ae198f4b9a3018c8cdcba5dd86':
  Fix colored icons in doze mode
 2014-12-17 19:10:43 +00:00
Winson Chung
7a96f3c917 Removing context ref from AppWidgetHost. (Bug 18769791) 
Change-Id: Ieec1314ece219c178c140e572b031c94e83b8a93
 2014-12-17 11:07:24 -08:00
Jorim Jaggi
4a5129c83b am c3059b44: Merge "Fix colored icons in doze mode" into lmp-mr1-dev 
* commit 'c3059b444fbd30b1344cd5ee3c7030d1e9e5c408':
  Fix colored icons in doze mode
 2014-12-17 19:04:42 +00:00
Nicolas Prevot
237637e22b am f2bd50b2: Merge "Fix the doc of addCrossProfileIntentFilter." into lmp-mr1-dev 
automerge: 47cbcd7

* commit '47cbcd7740739796aef113646861ff7e79439a9c':
  Fix the doc of addCrossProfileIntentFilter.
 2014-12-17 19:01:18 +00:00
Jorim Jaggi
c3059b444f Merge "Fix colored icons in doze mode" into lmp-mr1-dev 2014-12-17 18:59:40 +00:00
Nicolas Prevot
47cbcd7740 am f2bd50b2: Merge "Fix the doc of addCrossProfileIntentFilter." into lmp-mr1-dev 
* commit 'f2bd50b2ec0e5d7a25694170e0dc1363465fd24e':
  Fix the doc of addCrossProfileIntentFilter.
 2014-12-17 18:58:26 +00:00
Jorim Jaggi
92df1f2758 Fix colored icons in doze mode 
Also fixes the issue that small icons promoted to large icons were
not forced to be white, which lead to inconsistent treatment of the
icons.

Bug: 18537470

Change-Id: Ic35e082da12793f3f13c91740bfc345b336c3db4
 2014-12-17 19:57:45 +01:00
Nicolas Prevot
f2bd50b2ec Merge "Fix the doc of addCrossProfileIntentFilter." into lmp-mr1-dev 2014-12-17 18:54:55 +00:00
Nicolas Prevot
fc7b444462 Fix the doc of addCrossProfileIntentFilter. 
Mention that cross-profile-intent-filters only work for activity intents.

BUG:18776618

Change-Id: I209d1e38641b4ae84b682a2525e6ddae603a71f9
 2014-12-17 17:55:08 +00:00
Christoph Studer
f35284804b am 1464dd2f: am 0b22e395: Merge "Notification: Fix bigLargeIcon" into lmp-mr1-dev 
* commit '1464dd2f925f4b6179a7ede287f13431e6835aec':
  Notification: Fix bigLargeIcon
 2014-12-17 15:23:48 +00:00
Christoph Studer
1464dd2f92 am 0b22e395: Merge "Notification: Fix bigLargeIcon" into lmp-mr1-dev 
* commit '0b22e395d24cba14d4113fb326bfcb57c6aa5996':
  Notification: Fix bigLargeIcon
 2014-12-17 15:18:31 +00:00
Christoph Studer
0b22e395d2 Merge "Notification: Fix bigLargeIcon" into lmp-mr1-dev 2014-12-17 15:14:03 +00:00
Jeff Davidson
a20ca67d94 Add global setting for ephemeral network timeout. 
Bug: 18637384
Change-Id: I6bde3c9eef12caf2cc51c449abffc1c69f60c17f
 2014-12-16 13:30:06 -08:00
Christopher Tate
a8fe14a211 am 15626d3a: am b32a33ce: Merge "Turn debug flag off" 
* commit '15626d3a493b5eb4c1fecb73f8d4fc18547c4c13':
  Turn debug flag off
 2014-12-16 20:34:37 +00:00
Christoph Studer
2bd62b53b6 am 88fb463e: am 0bb83b07: Merge "Fix MediaStyle docs mentioning 2 max actions in compact view" into lmp-mr1-dev 
* commit '88fb463ea355303f03535a29ac5935bf69d8a50e':
  Fix MediaStyle docs mentioning 2 max actions in compact view
 2014-12-16 18:31:53 +00:00
Christoph Studer
88fb463ea3 am 0bb83b07: Merge "Fix MediaStyle docs mentioning 2 max actions in compact view" into lmp-mr1-dev 
* commit '0bb83b07d1602c1a99c938471edfc411a47dbffc':
  Fix MediaStyle docs mentioning 2 max actions in compact view
 2014-12-16 18:26:26 +00:00
Christoph Studer
0bb83b07d1 Merge "Fix MediaStyle docs mentioning 2 max actions in compact view" into lmp-mr1-dev 2014-12-16 18:16:42 +00:00