Commit Graph

16458 Commits

Author SHA1 Message Date
Jason Monk
cc9e34a42a Merge "QS Edit: Better handling if drags" into nyc-dev am: b8fe7e8bff am: 762bb8e3a5
am: f0ca2df831

* commit 'f0ca2df8318861c0ce2b520b068816345f4f7195':
  QS Edit: Better handling if drags

Change-Id: Idb7a6e2c8e2872d59c444a52681101796ddce587
2016-05-20 13:53:38 +00:00
Jason Monk
f0ca2df831 Merge "QS Edit: Better handling if drags" into nyc-dev am: b8fe7e8bff
am: 762bb8e3a5

* commit '762bb8e3a543fca46473c88817ea27358ae98375':
  QS Edit: Better handling if drags

Change-Id: Ia746f8f96f4bb3a3ceb36a7c6fe8c2d15bcde346
2016-05-20 13:50:53 +00:00
Jason Monk
762bb8e3a5 Merge "QS Edit: Better handling if drags" into nyc-dev
am: b8fe7e8bff

* commit 'b8fe7e8bffea93ceb30a0d827f2ac573472507dd':
  QS Edit: Better handling if drags

Change-Id: Id24e45b73846ef9d52feea537382f01eb2872ad4
2016-05-20 13:47:57 +00:00
Jason Monk
b8fe7e8bff Merge "QS Edit: Better handling if drags" into nyc-dev 2016-05-20 13:42:57 +00:00
The Android Automerger
1ec2fd72ce stephenli@ manually merge many commits up to '032dcff'
* commit '032dcff': (22 commits)
  Remove outdated google services links.
  Fix misc-macro-parentheses warnings in services jni.
  Fix misc-macro-parentheses warnings in hwui and graphic jni.
  Fix misc-macro-parentheses warnings in aapt and androidfw.
  docs: Update to column widths for Complications table
  Fix a11y crash when window layer isn't unique.
  Never set resized while not drag resizing for pinned stack.
  While turning OFF do not honor ON requests.
  Fix GATT autoConnect race condition
  Fix GATT autoConnect race condition
  Fix RTL issue in delete dialog.
  Incorporate feedback on new wallpaper-related APIs
  Mapping up/down of legacy Gps vs. Gnss Status
  Fixed a bug where the chronometer was invisible
  Fixed a bug where the chronometer wasn't updating the time
  Update BlockedNumberContract javadocs.
  [RenderScript] Fix ScriptIntrinsicBlur documentation.
  Update documentation about copyTo and copyFrom.
  DO NOT MERGE Cherry pick libpng usage fixes
  Start the Wear Time System Service with SystemServer
  ...
2016-05-19 23:51:32 +00:00
Selim Cinek
e934d32862 Merge "Fixed a bug where the chronometer was invisible" into nyc-dev am: 2486cb2c89
am: e9b32c77f8

* commit 'e9b32c77f88a2acb7e7e23fbd14f6b4f373cba0b':
  Fixed a bug where the chronometer was invisible

Change-Id: Ie6f36bca7345f7b1f86425e993deb7d617bbc4d5
2016-05-19 20:54:37 +00:00
Selim Cinek
b9d4cd81a3 Merge "Fixed a bug where the chronometer was invisible" into nyc-dev
am: 2486cb2c89

* commit '2486cb2c8978003d2b5cfa7e8169019421582cb0':
  Fixed a bug where the chronometer was invisible

Change-Id: Ib495f096b5b2bc758ce7224fae33ba1a44c027a2
2016-05-19 20:51:04 +00:00
Selim Cinek
e9b32c77f8 Merge "Fixed a bug where the chronometer was invisible" into nyc-dev
am: 2486cb2c89

* commit '2486cb2c8978003d2b5cfa7e8169019421582cb0':
  Fixed a bug where the chronometer was invisible

Change-Id: I8caf83fdb4a27e477e644123d349bc4951eda0dd
2016-05-19 20:49:24 +00:00
TreeHugger Robot
2486cb2c89 Merge "Fixed a bug where the chronometer was invisible" into nyc-dev 2016-05-19 20:40:26 +00:00
Muyuan Li
8cf63dc8c1 sysui: refactor for extensibility.
Mafke mDismissView in NotificationStackScrollLayout
protected.

Bug: 28848771
Change-Id: I3d0bb136835c3e21f55d103672744cc375e2d1c9
(cherry picked from commit 97192ff2c38d2362ebd449ec329c2da66644bec2)
2016-05-19 19:58:37 +00:00
Jason Monk
dd03659cb4 QS Edit: Better handling if drags
- don't add/remove divider, hide/show it
 - don't break drag sequence by returning false
 - clean up some logic

Change-Id: I3236b1bc8a1a810e6e696c21af747bd6369c5050
Fixes: 28067638
2016-05-19 13:59:41 -04:00
Michael Wright
5d2ea237d4 Merge "DO NOT MERGE Rename PointerIcon and Pointer Capture APIs" into nyc-dev am: a1e0cebf3a
am: 1831ca8f04

* commit '1831ca8f04e117a49227e1b3dc0c8ba1dde06cd5':
  DO NOT MERGE Rename PointerIcon and Pointer Capture APIs

Change-Id: Iebfbc1de1bbf2f86e62ed2105c30e89239368b11
2016-05-19 15:23:45 +00:00
Michael Wright
1831ca8f04 Merge "DO NOT MERGE Rename PointerIcon and Pointer Capture APIs" into nyc-dev
am: a1e0cebf3a

* commit 'a1e0cebf3a18ac097d370e21d698e079f974bfff':
  DO NOT MERGE Rename PointerIcon and Pointer Capture APIs

Change-Id: I20532a3148a99d4ea91ba7dc050f8669d5f19400
2016-05-19 15:12:30 +00:00
Michael Wright
ce290a75f2 Merge "DO NOT MERGE Rename PointerIcon and Pointer Capture APIs" into nyc-dev
am: a1e0cebf3a

* commit 'a1e0cebf3a18ac097d370e21d698e079f974bfff':
  DO NOT MERGE Rename PointerIcon and Pointer Capture APIs

Change-Id: I03543851263b7e9e2f84b179d66d3d269c48bf6c
2016-05-19 15:12:29 +00:00
TreeHugger Robot
a1e0cebf3a Merge "DO NOT MERGE Rename PointerIcon and Pointer Capture APIs" into nyc-dev 2016-05-19 15:03:36 +00:00
Clara Bayarri
5210974cf5 Merge "Add Tron Logging to Keyboard Shortcuts Helper" 2016-05-19 09:19:32 +00:00
Ian Rogers
f5e2e9756e Merge "Fix 2 instances of buggy double check locking on non-volatile fields." 2016-05-19 05:19:29 +00:00
Ian Rogers
4509b940fb Fix 2 instances of buggy double check locking on non-volatile fields.
Bug caught by Error Prone:
http://errorprone.info/bugpattern/DoubleCheckedLocking

Bug: 27723540
Change-Id: I0b0c06ce4ae1ffb668e8ab3a7fe07706df173f18
2016-05-18 20:04:13 -07:00
Selim Cinek
c2c0b043cf Fixed a bug where the chronometer was invisible
We were requiring the time to show in order to show the chronomer
which didn't make any sense.

Change-Id: Ia6d00d0932d272a6c5e20e8b41e3acfb53b7987a
Fixes: 28848113
2016-05-18 17:13:46 -07:00
Winson
81100ae084 Merge "Mark occluded home stack as invisible." into nyc-dev am: 32b54f2e42 am: 6e2ee9e382
am: ea9220988e

* commit 'ea9220988e8c88d258a5cb99e2687ee03f90cf55':
  Mark occluded home stack as invisible.

Change-Id: I8f9f1a92e198f7db97d7c3e1b93ff77a83fdbc5c
2016-05-18 22:01:00 +00:00
Winson Chung
ea9220988e Merge "Mark occluded home stack as invisible." into nyc-dev am: 32b54f2e42
am: 6e2ee9e382

* commit '6e2ee9e382dd86340d5242fe04a623b9cda10f6e':
  Mark occluded home stack as invisible.

Change-Id: I1762cf46b675fe2c5151332a53139e95d676cb01
2016-05-18 21:56:10 +00:00
Winson
98fdcf308f Merge "Mark occluded home stack as invisible." into nyc-dev
am: 32b54f2e42

* commit '32b54f2e42c4ff793c418c29c0ce9ef0be2a4a16':
  Mark occluded home stack as invisible.

Change-Id: Iae4279835f345b2b294acca20760634ba031f0bd
2016-05-18 21:50:44 +00:00
Winson
6e2ee9e382 Merge "Mark occluded home stack as invisible." into nyc-dev
am: 32b54f2e42

* commit '32b54f2e42c4ff793c418c29c0ce9ef0be2a4a16':
  Mark occluded home stack as invisible.

Change-Id: Iaa68bb7c93ffd8bcfc9af3e66fd7fced7787a671
2016-05-18 21:49:17 +00:00
TreeHugger Robot
bb711dfeb7 Merge "sysui: refactor for extensibility." 2016-05-18 21:47:41 +00:00
Winson Chung
32b54f2e42 Merge "Mark occluded home stack as invisible." into nyc-dev 2016-05-18 21:42:57 +00:00
Amith Yamasani
a3d46611e3 Merge "Retail mode flag and some clients for it" into nyc-mr1-dev am: dbf0dbd8c2
am: 1ab19ea6e6

* commit '1ab19ea6e6575a578244eecbae61d46150bec392':
  Retail mode flag and some clients for it

Change-Id: I08eb3539db3fd29403d05d8ef1124862a78d1acc
2016-05-18 21:07:37 +00:00
Amith Yamasani
1ab19ea6e6 Merge "Retail mode flag and some clients for it" into nyc-mr1-dev
am: dbf0dbd8c2

* commit 'dbf0dbd8c216e801b3d95f83d13ae05c1ba0ea39':
  Retail mode flag and some clients for it

Change-Id: I5f9e7c49759154925c6f20ab3fd647d84259b1bb
2016-05-18 21:01:49 +00:00
Amith Yamasani
dbf0dbd8c2 Merge "Retail mode flag and some clients for it" into nyc-mr1-dev 2016-05-18 20:57:12 +00:00
Muyuan Li
72a6387ce4 sysui: refactor for extensibility.
Add dimens for qs detail icons.

Bug: 28748510
Change-Id: Ic2e5d8948af6d081a2554139f9ffeec0c5946696
(cherry picked from commit cdaea618b5a4e28a336295cdc9abd30e018f6a4b)
2016-05-18 20:28:30 +00:00
Jorim Jaggi
4066f79370 Merge "Fix a few issues with ime adjust/minimized dock stack" into nyc-dev am: 96b2fe6a4e am: e1770e70dc
am: 9b5ea09d57

* commit '9b5ea09d57550f3823b490208db0b08838852420':
  Fix a few issues with ime adjust/minimized dock stack

Change-Id: I18e1391990dc0fad994edb54ab8a94f295ab0c07
2016-05-18 19:45:57 +00:00
Jorim Jaggi
9b5ea09d57 Merge "Fix a few issues with ime adjust/minimized dock stack" into nyc-dev am: 96b2fe6a4e
am: e1770e70dc

* commit 'e1770e70dca6a91f1ed4af631aa9c819db55eefb':
  Fix a few issues with ime adjust/minimized dock stack

Change-Id: I14e49a2030d1e4d4ca62c43f33d0616212d3d456
2016-05-18 19:42:07 +00:00
Jorim Jaggi
e19f2f2fc9 Merge "Fix a few issues with ime adjust/minimized dock stack" into nyc-dev
am: 96b2fe6a4e

* commit '96b2fe6a4eec82635f39c025ee9c57e99207a3df':
  Fix a few issues with ime adjust/minimized dock stack

Change-Id: I29e2d748e77f7773d7fc45440c1f807b25389ac5
2016-05-18 19:34:26 +00:00
Jorim Jaggi
e1770e70dc Merge "Fix a few issues with ime adjust/minimized dock stack" into nyc-dev
am: 96b2fe6a4e

* commit '96b2fe6a4eec82635f39c025ee9c57e99207a3df':
  Fix a few issues with ime adjust/minimized dock stack

Change-Id: I9f3f19c09a9f83b0a72bff4a26489b240af630a8
2016-05-18 19:34:23 +00:00
Jorim Jaggi
3070e77f91 Fix a few issues with ime adjust/minimized dock stack
- Do not override minimized state in SysUI when IME adjust change
comes in.
- Do not animate IME adjust if we are already animating for minimized.
This lead to problems that we animated the minimized state with the IME
adjust values.
- Make sure to update state after checking whether the IME adjust is
animating. This is to fix an issue where sometimes the IME adjust
animation didn't run because the old target was wrong.

Change-Id: Ie35e2f943a4cda99ffdc6f14663d892863759e46
Fixes: 28819201
2016-05-18 19:27:24 +00:00
Muyuan Li
e3cecd7ab8 sysui: refactor for extensibility.
Make mQsDetailHeaderProgress protected.

Bug: 28746808
Change-Id: I2126458f01095af7eff456a81a89602914bded7d
(cherry picked from commit b468b4c8be4717293e029af998ba059b97c4f573)
2016-05-18 18:24:34 +00:00
Baligh Uddin
cb6e5df633 Merge "Import translations. DO NOT MERGE" into nyc-dev 2016-05-18 17:57:19 +00:00
Baligh Uddin
06994e5e8c Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev 2016-05-18 17:57:14 +00:00
Baligh Uddin
9540cfff67 Merge "Import translations. DO NOT MERGE" 2016-05-18 17:51:52 +00:00
Mady Mellor
29abe8b728 Merge "Ensure background is shown behind gear when notifications overlap" into nyc-dev am: 048cabdbcb am: 573c36a484
am: f0b665f6e1

* commit 'f0b665f6e18a7a5ab67db10426700c3e1eb4fe57':
  Ensure background is shown behind gear when notifications overlap

Change-Id: I98764977db122c57080f918939e8b2e6c913d8f9
2016-05-18 16:57:35 +00:00
Mady Mellor
f0b665f6e1 Merge "Ensure background is shown behind gear when notifications overlap" into nyc-dev am: 048cabdbcb
am: 573c36a484

* commit '573c36a484f77d2bb41aa851ddce29c5b73302e4':
  Ensure background is shown behind gear when notifications overlap

Change-Id: I88d26ac1012d63215f209ee79e644785f8603a1b
2016-05-18 16:53:52 +00:00
Mady Mellor
573c36a484 Merge "Ensure background is shown behind gear when notifications overlap" into nyc-dev
am: 048cabdbcb

* commit '048cabdbcbc262869a5b737a22ccddb5ef0d76f9':
  Ensure background is shown behind gear when notifications overlap

Change-Id: I37d030259db06ca3d1a0d60ecd34c7e51caf5415
2016-05-18 16:48:05 +00:00
Mady Mellor
689b8026ed Merge "Ensure background is shown behind gear when notifications overlap" into nyc-dev
am: 048cabdbcb

* commit '048cabdbcbc262869a5b737a22ccddb5ef0d76f9':
  Ensure background is shown behind gear when notifications overlap

Change-Id: Idd2839db81350906ba36f1a17feebfc239d5d2c2
2016-05-18 16:47:57 +00:00
Mady Mellor
048cabdbcb Merge "Ensure background is shown behind gear when notifications overlap" into nyc-dev 2016-05-18 16:43:12 +00:00
Jaewan Kim
2a1851793b Merge "PIP: Fix NPE when enters Recents with PIP" into nyc-dev am: 4e08800a7e am: e659fac4c2
am: c1093b1dca

* commit 'c1093b1dca9f1d5baea3317b4f64d5c243c4a992':
  PIP: Fix NPE when enters Recents with PIP

Change-Id: Ic74513e1eb7c743e249fadfe6513e782c4afbd59
2016-05-18 15:56:09 +00:00
Jaewan Kim
c1093b1dca Merge "PIP: Fix NPE when enters Recents with PIP" into nyc-dev am: 4e08800a7e
am: e659fac4c2

* commit 'e659fac4c272a42eb575b9d66881f34a8ceeb66b':
  PIP: Fix NPE when enters Recents with PIP

Change-Id: I029f82f0f7c9673bbb7010daabe18017d889d83d
2016-05-18 15:53:32 +00:00
Jaewan Kim
7b1e4a02c3 Merge "PIP: Fix NPE when enters Recents with PIP" into nyc-dev
am: 4e08800a7e

* commit '4e08800a7e196cc94c1ed3fdcf6a492aa86055d2':
  PIP: Fix NPE when enters Recents with PIP

Change-Id: I6e8172d0a5fe6d6f12474b188b1e1ca52b927bfd
2016-05-18 15:50:59 +00:00
Jaewan Kim
e659fac4c2 Merge "PIP: Fix NPE when enters Recents with PIP" into nyc-dev
am: 4e08800a7e

* commit '4e08800a7e196cc94c1ed3fdcf6a492aa86055d2':
  PIP: Fix NPE when enters Recents with PIP

Change-Id: Ia0053731d074dec0e8438bcf654349dfd6e2c4a0
2016-05-18 15:50:51 +00:00
Jaewan Kim
4e08800a7e Merge "PIP: Fix NPE when enters Recents with PIP" into nyc-dev 2016-05-18 15:46:46 +00:00
Julia Reynolds
0b3d3f277b resolve merge conflicts of 43153f1 to master
Change-Id: I1d1957abf5c97565d2a1c52c5f50c6a25b711bd7
2016-05-18 10:49:02 -04:00
Clara Bayarri
c17a5988e3 Add Tron Logging to Keyboard Shortcuts Helper
Bug: 28161718
Change-Id: I5dcbb4c9f26d133e695595168ac2cd0ad1fa68d7
2016-05-18 15:39:24 +01:00