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

185346 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Andreas Gampe
3814163b6d am aae42eb2: Merge "Frameworks/base: Fix format string in Camera" 
* commit 'aae42eb26176482b09f0846e6acf7efa844a0d23':
  Frameworks/base: Fix format string in Camera
 2015-03-17 21:05:48 +00:00
Andreas Gampe
b95d079c80 am e4bdf3c1: am be549f9b: Merge "Frameworks/base: Fix precedence bug" 
* commit 'e4bdf3c1c9e7be06b68cc32f9a492d512bf87528':
  Frameworks/base: Fix precedence bug
 2015-03-17 20:56:02 +00:00
Andreas Gampe
aae42eb261 Merge "Frameworks/base: Fix format string in Camera" 2015-03-17 20:52:21 +00:00
Andreas Gampe
02ffb2aad9 Frameworks/base: Fix format string in Camera 
One cannot print a boolean with %d. That will result in an exception.

Bug: 19797138
Change-Id: I86c42ea834cebebaecff8463637cc9de14d1fc88
 2015-03-17 20:51:38 +00:00
Andreas Gampe
e4bdf3c1c9 am be549f9b: Merge "Frameworks/base: Fix precedence bug" 
* commit 'be549f9b8e01f884a2cc2d668457c6b1c12ff4cc':
  Frameworks/base: Fix precedence bug
 2015-03-17 20:49:18 +00:00
Filip Gruszczynski
6bc51303b5 am d0663e03: am 7bd2feda: Merge "Add animation to zeroing burn in protection." into lmp-mr1-modular-dev 
* commit 'd0663e03657704db8e9006a0a3aa919ed28c6d03':
  Add animation to zeroing burn in protection.
 2015-03-17 20:47:48 +00:00
Andreas Gampe
0fdfe72088 am c8484abb: am 0ae488e1: Merge "Frameworks/base: Use || instead of |" 
* commit 'c8484abbbde02171023f159491ca342186ae095c':
  Frameworks/base: Use || instead of |
 2015-03-17 20:47:41 +00:00
Andreas Gampe
d75a3b4d2c am 17eda7d0: am 4d907643: Merge "Frameworks/base: Fix trivial equals implementation" 
* commit '17eda7d0bed1d32a9b8f4a6a9d572aeabb43810a':
  Frameworks/base: Fix trivial equals implementation
 2015-03-17 20:47:33 +00:00
Filip Gruszczynski
d0663e0365 am 7bd2feda: Merge "Add animation to zeroing burn in protection." into lmp-mr1-modular-dev 
* commit '7bd2feda9e146c90c8720d8aa213ebcd9c30430c':
  Add animation to zeroing burn in protection.
 2015-03-17 20:44:58 +00:00
Andreas Gampe
c8484abbbd am 0ae488e1: Merge "Frameworks/base: Use || instead of |" 
* commit '0ae488e1cb64318906397a40d8be4866e81e4860':
  Frameworks/base: Use || instead of |
 2015-03-17 20:41:04 +00:00
Andreas Gampe
17eda7d0be am 4d907643: Merge "Frameworks/base: Fix trivial equals implementation" 
* commit '4d9076437c0270cd863493f505e734a3108e89ea':
  Frameworks/base: Fix trivial equals implementation
 2015-03-17 20:40:58 +00:00
Filip Gruszczynski
7bd2feda9e Merge "Add animation to zeroing burn in protection." into lmp-mr1-modular-dev 2015-03-17 20:38:35 +00:00
Andreas Gampe
be549f9b8e Merge "Frameworks/base: Fix precedence bug" 2015-03-17 20:36:21 +00:00
Andreas Gampe
869d26fda0 Frameworks/base: Fix precedence bug 
Explicit cast has higher precedence than shift.

Bug: 19797138
Change-Id: Ifcf569bf774fbf65ee50c078f736ad167bcc6b8c
 2015-03-17 20:31:22 +00:00
Andreas Gampe
0ae488e1cb Merge "Frameworks/base: Use || instead of |" 2015-03-17 20:28:53 +00:00
Andreas Gampe
e1b9262084 Frameworks/base: Use || instead of | 
Nothing wrong with | in this case, but || is canonical.

Bug: 19797138
Change-Id: I5f145736a5470f7cde06efce9a217d86eda2135f
 2015-03-17 20:27:42 +00:00
Andreas Gampe
4d9076437c Merge "Frameworks/base: Fix trivial equals implementation" 2015-03-17 20:25:20 +00:00
Andreas Gampe
610b2c778c Frameworks/base: Fix trivial equals implementation 
The comparator's equal implementation doesn't satisfy the constraints
of an equals method, namely being reflexive. Use the standard Object
implementation instead.

Bug: 19797138
Change-Id: I74f888e99533e1945aab7ab10fe8ee3ded6388f4
 2015-03-17 20:24:45 +00:00
Wale Ogunwale
ee0f4b4d0b Merge "Recompute focus stack if cleared while starting an activity." 2015-03-17 20:22:37 +00:00
Wale Ogunwale
86920fe630 Recompute focus stack if cleared while starting an activity. 
When starting an activity with Intent.FLAG_ACTIVITY_CLEAR_TOP flag,
the activity is destoried which can also cause its task to be removed
from its current stack if the activity process record is null. We now
recompute the stack for the activity task when this occurs so we
don't NPE later on.

Bug: 19552874

Change-Id: I50f51ca6dc32d4642f78d59cae93b0774bc6cdb7
 2015-03-17 13:20:24 -07:00
Brian Carlstrom
6022edc538 am 88dde1db: am d8507e3a: am 83419118: am 97f3cd0a: Merge "Update vmSafeMode documentation" into lmp-mr1-dev 
* commit '88dde1db446c414bee7fb56e292be6b0ce6ac268':
  Update vmSafeMode documentation
 2015-03-17 19:51:28 +00:00
Brian Carlstrom
88dde1db44 am d8507e3a: am 83419118: am 97f3cd0a: Merge "Update vmSafeMode documentation" into lmp-mr1-dev 
* commit 'd8507e3aa4c8b05f753cd9541014c391891c1f75':
  Update vmSafeMode documentation
 2015-03-17 19:44:55 +00:00
Brian Carlstrom
d8507e3aa4 am 83419118: am 97f3cd0a: Merge "Update vmSafeMode documentation" into lmp-mr1-dev 
* commit '83419118e3c72311ef6b900457d1b03fd5c77883':
  Update vmSafeMode documentation
 2015-03-17 19:36:19 +00:00
Brian Carlstrom
83419118e3 am 97f3cd0a: Merge "Update vmSafeMode documentation" into lmp-mr1-dev 
* commit '97f3cd0a8280b2cf08069cc1e2d89d8bb227633f':
  Update vmSafeMode documentation
 2015-03-17 19:29:20 +00:00
John Spurlock
28651d5e58 Merge "QS: 'Cast screen' -> 'Cast'." 2015-03-17 19:24:26 +00:00
Brian Carlstrom
97f3cd0a82 Merge "Update vmSafeMode documentation" into lmp-mr1-dev 2015-03-17 19:22:46 +00:00
John Spurlock
d799f70187 Merge "Audio: Flag volume adjustments from hardware keys." 2015-03-17 19:19:01 +00:00
Clara Bayarri
4d3494000c Merge "Delete the ActionModeWrapper now that it is not needed anymore." 2015-03-17 19:12:27 +00:00
Ruben Brunk
db2b5f4472 Merge "camera2: Release surface in ImageReader#close and fix legacy cleanup" 2015-03-17 19:11:33 +00:00
Filip Gruszczynski
a483a1d85e am 81c47fc2: am 86318d76: Merge "Option for going home when going to sleep for devices without physical button." into lmp-mr1-modular-dev 
* commit '81c47fc23a0a15dddf37d96d28305e8b5e5ca2da':
  Option for going home when going to sleep for devices without physical button.
 2015-03-17 19:06:58 +00:00
Wale Ogunwale
0cb1034717 Merge "Convert some log points to in AMS to use ActivityManagerDebugConfig class." 2015-03-17 19:03:00 +00:00
Wale Ogunwale
3ab9a27e3d Convert some log points to in AMS to use ActivityManagerDebugConfig class. 
Change-Id: I02154b0e1c2c64af840848fd6def054342922efa
 2015-03-17 11:53:26 -07:00
Filip Gruszczynski
81c47fc23a am 86318d76: Merge "Option for going home when going to sleep for devices without physical button." into lmp-mr1-modular-dev 
* commit '86318d768a2c5043e1261e9daacf1497d1e4a732':
  Option for going home when going to sleep for devices without physical button.
 2015-03-17 18:35:17 +00:00
Filip Gruszczynski
17413eb575 Add animation to zeroing burn in protection. 
Also don't shift immediately after starting ambient mode, but wait until
the first update.

Bug: 19521822
Change-Id: Id0b267d0f30e4533195dcfadbed726db0866e4db
 2015-03-17 11:30:12 -07:00
Filip Gruszczynski
86318d768a Merge "Option for going home when going to sleep for devices without physical button." into lmp-mr1-modular-dev 2015-03-17 18:29:30 +00:00
John Spurlock
83957a3f7d QS: 'Cast screen' -> 'Cast'. 
Bug: 19773357
Change-Id: I967c972986af4eb97374d7cde1d3b19fb28986ff
 2015-03-17 14:23:03 -04:00
John Spurlock
b94f2d6cad Audio: Flag volume adjustments from hardware keys. 
Bug: 19793279
Change-Id: If20d70c13c9e7d1f8a6b31e0069564073d30e2bc
 2015-03-17 14:15:02 -04:00
Jean-Michel Trivi
422cb3c6b5 Merge "Notify newly registered audio focus listener of current focus owner" 2015-03-17 18:05:04 +00:00
James Cook
4bd79b7556 Recents: Tapping on background returns to launcher 
Conceptually the area outside the recents task stack looks like a
"desktop". Make a non-scroll tap outside the task stack close
recents and return to the launcher.

Bug: 19271451
Change-Id: I9e639d6b5c6127bc37e1003152ef7a6fcbc2c2f3
 2015-03-17 10:59:44 -07:00
Ruben Brunk
443ab2c7db camera2: Release surface in ImageReader#close and fix legacy cleanup 
Bug: 19694090
Change-Id: I344ad707dbd414db023e4770769b5237bd3bbb4e
 2015-03-17 17:49:29 +00:00
Jeff Tinker
5f1be4be08 Merge "Deprecate redundant event, should handle via NotProvisionedException" 2015-03-17 17:49:11 +00:00
Tobias Sargeant
9ad4c44308 Merge "Add visual state callbacks to the WebView." 2015-03-17 17:07:11 +00:00
Ricky Wai
323b30e849 Add Email.ENTERPRISE_CONTENT_LOOKUP_URI 
Bug: 19550046
Change-Id: I56d8e5b3817a98e00d1f73555e10ac6b780e511e
 2015-03-17 17:02:01 +00:00
Wale Ogunwale
fd5767fa37 Merge "Remove duplicate move of home stack that can cause animation jank." 2015-03-17 16:53:34 +00:00
Dan Sandler
06433bd9f3 Avoid crashing on corrupted notifications. 
If a notification content view has an @id/icon or
@id/right_icon, we need to make sure those ImageViews
actually have a drawable inside.

Bug: 19487078
Change-Id: I4ef6c4a10926823aa8680628097ed150d9e717d4
 2015-03-17 16:34:34 +00:00
Clara Bayarri
15f78bbd6f Merge "Floating toolbars: Add content rect related methods to API" 2015-03-17 15:43:51 +00:00
Tobias Sargeant
a8352f4031 Add visual state callbacks to the WebView. 
Registering a visual state callback allows the caller to be notified
after the commit, activation and swap of the current (or future) state
of the DOM tree has occurred. At the point at which the callback is
called, the caller can be sure that any DOM updates made prior to
the registration are ready to be drawn in the next WebView#onDraw.

We also provide a convenience callback related to the visual state:

* WebViewClient.onPageCommitVisible; called at the earliest point at
  which the next draw will not render contents from the previously
  loaded page.

Bug: 6375170
Change-Id: I17e706b6e6ba4a8c28c835552687c9f7a4623024
 2015-03-17 15:19:07 +00:00
Yohei Yukawa
7fa1e7f20f Merge "Remove deprecated hidden public methods from InputMethodUtils." 2015-03-17 15:16:43 +00:00
Deepanshu Gupta
74bf54037c am 199a70f1: am 576801ff: am 842eee9f: am 1f9a26af: am 158c08bc: am ada85905: Fix AppCompat action bar theming. 
* commit '199a70f1820c38a9f1db1697ad91c4f5f07d00aa':
  Fix AppCompat action bar theming.
 2015-03-17 14:53:17 +00:00
Deepanshu Gupta
a0c3191b74 am 0f8c9d1d: am a5be9a7d: am 38467b5f: am 9a00f1c8: am 79f7fce7: am 2e4d9324: Fix NoActionBar themes rendering. 
* commit '0f8c9d1df28ed10b1c9013ddd315b306868e349d':
  Fix NoActionBar themes rendering.
 2015-03-17 14:53:10 +00:00