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

64426 Commits

Author SHA1 Message Date
Filip Gruszczynski
aabc9869a9 am 03850591: Handle outsets when resized is called due to rotation. 
* commit '03850591954faf5280fd581dd04cd6958eda0124':
  Handle outsets when resized is called due to rotation.
 2015-07-02 00:47:48 +00:00
Filip Gruszczynski
0385059195 Handle outsets when resized is called due to rotation. 
Rotation might change while the wallpaper is displayed. If outsets are
present, this must trigger a resized callback and the wallpaper must
take these accounts immediately into account before requesting relayout.

Bug: 22209764

Change-Id: I97f2670f384ccac792e7c2727eb0ef017ec66188
 2015-07-01 10:23:47 -07:00
Robert Schaub
e51d6d05e9 am fae35eed: Merge "docs: Changed link in Java source code comment to repair 404" into mnc-preview-docs 
* commit 'fae35eed99d6bc87f3a864bdd16d951136a16cc7':
  docs: Changed link in Java source code comment to repair 404
 2015-06-30 20:26:36 +00:00
Filip Gruszczynski
300ccf4ab5 am 0ec1328f: Calculate outset hint when adding window. 
* commit '0ec1328f85a08a610868856c688ebb8196c79c17':
  Calculate outset hint when adding window.
 2015-06-30 20:20:48 +00:00
Filip Gruszczynski
0ec1328f85 Calculate outset hint when adding window. 
Outsets aren't dynamic so they are a great candidate for a hint when the
window is added through the window manager. Thanks to this during first
view hierarchy measure or wallpaper window layout they are immediately
available and don't require multiple measure/layout passes.

Bug: 21593814
Change-Id: I573c15ffbbe4fcd8a6ed9c5e4fcd6cfbbcd7434f
 2015-06-30 12:42:17 -07:00
Robert Schaub
f64c80a6cd docs: Changed link in Java source code comment to repair 404 
Need to find out what developer is in charge of CardEmulation.java to include
in review.

Bug: 19950839

Change-Id: Ic30ebaf69e46a70a64c8a123b0f72abaff7d0b80
 2015-06-30 12:41:58 -07:00
Filip Gruszczynski
e89d821e33 am b6c158f9: Merge "Dump of previous vibrations." into cw-d-mr1-dev 
* commit 'b6c158f9d863768d5d8315f2a4a4bb87c4db2fea':
  Dump of previous vibrations.
 2015-06-29 20:59:50 +00:00
Filip Gruszczynski
b6c158f9d8 Merge "Dump of previous vibrations." into cw-d-mr1-dev 2015-06-29 20:47:10 +00:00
Filip Gruszczynski
3a8eb0f670 Dump of previous vibrations. 
It's hard to find previous vibrations when you chase excessive use that
impacts the battery. A dump of previous vibrations allows us to
investigate where the vibrations come from.

Bug: 21933068
Change-Id: I14944732927c73401e5adc7345ea9823092b1883
 2015-06-29 09:28:32 -07:00
Amit Mahajan
1573d8efb2 am d98e7c1d: am 7278b043: am 895eb134: am 90224355: DO NOT MERGE Change to add STK_PERMISSION for stk related commands. 
* commit 'd98e7c1df774eb86a67310f5cbc0dbdd91f33c19':
  DO NOT MERGE Change to add STK_PERMISSION for stk related commands.
 2015-06-26 22:55:47 +00:00
Amit Mahajan
d98e7c1df7 am 7278b043: am 895eb134: am 90224355: DO NOT MERGE Change to add STK_PERMISSION for stk related commands. 
* commit '7278b04383cb6c01c2fbb184c560875ab709dea5':
  DO NOT MERGE Change to add STK_PERMISSION for stk related commands.
 2015-06-26 22:35:46 +00:00
Amit Mahajan
7278b04383 am 895eb134: am 90224355: DO NOT MERGE Change to add STK_PERMISSION for stk related commands. 
* commit '895eb134751ec1495baa30362a514275624e5843':
  DO NOT MERGE Change to add STK_PERMISSION for stk related commands.
 2015-06-26 22:18:01 +00:00
Amit Mahajan
895eb13475 am 90224355: DO NOT MERGE Change to add STK_PERMISSION for stk related commands. 
* commit '90224355cd6bd54fa7a9ec30c1cecc573104a3e3':
  DO NOT MERGE Change to add STK_PERMISSION for stk related commands.
 2015-06-26 22:03:10 +00:00
Amit Mahajan
90224355cd DO NOT MERGE Change to add STK_PERMISSION for stk related commands. 
Bug: 21697171
Change-Id: I7649c7341428194963ac74e9ae622dfa76ea738b
 2015-06-26 17:33:27 +00:00
Anthony Hugh
a50fa71044 am 001df9ca: DO NOT MERGE: Introduce stem keycodes for Wear 
* commit '001df9ca900f3098222a4920a0048d2eb947bd4e':
  DO NOT MERGE: Introduce stem keycodes for Wear
 2015-06-25 01:27:41 +00:00
Anthony Hugh
001df9ca90 DO NOT MERGE: Introduce stem keycodes for Wear 
Cherry-pick from master

This change adds four new stem keycodes for Android Wear. These
keycodes are intended to represent the various hardware buttons
around the watch.  There is one primary stem key that will be used
for power/settings and three generic stem keys that will be
customizable.

BUG: 21903503
Change-Id: I867cf79554c72d42c8acbb3ff8b1678e482d4fe2
 2015-06-24 16:13:19 -07:00
John Spurlock
4393a7d264 am c0d84934: am 076c599f: am 1ad5c813: Fix typo in TtsSpan. 
* commit 'c0d849348ae9fb36e725d0644a4927e2e5146295':
  Fix typo in TtsSpan.
 2015-06-15 22:39:12 +00:00
John Spurlock
076c599feb am 1ad5c813: Fix typo in TtsSpan. 
* commit '1ad5c813211d4d855a0d5396855c80653480aaa4':
  Fix typo in TtsSpan.
 2015-06-15 22:11:30 +00:00
John Spurlock
1ad5c81321 Fix typo in TtsSpan. 
Change-Id: Ic32f141f0c51ee3bee8fd71464f104ef725de880
 2015-06-15 17:24:57 +00:00
Filip Gruszczynski
94476be6a4 am 88bc9753: Merge "DO NOT MERGE Use ArrayMap instead of HashMap for storing relavant nodes" into cw-d-mr1-dev 
* commit '88bc9753c30c9ab3c92d074ae49520cfa2258b16':
  DO NOT MERGE Use ArrayMap instead of HashMap for storing relavant nodes
 2015-06-12 16:29:39 +00:00
Leon Scroggins III
8c9ae41bc7 am 303581be: resolved conflicts for merge of 3ff978a5 to cw-d-mr1-dev 
* commit '303581be5ba3875b0501cb8aa00a0228e22a6cc6':
  DO NOT MERGE: Ensure that unparcelling Region only reads the expected number of bytes
 2015-06-12 16:29:07 +00:00
Filip Gruszczynski
88bc9753c3 Merge "DO NOT MERGE Use ArrayMap instead of HashMap for storing relavant nodes" into cw-d-mr1-dev 2015-06-11 16:40:10 +00:00
Doris Liu
629ba0e2b3 DO NOT MERGE Use ArrayMap instead of HashMap for storing relavant nodes 
This fix is to take advantage of ArrayMap, which is a key-value
mapping data structure that is more memory efficient than HashMap.

Bug: 11604254
Change-Id: I57006880de570a4d7f3899e274cf0a06355d116b
(cherry picked from commit d7444427d9f44b6b7448d4c21edca866132c8b59)
 2015-06-10 22:54:09 +00:00
Leon Scroggins III
303581be5b resolved conflicts for merge of 3ff978a5 to cw-d-mr1-dev 
Change-Id: I37a4be53f44035c1ff58ba6c4da3a14803b946c2
 2015-06-10 14:56:11 -04:00
Leon Scroggins III
3ff978a520 am 77dde3cb: am 6b16398d: am 604ae32b: am 4dae8e41: Merge "DO NOT MERGE: Ensure that unparcelling Region only reads the expected number of bytes" into lmp-dev 
* commit '77dde3cbd049e75ea7447d3413bf52dbfe8c6342':
  DO NOT MERGE: Ensure that unparcelling Region only reads the expected number of bytes
 2015-06-10 16:21:26 +00:00
Leon Scroggins III
77dde3cbd0 am 6b16398d: am 604ae32b: am 4dae8e41: Merge "DO NOT MERGE: Ensure that unparcelling Region only reads the expected number of bytes" into lmp-dev 
* commit '6b16398dd148b38da19a8d5d7f5598fa44fbe7ac':
  DO NOT MERGE: Ensure that unparcelling Region only reads the expected number of bytes
 2015-06-10 16:06:47 +00:00
Leon Scroggins III
6b16398dd1 am 604ae32b: am 4dae8e41: Merge "DO NOT MERGE: Ensure that unparcelling Region only reads the expected number of bytes" into lmp-dev 
* commit '604ae32bcc6791da813a8e594783b695131bf888':
  DO NOT MERGE: Ensure that unparcelling Region only reads the expected number of bytes
 2015-06-10 15:51:38 +00:00
Filip Gruszczynski
93634166c8 am d88e4d50: Merge "ActivityView: set surface on a background thread." into cw-d-mr1-dev 
* commit 'd88e4d50d6198233883a69313fdee2c1a6fff7ca':
  ActivityView: set surface on a background thread.
 2015-06-02 22:36:42 +00:00
Filip Gruszczynski
d88e4d50d6 Merge "ActivityView: set surface on a background thread." into cw-d-mr1-dev 2015-06-02 22:26:39 +00:00
Leon Scroggins III
604ae32bcc am 4dae8e41: Merge "DO NOT MERGE: Ensure that unparcelling Region only reads the expected number of bytes" into lmp-dev 
* commit '4dae8e41b530672030731ec7cb69369da645cf30':
  DO NOT MERGE: Ensure that unparcelling Region only reads the expected number of bytes
 2015-06-02 13:01:13 +00:00
Leon Scroggins III
4dae8e41b5 Merge "DO NOT MERGE: Ensure that unparcelling Region only reads the expected number of bytes" into lmp-dev 2015-06-02 12:48:43 +00:00
Jeff Brown
65f6996add am eb4bd19e: Terminate loop properly when cursor window is full. DO NOT MERGE 
* commit 'eb4bd19ef09b2c277347b08c4a050f01f686c9c2':
  Terminate loop properly when cursor window is full. DO NOT MERGE
 2015-06-02 03:33:31 +00:00
Jeff Brown
eb4bd19ef0 Terminate loop properly when cursor window is full. DO NOT MERGE 
The existing code exits the column-filling loop immediately but
may continue to try to fill rows.  Ordinarily this should fail
too but it's possible for the process to continue and then
blow up a little later.  Fixed this problem by exiting the row-
filling loop promptly.

Bug: 21406130
Change-Id: Ifab59188d5d1b40f3c1f5c97604dd48da71bf37b
(cherry picked from commit bb8c841e909a2fb967db2ad3b9f8b058f9b849e8)
 2015-06-02 00:00:34 +00:00
Svetoslav
18fb1c92d8 am bf0652ee: DO NOT MERGE Don\'t take flags when creating app widget config activity. 
* commit 'bf0652eeea280bb1d687fe2fc3e869e0f6e9a541':
  DO NOT MERGE Don't take flags when creating app widget config activity.
 2015-06-01 23:02:37 +00:00
Filip Gruszczynski
2df62bf0dd ActivityView: set surface on a background thread. 
ActivityView shouldn't set the surface on the main thread, because it's
a binder call and causes jank. Instead it should delegate the call to a
background thread and let it do the work there.

Bug: 15752100

Change-Id: I6f2764c93dfb8f3e00d79f0e97d4a6688b6fdd8f
 2015-06-01 13:24:12 -07:00
Svetoslav
bf0652eeea DO NOT MERGE Don't take flags when creating app widget config activity. 
bug:19618745

Change-Id: Ib0e421454d343e6db55d5538f1d55ac22a3dd722
 2015-06-01 12:55:38 -07:00
Filip Gruszczynski
11d50c9cc6 am 06756f35: Dismiss or cancel in SwipeDismissLayout on screen off. 
* commit '06756f352d2046246bc147fa1f55d1dfbfcb37f5':
  Dismiss or cancel in SwipeDismissLayout on screen off.
 2015-06-01 18:57:21 +00:00
Filip Gruszczynski
06756f352d Dismiss or cancel in SwipeDismissLayout on screen off. 
Fix for situation where you palm the device while swiping away an
ambiactive activity (or rather, when you swipe slightly an ambiactive
activity during palm gesture). This would make the activity stay in half
dismissed state. Instead when the screen goes off, we either dismiss or
cancel the dismissal.

Change-Id: I82e699c00c25bc97dd95bc6473a17e5817f7667a
 2015-06-01 10:09:45 -07:00
Leon Scroggins III
6549eed89e DO NOT MERGE: Ensure that unparcelling Region only reads the expected number of bytes 
bug: 20883006
Change-Id: I4f109667fb210a80fbddddf5f1bfb7ef3a02b6ce
 2015-05-29 20:14:58 +00:00
Bryce Lee
2836b863fb am f33da518: Merge "Introduce indirection for base micro themes." into cw-d-mr1-dev 
* commit 'f33da5188d5d1d66c1697a84358f334018e9f905':
  Introduce indirection for base micro themes.
 2015-05-28 19:52:17 +00:00
Bryce Lee
f33da5188d Merge "Introduce indirection for base micro themes." into cw-d-mr1-dev 2015-05-28 19:39:45 +00:00
Bryce Lee
b99b91cdf8 Introduce indirection for base micro themes. 
This is needed, since overlays must add/modify items to base themes, but
simply declaring the style in an overlay will override the parent. To
ensure the true parent is never overridden, a base theme is introduced
that both the regular theme and the overlay can inherit from.

Bug: 21425951
Change-Id: I0967d0b4ddf12e9765bc321a7485a6dbdfef0b1e
 2015-05-28 11:03:57 -07:00
Leon Scroggins III
557ee34d97 am 2adefefa: am b6e3f930: am 2bbcc253: am b36ace74: Merge "Check that the parcel contained the expected amount of region data. DO NOT MERGE" into lmp-dev 
* commit '2adefefa3576142767c45b84d97e05078ead3539':
  Check that the parcel contained the expected amount of region data. DO NOT MERGE
 2015-05-27 17:52:51 +00:00
Leon Scroggins III
2adefefa35 am b6e3f930: am 2bbcc253: am b36ace74: Merge "Check that the parcel contained the expected amount of region data. DO NOT MERGE" into lmp-dev 
* commit 'b6e3f930c182ed254e7de3b3e5d22bc7323227f2':
  Check that the parcel contained the expected amount of region data. DO NOT MERGE
 2015-05-27 17:34:51 +00:00
Leon Scroggins III
b6e3f930c1 am 2bbcc253: am b36ace74: Merge "Check that the parcel contained the expected amount of region data. DO NOT MERGE" into lmp-dev 
* commit '2bbcc253254a497b8f9bb86712fb6f0f2548e9f2':
  Check that the parcel contained the expected amount of region data. DO NOT MERGE
 2015-05-27 17:18:47 +00:00
Leon Scroggins III
2bbcc25325 am b36ace74: Merge "Check that the parcel contained the expected amount of region data. DO NOT MERGE" into lmp-dev 
* commit 'b36ace7401c0e198ceddd2fdb908346b7bb5928f':
  Check that the parcel contained the expected amount of region data. DO NOT MERGE
 2015-05-27 14:39:21 +00:00
Leon Scroggins III
5cfd16201f Check that the parcel contained the expected amount of region data. DO NOT MERGE 
bug:20883006
Change-Id: Ib47a8ec8696dbc37e958b8dbceb43fcbabf6605b
 2015-05-26 21:09:24 +00:00
Griff Hazen
6c0b5b3436 Revert "Enable VoiceInteractionService on watch." DO NOT MERGE ANYWHERE 
This CL didn't ship with diamond-release, but will make diamond-mr1.

This reverts commit c663d99f007c0faa7b66a569ec4083b82d60ef15.

Change-Id: I1430ed7a3221a4f06ad730778c757a68e16b808b
 2015-05-21 14:25:05 -07:00
Filip Gruszczynski
47249f2a9e am cb89ac84: Merge "Support for devices with a chin." into cw-d-mr1-dev 
* commit 'cb89ac84c621e047d81873428325dfd747b90a6b':
  Support for devices with a chin.
 2015-05-20 22:54:14 +00:00
Filip Gruszczynski
cb89ac84c6 Merge "Support for devices with a chin." into cw-d-mr1-dev 2015-05-20 22:41:44 +00:00