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

139082 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Chris Wren
1532feb580 am ec8763a9: Merge "Manage heads up state during notification update." into lmp-preview-dev 
* commit 'ec8763a994a9d08cb40f47fa82f35e75a032e5a5':
  Manage heads up state during notification update.
 2014-06-12 20:05:55 +00:00
Przemyslaw Szczepaniak
baa2c989c5 am 1217cd62: (-s ours) Merge "Hide new TTS API for the lmp-preview. DO NOT MERGE" into lmp-preview-dev 
* commit '1217cd62d373ce9f6dbe1985d4b26db0acda5254':
  Hide new TTS API for the lmp-preview. DO NOT MERGE
 2014-06-12 20:05:50 +00:00
Chris Wren
0fdab2fb43 Merge "Manage heads up state during notification update." into lmp-preview-dev 2014-06-11 15:57:38 +00:00
Chris Wren
d04f6cee5f Manage heads up state during notification update. 
Notifications can now get the heads up slot on updates.
FLAG_ONLY_ALERT_ONCE suppresses this behavior.

Bug: 15534198
Change-Id: Ie27b7c7d93c590d777670c538fb796a04252046f
 2014-06-11 23:53:30 -04:00
Winson Chung
91b7d2b4fb Merge "Stop sending broadcasts to RecentsActivity before boot has completed. (Bug 15109101)" into lmp-preview-dev 2014-06-11 21:23:31 +00:00
Winson Chung
8175a7c2e6 Stop sending broadcasts to RecentsActivity before boot has completed. (Bug 15109101) 
Change-Id: Ic04dc2ef73c75d63e107e7b50842dd618d3a173a
 2014-06-11 14:19:53 -07:00
Jorim Jaggi
a1adf0db4f Merge "resolved conflicts for merge of 6edef668 to master" 2014-06-11 15:57:38 +00:00
Jorim Jaggi
b41e0e37ec resolved conflicts for merge of 6edef668 to master 
Change-Id: Ia0c79581e9221341718799d2969f56c95a76a3de
 2014-06-12 22:02:32 +02:00
Selim Cinek
5da5e7a481 am 3ee7fb10: Merge "Introduced fading views for the camera interaction on the lockscreen." into lmp-preview-dev 
* commit '3ee7fb1045024b566d852f12ef8f081206ba7bb5':
  Introduced fading views for the camera interaction on the lockscreen.
 2014-06-12 19:58:19 +00:00
Jorim Jaggi
37ab979581 am da787d08: Merge "Material navigation bar." into lmp-preview-dev 
* commit 'da787d08accbddc3ca4fd49d798d11fe3523b1bf':
  Material navigation bar.
 2014-06-12 19:58:13 +00:00
Jean Chalard
11abbdcb78 am 7d8b87f0: Merge "Fix a CTS test" into lmp-preview-dev 
* commit '7d8b87f0d9b35694099d5f57777d27f577496960':
  Fix a CTS test
 2014-06-12 19:58:08 +00:00
Yohei Yukawa
2a97b54f49 am f09cb58d: Merge "Rename CursorAnchorInfoBuilder with Builder" into lmp-preview-dev 
* commit 'f09cb58d5f528665e6e96d8740eeeeab4167e357':
  Rename CursorAnchorInfoBuilder with Builder
 2014-06-12 19:58:02 +00:00
John Spurlock
61d3fab690 am e2f6373c: Merge "Heads-up notifications for low battery warnings." into lmp-preview-dev 
* commit 'e2f6373c80e7d1a5a7c71412bff10a71c54cd451':
  Heads-up notifications for low battery warnings.
 2014-06-12 19:57:56 +00:00
Adam Powell
61c585756c am 13cfcacf: Allow action bar navigation icon resource id of 0 
* commit '13cfcacf2a39b742ed9b0fea25924fc828e8c107':
  Allow action bar navigation icon resource id of 0
 2014-06-12 19:57:50 +00:00
Adam Powell
c78f2f7fea am 22e41e9a: Merge "Enable collapsing empty Toolbar-based ActionBars above tabs" into lmp-preview-dev 
* commit '22e41e9add1aeb0c8a79741f587c270752a50d16':
  Enable collapsing empty Toolbar-based ActionBars above tabs
 2014-06-12 19:57:42 +00:00
Chris Craik
5b368b3d9f am 98b10e48: Merge "Limit path approximation recursion depth" into lmp-preview-dev 
* commit '98b10e480279d331e54b9f28546629687244a01c':
  Limit path approximation recursion depth
 2014-06-12 19:57:36 +00:00
Chris Craik
a9b2639cba am b1f0d0b1: (-s ours) Merge "Workaround to avoid polygon flashing DO NOT MERGE" into lmp-preview-dev 
* commit 'b1f0d0b1853b54b6ce5f8f307a3f21845afc2fe2':
  Workaround to avoid polygon flashing DO NOT MERGE
 2014-06-12 19:57:31 +00:00
Robert Greenwalt
756c4b795e am f7c964fa: Merge "Fix Build" into lmp-preview-dev 
* commit 'f7c964fa06257d6db1b894bfbe905ca125c755c8':
  Fix Build
 2014-06-12 19:57:23 +00:00
Alan Viverette
5dcb543199 am 4ea9d069: Merge "Add Settings theme, fix DialogWhenLarge theme" into lmp-preview-dev 
* commit '4ea9d0698df166d30e38db4d16450530eb9c1f38':
  Add Settings theme, fix DialogWhenLarge theme
 2014-06-12 19:57:17 +00:00
Robert Greenwalt
54e312a51b am 9c6d406e: Fix build breakage. 
* commit '9c6d406eb7ab0fce40fb7cd1257714a29d06774c':
  Fix build breakage.
 2014-06-12 19:57:11 +00:00
Robert Greenwalt
1455a0a05a am 67b8af58: Merge "Missed an api update." into lmp-preview-dev 
* commit '67b8af5843f835d3d3124025d63c96b184cc87f5':
  Missed an api update.
 2014-06-12 19:57:05 +00:00
Robert Greenwalt
1ced737cf4 am c7d65d75: Merge "Fix wifi connectivity issues." into lmp-preview-dev 
* commit 'c7d65d759be6cd48a7bbaa4f061b4c4f85424b11':
  Fix wifi connectivity issues.
 2014-06-12 19:56:55 +00:00
Robert Greenwalt
86eb5906c0 am e1f5b5e0: Merge "Minor changes to the LinkAddress API docs." into lmp-preview-dev 
* commit 'e1f5b5e0cd5206e01e1c0e2bd282d421d9951960':
  Minor changes to the LinkAddress API docs.
 2014-06-12 19:56:45 +00:00
Robert Greenwalt
962b987085 am 4ad1f0d3: (-s ours) Merge "Add a new IpPrefix class and use it in RouteInfo." into lmp-preview-dev 
* commit '4ad1f0d31e4c998aa65344ccb8abb51cf96dd909':
  Add a new IpPrefix class and use it in RouteInfo.
 2014-06-12 19:56:39 +00:00
Scott Main
3a1d38b331 am 91b078c8: am 55c11af7: Merge "reorg the SDK setup docs to streamline setup for all variations. Move ADT plugin to the ADT help doc and combine the three setup guides into one page that is dynamic based on a URL parameter." into klp-modular-dev 
* commit '91b078c8dcce20d5b04f14f730e35cc0b25b4041':
  reorg the SDK setup docs to streamline setup for all variations. Move ADT plugin to the ADT help doc and combine the three setup guides into one page that is dynamic based on a URL parameter.
 2014-06-12 19:23:48 +00:00
Scott Main
91b078c8dc am 55c11af7: Merge "reorg the SDK setup docs to streamline setup for all variations. Move ADT plugin to the ADT help doc and combine the three setup guides into one page that is dynamic based on a URL parameter." into klp-modular-dev 
* commit '55c11af78a34f6746b9b5fcf8aa487eef797ea2e':
  reorg the SDK setup docs to streamline setup for all variations. Move ADT plugin to the ADT help doc and combine the three setup guides into one page that is dynamic based on a URL parameter.
 2014-06-12 19:04:34 +00:00
Andrew Solovay
ad60891a6e Merge branch 'master' of https://googleplex-android.googlesource.com/_direct/platform/frameworks/base 2014-06-12 18:50:02 +00:00
Andrew Solovay
56dc9a56f8 am d51a5b38: am 25b8af9d: am 436f4e36: am ded9c171: Merge "docs: New "Verifying App Behavior on the Android Runtime (ART)" guide." into klp-docs 
* commit 'd51a5b389187ad7db3444a74dc75439ff739d7dc':
  docs: New "Verifying App Behavior on the Android Runtime (ART)" guide.
 2014-06-12 18:49:55 +00:00
Robert Greenwalt
7c9f5529ea am 558aeb90: Merge "Make NetworkCapabilities publicly immutable." into lmp-preview-dev 
* commit '558aeb901144fac460575402e38fc8baa2da83eb':
  Make NetworkCapabilities publicly immutable.
 2014-06-12 18:49:07 +00:00
RoboErik
b41ed6ca70 am 8c4b4dc8: Merge "b/15330955 Make RemoteController use the new session APIs" into lmp-preview-dev 
* commit '8c4b4dc87f68d13331d67f4a25480455a7fb2378':
  b/15330955 Make RemoteController use the new session APIs
 2014-06-12 18:49:02 +00:00
Adam Powell
90132dd7ca am c72a2a82: Merge "Explicitly track consumed state for WindowInsets" into lmp-preview-dev 
* commit 'c72a2a82160099e8f20c42eb0d36881c31537130':
  Explicitly track consumed state for WindowInsets
 2014-06-12 18:37:33 +00:00
Christopher Tate
93e9e7208e am ba6e8ae5: Merge "Relax duplicate-permission-definition constraints slightly" into lmp-preview-dev 
* commit 'ba6e8ae5d2a364799fd6bc84179e33b6731e574b':
  Relax duplicate-permission-definition constraints slightly
 2014-06-12 18:37:28 +00:00
Winson Chung
02a9c359a1 am e202fff5: Merge "Stop sending broadcasts to RecentsActivity before boot has completed. (Bug 15109101)" into lmp-preview-dev 
* commit 'e202fff5f77568294ba4b50c879ca587535db3be':
  Stop sending broadcasts to RecentsActivity before boot has completed. (Bug 15109101)
 2014-06-12 18:08:09 +00:00
Fabrice Di Meglio
0044b20eb7 am 52771816: Merge "Fix Material Preference Framework layout" into lmp-preview-dev 
* commit '527718164cbb28dff6be6073ba78515395bcf9e1':
  Fix Material Preference Framework layout
 2014-06-12 18:08:04 +00:00
Raph Levien
12871e99d0 am 0e8a57cc: Merge "Support fake italics" into lmp-preview-dev 
* commit '0e8a57cc1ff4d12791231177b679114b05279548':
  Support fake italics
 2014-06-12 17:56:00 +00:00
Raph Levien
63fa80eaab am 7a5662e8: (-s ours) Merge "Support for fake bold in Minikin builds" into lmp-preview-dev 
* commit '7a5662e807f0e99bd8499a52ffed9d114d299f80':
  Support for fake bold in Minikin builds
 2014-06-12 17:55:54 +00:00
Raph Levien
c9f705b8f9 am 7204116b: (-s ours) Merge "Fix getFontMetrics problems" into lmp-preview-dev 
* commit '7204116b97bd5e1f79113566577c89c4d0925255':
  Fix getFontMetrics problems
 2014-06-12 17:49:23 +00:00
Andrew Solovay
d51a5b3891 am 25b8af9d: am 436f4e36: am ded9c171: Merge "docs: New "Verifying App Behavior on the Android Runtime (ART)" guide." into klp-docs 
* commit '25b8af9d3f91503146a4592d7fc19a53ca44bf4a':
  docs: New "Verifying App Behavior on the Android Runtime (ART)" guide.
 2014-06-12 17:27:48 +00:00
Andrew Solovay
25b8af9d3f am 436f4e36: am ded9c171: Merge "docs: New "Verifying App Behavior on the Android Runtime (ART)" guide." into klp-docs 
* commit '436f4e36d30bc6d1f2b353d8e5de9c37a594e874':
  docs: New "Verifying App Behavior on the Android Runtime (ART)" guide.
 2014-06-12 17:23:31 +00:00
Andrew Solovay
436f4e36d3 am ded9c171: Merge "docs: New "Verifying App Behavior on the Android Runtime (ART)" guide." into klp-docs 
* commit 'ded9c171ead51b358538a65d8b84946e05d8db2b':
  docs: New "Verifying App Behavior on the Android Runtime (ART)" guide.
 2014-06-12 17:19:33 +00:00
Adam Powell
6bb10554ba Allow action bar navigation icon resource id of 0 
Fix a bug preventing this from being treated properly.

Bug 15458868

Change-Id: Ib1a7def482755757e524dfddd1eb6a02522c5d6b
 2014-06-11 19:57:12 -07:00
Dirk Dougherty
866ad0c2b2 am 460cab19: am b024fd20: am bdcd6fc7: Doc change: Update monetization docs. 
* commit '460cab199df38b16ea1a4fc9e4f62509049cc859':
  Doc change: Update monetization docs.
 2014-06-12 02:44:11 +00:00
Dirk Dougherty
460cab199d am b024fd20: am bdcd6fc7: Doc change: Update monetization docs. 
* commit 'b024fd208720b9d0e5fd5cd4c7fb09c19b1a86ad':
  Doc change: Update monetization docs.
 2014-06-12 02:41:07 +00:00
Dirk Dougherty
b024fd2087 am bdcd6fc7: Doc change: Update monetization docs. 
* commit 'bdcd6fc777e678fb3d0d9b7f000b43d703fea9cd':
  Doc change: Update monetization docs.
 2014-06-12 02:37:27 +00:00
Robert Greenwalt
130669992c Fix build breakage. 
Change-Id: Ideb32704ce5dc37ef36b05609f88da2aa55b3a00
 2014-06-11 18:06:55 -07:00
Dirk Dougherty
bdcd6fc777 Doc change: Update monetization docs. 
Change-Id: Ic34c1a08f8b7bcd271ad53f31c62d0bab82fc053
 2014-06-11 17:52:07 -07:00
Elliott Hughes
b952587184 am 8525fe8d: am 1a3908e9: Merge "Switch to a type-safe album art interface." 
* commit '8525fe8d0a5a886704307055ef211fc911997783':
  Switch to a type-safe album art interface.
 2014-06-12 00:06:20 +00:00
Elliott Hughes
8525fe8d0a am 1a3908e9: Merge "Switch to a type-safe album art interface." 
* commit '1a3908e95926acd8add3858be571fe23fa9d047a':
  Switch to a type-safe album art interface.
 2014-06-12 00:02:42 +00:00
Craig Mautner
f5030ecbca am 4a9f1298: Close ActivityView and ActivityContainer cleanly. 
* commit '4a9f129874785d34930f165268dbc618e4bc2618':
  Close ActivityView and ActivityContainer cleanly.
 2014-06-12 00:00:17 +00:00
Craig Mautner
4a9f129874 Close ActivityView and ActivityContainer cleanly. 
- Do not call IActivityContainer.release() from
ActivityView.finalize() if it has already been called from
ActivityView.release(). Eliminates IBinder finalized Exception.

- Call ActivityRecord.makeFinishing() before calling ActivityStack.
destroyActivityLocked(). Forces call to scheduleDestroyActivity()
and eventually removeFromHistory(). Otherwise removeFromHistory()
is never called and window manager AppWindowTokens become orphans.

- Defer call to ActivityContainer.detachLocked() until all
activities have finished or timed out. Fixes problem where Display
is removed while activities are still launching.

- Call ActivityStackSupervisor.deleteActivityContainer() when all
activities have finished or timed out. Fixes orphaned
ActivityContainers.

Fixes bug 15450798.
Fixes bug 15484154.
Fixes bug 15383479.
Fixes bug 15316558.
Fixes bug 15168560.
Fixes bug 15143914.

Change-Id: Id3c641976b6f825458690f9ee063c07818b56f23
 2014-06-11 16:33:00 -07:00