Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
178,916 Commits 3 Branches 0 Tags
4cb74d8d089447c67006e2f8d0ff4c554b5fb287
Commit Graph

48736 Commits

Author SHA1 Message Date
Narayan Kamath
972c24291e am be8053a2: am 5ae63a25: Merge "Fixed grammar in the comment that introduces the Debug.MemoryInfo class." 
automerge: 1539c26

* commit '1539c267c7f4678434361b3fac3f56abcbb19f56':
  Fixed grammar in the comment that introduces the Debug.MemoryInfo class.
 2014-12-29 12:21:25 +00: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
Esteban Talavera
ea84327fa4 Merge "Remove deprecated version of setProfileOwner that takes packageName" 2014-12-29 10:55:31 +00:00
Narayan Kamath
d44222135e am 7d019394: am 712a0205: Merge "Correct a mistyped word "MSG_SET_CLEINT" to "MSG_SET_CLIENT"" 
automerge: 7e6ae35

* commit '7e6ae353f022426d52df77acca4d0ded58b939b5':
  Correct a mistyped word "MSG_SET_CLEINT" to "MSG_SET_CLIENT"
 2014-12-29 10:15:50 +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
3ce2d52789 am f9f41951: am ee435b16: Merge "telephony: Update comments for preferred network mode" 
automerge: 38cba11

* commit '38cba11ba98831b0d6a005b7929d49f52259c564':
  telephony: Update comments for preferred network mode
 2014-12-26 19:01:39 +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
Esteban Talavera
8add57224f Remove deprecated version of setProfileOwner that takes packageName 
The ComponentName equivalent should be used instead.

Bug: 17654371
Change-Id: I7001e86ab1709b824944148a3c44af5243dacb83
 2014-12-24 09:38:13 +00:00
Kris Giesing
0dd962db3e Merge "Fix minor spelling and grammar errors in public JavaDoc" 2014-12-19 23:56:44 +00:00
Svet Ganov
be2fba6232 am f64d26fc: am e130d6c1: Merge "Remove a bad heuristic when determining click location for accessibility." into lmp-mr1-dev 
automerge: 19ecc78

* commit '19ecc7847faf0f6800c342eab806358d68b610c1':
  Remove a bad heuristic when determining click location for accessibility.
 2014-12-19 22:44:52 +00: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
f69fe23bff am 4edaa5e4: am a320b217: Merge "Bug 18784289: Fix issue with transition animation callback." into lmp-mr1-dev 
automerge: 5d40d0b

* commit '5d40d0b645e31063d08e304e4ba2880b267234b9':
  Bug 18784289: Fix issue with transition animation callback.
 2014-12-18 21:56:20 +00: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
Elliott Hughes
496894b0e1 am 5cd79d07: Merge "Move the remaining ZygoteInit native code over to Java." automerge: e37f3af 
automerge: e6f2f9d

* commit 'e6f2f9db42632f581d221ece90e1824e114f2f12':
  Move the remaining ZygoteInit native code over to Java.
 2014-12-18 21:00:53 +00:00
Elliott Hughes
e6f2f9db42 am 5cd79d07: Merge "Move the remaining ZygoteInit native code over to Java." 
automerge: e37f3af

* commit 'e37f3af76dc0c876ea7169b9153f79175d0c703d':
  Move the remaining ZygoteInit native code over to Java.
 2014-12-18 20:54:28 +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
Elliott Hughes
5cd79d0708 Merge "Move the remaining ZygoteInit native code over to Java." 2014-12-18 16:55:23 +00:00
Svetoslav
7643f7e399 Avoid non-static innner classes that are passed over via IPC. 
Change-Id: Ic14565c135b1f2ba50fa57462738b8dbc0e73301
 2014-12-18 02:04:46 +00:00
Winson Chung
2b9d4cdcfb am 9f48e316: am e2ed349c: Merge "Removing context ref from AppWidgetHost. (Bug 18769791)" into lmp-mr1-dev 
automerge: a4fe261

* commit 'a4fe261ec0d8ea9a820a30ea696498c6d5a2f2d4':
  Removing context ref from AppWidgetHost. (Bug 18769791)
 2014-12-18 00:27:29 +00: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
Alan Viverette
8db231af04 Merge "Allow theme attributes in <include> tag, fix <tag> context" 2014-12-18 00:11:14 +00:00
Alan Viverette
33e3cdab5b Allow theme attributes in <include> tag, fix <tag> context 
BUG: 17658979
Change-Id: I79a55ee53bff5ea6efb04997973a9aa810ff0950
 2014-12-17 15:43:29 -08:00
Raph Levien
faf2190334 am 3ac280c9: am 078ce5fc: Merge "Revert "Change Linkify leniency to VALID"" into lmp-mr1-dev 
automerge: d946753

* commit 'd946753aa4ac3ac9b16ff1627a19fb05f1608660':
  Revert "Change Linkify leniency to VALID"
 2014-12-17 23:21:16 +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
c946e92e6c am 486a9942: Merge "[ActivityManager] Use synchronized to protect object" automerge: e3b07b4 
automerge: a230a43

* commit 'a230a43204e3567d93a2d914123b21c14bdf495d':
  [ActivityManager] Use synchronized to protect object
 2014-12-17 21:55:05 +00: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
1eb5ca609a am 0b3718d6: Merge "Add global setting for ephemeral network timeout." into lmp-mr1-dev automerge: cc4f183 
automerge: 38e8763

* commit '38e8763df55ebedcf65178f8acced806113af4a5':
  Add global setting for ephemeral network timeout.
 2014-12-17 21:05:53 +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
Elliott Hughes
26b56e628b Move the remaining ZygoteInit native code over to Java. 
Bug: 18719692
Change-Id: I5f9834edecdbcc065a33a9921c740a53441636a4
 2014-12-17 12:28:29 -08:00
Elliott Hughes
dc4b6a892a am 8b3df1f9: am a1beb930: am e6d63b94: Merge "Rewrite selectReadable JNI in Java." 
* commit '8b3df1f971dec922aba4df766ae25dc16c660445':
  Rewrite selectReadable JNI in Java.
 2014-12-17 19:48:49 +00:00
Elliott Hughes
8b3df1f971 am a1beb930: am e6d63b94: Merge "Rewrite selectReadable JNI in Java." 
* commit 'a1beb930f59ae88f4386726cdf3a7e5986bd74e1':
  Rewrite selectReadable JNI in Java.
 2014-12-17 19:42:08 +00:00
Jorim Jaggi
92c9be1c12 am 3a70523e: am 4a5129c8: am c3059b44: Merge "Fix colored icons in doze mode" into lmp-mr1-dev 
* commit '3a70523eb63c4f61dcd6fcf52f1d9ebae7482027':
  Fix colored icons in doze mode
 2014-12-17 19:39:49 +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
Nicolas Prevot
743a68fc5f am 237637e2: am f2bd50b2: Merge "Fix the doc of addCrossProfileIntentFilter." into lmp-mr1-dev automerge: 47cbcd7 
* commit '237637e22ba9d98171f32d2302b9f532120729a9':
  Fix the doc of addCrossProfileIntentFilter.
 2014-12-17 19:07:50 +00:00