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

178592 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Chris Craik
a5f0918ec1 resolved conflicts for merge of fd461ede to master 
Change-Id: I36f263c7e6d96355dd8a2c3565581b9a983ae481
 2014-12-17 15:11:30 -08:00
Chris Craik
fd461edee0 am 93492d1a: am c748832f: Merge "Revert overdraw avoidance visualization change" into lmp-mr1-dev 
* commit '93492d1a478770783abab764855c8d47e0264f71':
  Revert overdraw avoidance visualization change
 2014-12-17 22:17:21 +00:00
Chris Craik
93492d1a47 am c748832f: Merge "Revert overdraw avoidance visualization change" into lmp-mr1-dev 
* commit 'c748832f759cd7a390a32890530e854b9711eb7c':
  Revert overdraw avoidance visualization change
 2014-12-17 22:11:19 +00:00
Chris Craik
c748832f75 Merge "Revert overdraw avoidance visualization change" into lmp-mr1-dev 2014-12-17 22:07:04 +00:00
Olawale Ogunwale
4ff7aaf1a2 am f62877d3: Merge "Prevent wrong system ui visibility callback after the user swipe" automerge: fd7819d 
automerge: 424924a

* commit '424924afc17c807a8059a55a522c976f64973c5d':
  Prevent wrong system ui visibility callback after the user swipe
 2014-12-17 21:56:28 +00: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
424924afc1 am f62877d3: Merge "Prevent wrong system ui visibility callback after the user swipe" 
automerge: fd7819d

* commit 'fd7819dbe0cf2cef9c03b2c4b04a92f0a2a36604':
  Prevent wrong system ui visibility callback after the user swipe
 2014-12-17 21:51:40 +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
fd7819dbe0 am f62877d3: Merge "Prevent wrong system ui visibility callback after the user swipe" 
* commit 'f62877d305d2da4876707137cefe0eaa1b2953c3':
  Prevent wrong system ui visibility callback after the user swipe
 2014-12-17 21:47:45 +00:00
Olawale Ogunwale
e3b07b4856 am 486a9942: Merge "[ActivityManager] Use synchronized to protect object" 
* commit '486a9942ebc6e3efe04004afd759a53ab96517ec':
  [ActivityManager] Use synchronized to protect object
 2014-12-17 21:47:38 +00:00
Olawale Ogunwale
f62877d305 Merge "Prevent wrong system ui visibility callback after the user swipe" 2014-12-17 21:43:27 +00:00
Olawale Ogunwale
486a9942eb Merge "[ActivityManager] Use synchronized to protect object" 2014-12-17 21:42:44 +00:00
Jinsuk Kim
e8826ba3dd am 08ca1694: am fadfe708: Merge "CEC: Pass port ID for set_audio_return_channel" into lmp-mr1-dev 
automerge: 23ac13c

* commit '23ac13c6b95c15d029426ff8424f7f6f23bf0220':
  CEC: Pass port ID for set_audio_return_channel
 2014-12-17 21:28:11 +00:00
Jinsuk Kim
23ac13c6b9 am 08ca1694: am fadfe708: Merge "CEC: Pass port ID for set_audio_return_channel" into lmp-mr1-dev 
* commit '08ca1694eb3013bd1f6c050e021588b8614e8764':
  CEC: Pass port ID for set_audio_return_channel
 2014-12-17 21:24:50 +00:00
Jinsuk Kim
08ca1694eb am fadfe708: Merge "CEC: Pass port ID for set_audio_return_channel" into lmp-mr1-dev 
* commit 'fadfe708e6f0c74890fe2b3292a91570f3049215':
  CEC: Pass port ID for set_audio_return_channel
 2014-12-17 21:20:08 +00:00
Jinsuk Kim
fadfe708e6 Merge "CEC: Pass port ID for set_audio_return_channel" into lmp-mr1-dev 2014-12-17 21:15:20 +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
Cheuksan Wang
f46a0b6f20 am 2045d5f3: am f1b64b4b: am e8ea1645: Merge "remove actions and calls for the old sms/mms api BUG: 18005911" into lmp-mr1-dev 
* commit '2045d5f3a23f8e462d05acf6d6cf6ea08e236a1e':
  remove actions and calls for the old sms/mms api BUG: 18005911
 2014-12-17 20:56:23 +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
Cheuksan Wang
2045d5f3a2 am f1b64b4b: am e8ea1645: Merge "remove actions and calls for the old sms/mms api BUG: 18005911" into lmp-mr1-dev 
* commit 'f1b64b4bb8300d2079696ff0d70cce16eda2be4e':
  remove actions and calls for the old sms/mms api BUG: 18005911
 2014-12-17 20:51:09 +00:00
Cheuksan Wang
f1b64b4bb8 am e8ea1645: Merge "remove actions and calls for the old sms/mms api BUG: 18005911" into lmp-mr1-dev 
* commit 'e8ea164596b3ab2309d7b99fa52aecd056e50e24':
  remove actions and calls for the old sms/mms api BUG: 18005911
 2014-12-17 20:45:03 +00:00
Cheuksan Wang
e8ea164596 Merge "remove actions and calls for the old sms/mms api BUG: 18005911" into lmp-mr1-dev 2014-12-17 20:38:09 +00:00
John Spurlock
01a8d29e27 am caba3603: am e7f301a0: Merge "Audio policy: Fix deprecated shouldVibrate api." into lmp-mr1-dev 
automerge: 09ab7d0

* commit '09ab7d0663210f7b87c830b4560474a05564c37a':
  Audio policy: Fix deprecated shouldVibrate api.
 2014-12-17 20:27:39 +00:00
John Spurlock
09ab7d0663 am caba3603: am e7f301a0: Merge "Audio policy: Fix deprecated shouldVibrate api." into lmp-mr1-dev 
* commit 'caba360367ea9900a48066f97f4b6e59877a9df6':
  Audio policy: Fix deprecated shouldVibrate api.
 2014-12-17 20:23:55 +00:00
John Spurlock
caba360367 am e7f301a0: Merge "Audio policy: Fix deprecated shouldVibrate api." into lmp-mr1-dev 
* commit 'e7f301a05344376f9065ef09e3b3ef360469bcb3':
  Audio policy: Fix deprecated shouldVibrate api.
 2014-12-17 20:18:03 +00:00
John Spurlock
e7f301a053 Merge "Audio policy: Fix deprecated shouldVibrate api." into lmp-mr1-dev 2014-12-17 20:13:02 +00:00
smain@google.com
1dd971866a am 2dbb8e13: am 2448afdb: am 48422283: Merge "make hidden text hidden with negative indent to avoid horizontal scroll bug: 18721145" into lmp-docs automerge: b834c72 automerge: 2a53e24 automerge: c6de288 
* commit '2dbb8e13de3a7ced961bbf84733f47e21a6a823d':
  make hidden text hidden with negative indent to avoid horizontal scroll bug: 18721145
 2014-12-17 20:12:23 +00:00
smain@google.com
2dbb8e13de am 2448afdb: am 48422283: Merge "make hidden text hidden with negative indent to avoid horizontal scroll bug: 18721145" into lmp-docs automerge: b834c72 automerge: 2a53e24 automerge: c6de288 
* commit '2448afdb729bfab4c9e2ac8af124870fd5929a08':
  make hidden text hidden with negative indent to avoid horizontal scroll bug: 18721145
 2014-12-17 20:06:02 +00:00
smain@google.com
2448afdb72 am 48422283: Merge "make hidden text hidden with negative indent to avoid horizontal scroll bug: 18721145" into lmp-docs automerge: b834c72 automerge: 2a53e24 
automerge: c6de288

* commit 'c6de288eabfcb6b3623fb6a6c3dba1071d7e0c78':
  make hidden text hidden with negative indent to avoid horizontal scroll bug: 18721145
 2014-12-17 20:00:48 +00:00
smain@google.com
c6de288eab am 48422283: Merge "make hidden text hidden with negative indent to avoid horizontal scroll bug: 18721145" into lmp-docs automerge: b834c72 
automerge: 2a53e24

* commit '2a53e24e10654b7f5667899c8a110ef6742c79e3':
  make hidden text hidden with negative indent to avoid horizontal scroll bug: 18721145
 2014-12-17 19:57:42 +00:00
Elliott Hughes
b577143836 Merge branch 'master' of https://googleplex-android.googlesource.com/_direct/platform/frameworks/base 2014-12-17 19:49:36 +00: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
66d9f44edc am a1beb930: am e6d63b94: Merge "Rewrite selectReadable JNI in Java." 
automerge: 8b3df1f

* commit '8b3df1f971dec922aba4df766ae25dc16c660445':
  Rewrite selectReadable JNI in Java.
 2014-12-17 19:47:40 +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
Chris Craik
ef8d6f272a Revert overdraw avoidance visualization change 
bug:18787324

Partial revert of 23d307c8d8.

Change-Id: Ic8b91b046707fc5b8fa53c35ea7b37bb19c3c943
 2014-12-17 11:21:02 -08: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
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
Alan Viverette
acf874112a Merge "Revert "Allow theme attributes in <include> tag, fix <tag> context"" 2014-12-17 18:56:50 +00:00
Alan Viverette
a9783bffcc Revert "Allow theme attributes in <include> tag, fix <tag> context" 
This reverts commit 866180198a.

Change-Id: Ia77131bf78b53a4360c7fc36d295994119c296cc
 2014-12-17 18:56:32 +00:00
Nicolas Prevot
f2bd50b2ec Merge "Fix the doc of addCrossProfileIntentFilter." into lmp-mr1-dev 2014-12-17 18:54:55 +00:00
Paul Jensen
b9d5551be2 am c266f62f: am eece3339: Merge "Show broken lock image when SSL errors are encountered in CaptivePortalLogin." into lmp-mr1-dev automerge: ee8feae 
* commit 'c266f62fd9f241b0d122bae7ad016ecd58ab40da':
  Show broken lock image when SSL errors are encountered in CaptivePortalLogin.
 2014-12-17 18:50:30 +00:00
Paul Jensen
c266f62fd9 am eece3339: Merge "Show broken lock image when SSL errors are encountered in CaptivePortalLogin." into lmp-mr1-dev automerge: ee8feae 
* commit 'eece33395561fff249afc96749cd69a21c28fbac':
  Show broken lock image when SSL errors are encountered in CaptivePortalLogin.
 2014-12-17 18:43:36 +00:00