drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
180,600 Commits 1 Branch 0 Tags
Commit Graph

180600 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jorim Jaggi
b1b085a055 Remove dead code #12: Remove KeyButtonView.quiescentAlpha 
Change-Id: I5e22da13f61fda78d1ea2fec2e89252a82f98e21
 2015-01-21 17:25:27 +01:00
Kenny Guy
3458e180cf Merge "Only hide cross profile disclosure when showing resolver." into lmp-mr1-dev automerge: 06ab0ca 
automerge: 11c4cc1

* commit '11c4cc196de9dca3bfad711b1b9e4b779a72cc01':
  Only hide cross profile disclosure when showing resolver.
 2015-01-21 16:24:01 +00:00
Luan Nguyen
f082f8980e Merge "docs: Fix conditional in ambient mode check method (18832168). Fix issue with non existent variable (18832287). Fix issue with outdated instructions (18832293). Fix issue with misleading time tick (18832171)." into lmp-docs 2015-01-21 16:19:20 +00:00
Kenny Guy
11c4cc196d Merge "Only hide cross profile disclosure when showing resolver." into lmp-mr1-dev 
automerge: 06ab0ca

* commit '06ab0ca4812450ec297722957e18b34cbfa733b2':
  Only hide cross profile disclosure when showing resolver.
 2015-01-21 16:17:03 +00:00
Geoff Mendal
0b953a1267 Import translations. DO NOT MERGE 
Change-Id: Icfb7c61dc2e280254ec926c2b706ba2d7dd1273a
Auto-generated-cl: translation import
 2015-01-21 08:14:22 -08:00
Kenny Guy
06ab0ca481 Merge "Only hide cross profile disclosure when showing resolver." into lmp-mr1-dev 2015-01-21 16:13:24 +00:00
Geoff Mendal
f7495fc0db Import translations. DO NOT MERGE 
Change-Id: I5e52f16f3fc37f4f4a34f23de9390da819ca1ae9
Auto-generated-cl: translation import
 2015-01-21 08:07:21 -08:00
Luan Nguyen
46e804d2a7 docs: Fix conditional in ambient mode check method (18832168). 
Fix issue with non existent variable (18832287).
Fix issue with outdated instructions (18832293).
Fix issue with misleading time tick (18832171).

bug: 18832168
bug: 18832171
bug: 18832287
bug: 18832293
Change-Id: I4f071846589ba7edda500342ccd5fac6ecca3161
 2015-01-21 08:00:45 -08:00
Jorim Jaggi
b93024f1e8 Remove dead code #10: Clean up PhoneStatusBar 
- Remove carrier label
- Remove emergency calls only label
- Remove dead methods and fiels.

Change-Id: If242a8fa926d21d77fc54867f4244e7d82626fff
 2015-01-21 16:56:58 +01:00
Jorim Jaggi
2325f276cf Remove dead code #9: Remove ticker code in PhoneStatusBar 
Change-Id: I2236790435d89962d70c642fa1879d44981bc71b
 2015-01-21 16:56:33 +01:00
Geoff Mendal
318bc929a5 Merge "Import translations. DO NOT MERGE" 2015-01-21 15:37:00 +00:00
Geoff Mendal
5afaeb6183 Import translations. DO NOT MERGE 
Change-Id: I01111253b2616daa695fdc071b875033e3badceb
Auto-generated-cl: translation import
 2015-01-21 07:33:21 -08:00
Geoff Mendal
5eaa1f952f Merge "Import translations. DO NOT MERGE" 2015-01-21 15:31:49 +00:00
Geoff Mendal
ae0b0167bc Import translations. DO NOT MERGE 
Change-Id: I03276ec800985dbd5519945587620f52d6fed25a
Auto-generated-cl: translation import
 2015-01-21 07:30:19 -08:00
Geoff Mendal
703e20fea7 Merge "Import translations. DO NOT MERGE" 2015-01-21 15:21:26 +00:00
Geoff Mendal
3fb2f6594e Import translations. DO NOT MERGE 
Change-Id: I6f5eaee0cfc5d0fd3995c600fb5eaf0afa032d4d
Auto-generated-cl: translation import
 2015-01-21 07:19:12 -08:00
Geoff Mendal
2d71728028 Merge "Import translations. DO NOT MERGE" 2015-01-21 14:57:39 +00:00
Geoff Mendal
bba3fb904f Merge "Import translations. DO NOT MERGE" 2015-01-21 14:56:50 +00:00
Geoff Mendal
11faf11852 Merge "Import translations. DO NOT MERGE" 2015-01-21 14:55:23 +00:00
Geoff Mendal
c602099af4 Import translations. DO NOT MERGE 
Change-Id: I6272a8580b7a346ace41eadaabfda9de0fe81cb3
Auto-generated-cl: translation import
 2015-01-21 06:50:23 -08:00
Geoff Mendal
f66949ebd4 Import translations. DO NOT MERGE 
Change-Id: Ida34896ac8597930db790a14bc84cd19452f6902
Auto-generated-cl: translation import
 2015-01-21 06:45:08 -08:00
Geoff Mendal
dee11b8d17 Import translations. DO NOT MERGE 
Change-Id: I69ace6aac5ffcb881daa299279ad006a08f0f768
Auto-generated-cl: translation import
 2015-01-21 06:42:19 -08:00
Geoff Mendal
d18f9f5670 Merge "Import translations. DO NOT MERGE" 2015-01-21 14:36:44 +00:00
Geoff Mendal
596bf7a3e1 Import translations. DO NOT MERGE 
Change-Id: I3ed20770355daeb44c7ec26a0cd70d224dde7e9b
Auto-generated-cl: translation import
 2015-01-21 06:34:11 -08:00
Geoff Mendal
f4d6144fec Import translations. DO NOT MERGE automerge: af69fcd -s ours automerge: 45c5f9d -s ours 
automerge: 4196fc5  -s ours

* commit '4196fc56bcee78eba4a204d80a62d9ad0c77022f':
  Import translations. DO NOT MERGE
 2015-01-21 14:30:47 +00:00
Geoff Mendal
4196fc56bc Import translations. DO NOT MERGE automerge: af69fcd -s ours 
automerge: 45c5f9d  -s ours

* commit '45c5f9d195a4522fdf13915052fe509bbfd80688':
  Import translations. DO NOT MERGE
 2015-01-21 14:26:54 +00:00
Geoff Mendal
45c5f9d195 Import translations. DO NOT MERGE 
automerge: af69fcd  -s ours

* commit 'af69fcd0bd4878145214dc16adbf5ef614e7f3a4':
  Import translations. DO NOT MERGE
 2015-01-21 14:19:37 +00:00
Geoff Mendal
af69fcd0bd Import translations. DO NOT MERGE 
Change-Id: I3d03c8e758bc8ecfe8e8b789fcfeab386e7eec9a
Auto-generated-cl: translation import
 2015-01-21 08:15:11 -06:00
Narayan Kamath
e383132ac5 Merge "Choose the right executable for wrapped applications." automerge: aa87e89 automerge: 4af0265 
automerge: ebc57c7

* commit 'ebc57c7471f1ebe56cae091707887be582b0db06':
  Choose the right executable for wrapped applications.
 2015-01-21 14:13:27 +00:00
Narayan Kamath
ebc57c7471 Merge "Choose the right executable for wrapped applications." automerge: aa87e89 
automerge: 4af0265

* commit '4af0265a35bcd8a0a7513dd85fe371597e2038c5':
  Choose the right executable for wrapped applications.
 2015-01-21 14:09:33 +00:00
Narayan Kamath
4af0265a35 Merge "Choose the right executable for wrapped applications." 
automerge: aa87e89

* commit 'aa87e89e81b547cc28e09a5f71adb288ee18b32a':
  Choose the right executable for wrapped applications.
 2015-01-21 14:05:29 +00:00
Narayan Kamath
aa87e89e81 Merge "Choose the right executable for wrapped applications." 2015-01-21 14:01:57 +00:00
Narayan Kamath
1ed78fbf28 Add library definition for org.apache.http.legacy. 
bug: 18027885
Change-Id: I300ab2eb0f87e004ef20157bd23517865133665c
 2015-01-21 12:49:14 +00:00
louis_chang
2d094e9477 [ActivityManager] No home activity resumed and cause 
key dispatch ANR

Symptom:
In some scenario, there might have two home tasks
in the home stack. If the top home task was finishing
and expected to return to home stack, no activity
will resume.

Root Cause:
Unable to perform resumeHomeStackTask() because the
resumeTopActivityLocked() has been prevented to invoke
recursively.

Solution:
Just resume the next activity if already in home stack

Change-Id: I24ecbcac6cee4ddbd90cdd27c4f4915cffb9b354
 2015-01-21 19:01:52 +08:00
Jinsuk Kim
70523ec551 am f23829d6: Merge "CEC: Switch active input after routing control" into lmp-mr1-dev automerge: f8d2f32 
automerge: 748e813

* commit '748e813ed7f9042eba6e64fced78e28b7c16327a':
  CEC: Switch active input after routing control
 2015-01-21 02:36:59 +00:00
Jinsuk Kim
748e813ed7 am f23829d6: Merge "CEC: Switch active input after routing control" into lmp-mr1-dev 
automerge: f8d2f32

* commit 'f8d2f3284f9613bc20967e19213573804ea0ab83':
  CEC: Switch active input after routing control
 2015-01-21 02:33:08 +00:00
Jinsuk Kim
f8d2f3284f am f23829d6: Merge "CEC: Switch active input after routing control" into lmp-mr1-dev 
* commit 'f23829d64ff6fdae6f8b1d2b0fbe3f2715b313d4':
  CEC: Switch active input after routing control
 2015-01-21 02:16:37 +00:00
Jinsuk Kim
f23829d64f Merge "CEC: Switch active input after routing control" into lmp-mr1-dev 2015-01-21 02:10:54 +00:00
Johnson Hsieh
24c33d32cc Merge "Expose CommandRequest completion status." 2015-01-21 01:39:19 +00:00
Johnson Hsieh
dd32946def Expose CommandRequest completion status. 
Expose CommandRequest completion status in client api onCommandResult().

Change-Id: Ib2066b7ca6d7b1ae968da7e7686e34107dc7dfa8
 2015-01-20 17:11:50 -08:00
Dianne Hackborn
51ff482f02 Merge "Fix issue #19020826: Including timing issues in ANR reason breaks clustering" into lmp-mr1-dev automerge: 66f8d9b automerge: 8781dbf 
automerge: 734f684

* commit '734f68439ed7e0fb6fbd521f961cebf31baf5b6d':
  Fix issue #19020826: Including timing issues in ANR reason breaks clustering
 2015-01-21 01:10:18 +00:00
Dianne Hackborn
734f68439e Merge "Fix issue #19020826: Including timing issues in ANR reason breaks clustering" into lmp-mr1-dev automerge: 66f8d9b 
automerge: 8781dbf

* commit '8781dbf3dfa79c39fc0410521dff04156fae876a':
  Fix issue #19020826: Including timing issues in ANR reason breaks clustering
 2015-01-21 00:43:50 +00:00
Jinsuk Kim
337ce19bef CEC: Switch active input after routing control 
Makes sure the previous HDMI input gets switched to upon receiving
<Inactive Source> from the current active source device.

Bug: 18986597
Change-Id: I7120e81d75b5fd4cafd4b483e9b232b96e50f597
 2015-01-21 09:38:33 +09:00
Dianne Hackborn
8781dbf3df Merge "Fix issue #19020826: Including timing issues in ANR reason breaks clustering" into lmp-mr1-dev 
automerge: 66f8d9b

* commit '66f8d9bb693d5e410ac6f6ba3029cf6c7dc2f104':
  Fix issue #19020826: Including timing issues in ANR reason breaks clustering
 2015-01-21 00:27:47 +00:00
Dianne Hackborn
66f8d9bb69 Merge "Fix issue #19020826: Including timing issues in ANR reason breaks clustering" into lmp-mr1-dev 2015-01-21 00:23:53 +00:00
Geoff Mendal
75ee6e5ce0 Merge branch \'lmp-mr1-dev-plus-aosp\' of https://googleplex-android.googlesource.com/_direct/platform/frameworks/base into lmp-mr1-dev-plus-aosp 
automerge: 6bf768b

* commit '6bf768bf13ad663d556d88db392b73d45034f280':
 2015-01-21 00:15:58 +00:00
Craig Mautner
a30dc1709e am f1eb1cdc: am d22c8d99: Merge "Revert "Remove debugging and skip InputMethod windows"" into lmp-mr1-dev 
automerge: b880c75

* commit 'b880c75eeb48002169627a4b33dbafad3f047421':
  Revert "Remove debugging and skip InputMethod windows"
 2015-01-21 00:13:53 +00:00
Craig Mautner
b7dae3b565 am 1388342c: am 088bf3a3: Merge "More debugging for bug 17721767" into lmp-mr1-dev 
automerge: 07d2f0c

* commit '07d2f0cff4d08bec4ff5ea22f9c42532f3c83e35':
  More debugging for bug 17721767
 2015-01-21 00:11:23 +00:00
Andrew Solovay
f92dbe0115 docs: WebView security notes for apps on pre-K devices 
Added paragraph describing security precautions for apps that use
WebView on devices running versions older than Android 4.4. See first
comment for doc stage location.

bug: 19075466
Change-Id: I69937d8dfc37ec1ba693f969500b9dc7404c4635
 2015-01-20 16:10:07 -08:00
Christopher Tate
b6d4b350a1 am 77c96dd8: Merge "Don\'t launch broadcast receiver processes during boot" into lmp-mr1-dev automerge: 8192670 
automerge: ebdec3e

* commit 'ebdec3e0921d1495ca712f4f1f7755d975297d14':
  Don't launch broadcast receiver processes during boot
 2015-01-21 00:09:39 +00:00