Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
244,038 Commits 3 Branches 0 Tags
4aa77870f6d29d030fa6343a2bd42e93deb951cc
Commit Graph

244038 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Sunny Goyal
4aa77870f6 Merge "Changing startListening to only fetch views which are bound" into nyc-dev am: 60c74e8 
am: 5e59ea2

* commit '5e59ea211566c03389d221303b76444fdf58065e':
  Changing startListening to only fetch views which are bound

Change-Id: I1fe22a704d0c101f504683d16ea2ea3c552adc35
 2016-04-05 19:01:10 +00:00
Yohei Yukawa
debd513e08 Merge "Revert "Do not set docked divider as IME target."" into nyc-dev am: 0c9d1b0 
am: 48e26d6

* commit '48e26d6c79deb7c32aa734a15d2a8f011413382d':
  Revert "Do not set docked divider as IME target."

Change-Id: I1e5cde95484d80b07af5ffbcd8d49188e2c6eaab
 2016-04-05 19:01:08 +00:00
Chris Craik
e038368eb4 Merge "Fix software layer alpha" into nyc-dev am: cd6ea77d 
am: 3844aff

* commit '3844affcef076c72a1990540babc885f67580050':
  Fix software layer alpha

Change-Id: I93829f1d888c04a9f3b120eea8810b1453024c47
 2016-04-05 19:01:06 +00:00
Sunny Goyal
5e59ea2115 Merge "Changing startListening to only fetch views which are bound" into nyc-dev 
am: 60c74e8

* commit '60c74e836fc40d65c8ac58c231956f57d26ec7eb':
  Changing startListening to only fetch views which are bound

Change-Id: I811c2cb1603bef597eb958ff7fbd44a93d7075b2
 2016-04-05 18:58:01 +00:00
Yohei Yukawa
48e26d6c79 Merge "Revert "Do not set docked divider as IME target."" into nyc-dev 
am: 0c9d1b0

* commit '0c9d1b06c3f9830264623ad2c8842db6d47809d3':
  Revert "Do not set docked divider as IME target."

Change-Id: I33391e005220905e85768ffa65601abdbdbe70a9
 2016-04-05 18:57:59 +00:00
Chris Craik
3844affcef Merge "Fix software layer alpha" into nyc-dev 
am: cd6ea77d

* commit 'cd6ea77d07204d2ff5e1a0264dc24db215de8614':
  Fix software layer alpha

Change-Id: Ic0e8d3d5fa9e290f036d8e4fc59ee460b03020c9
 2016-04-05 18:57:56 +00:00
Sunny Goyal
60c74e836f Merge "Changing startListening to only fetch views which are bound" into nyc-dev 2016-04-05 18:53:18 +00:00
Yohei Yukawa
0c9d1b06c3 Merge "Revert "Do not set docked divider as IME target."" into nyc-dev 2016-04-05 18:53:03 +00:00
Chris Craik
cd6ea77d07 Merge "Fix software layer alpha" into nyc-dev 2016-04-05 18:50:26 +00:00
Philip P. Moltmann
1242fe48ae Merge "Fix name of Samsung in PrintServiceRecommendationService." into nyc-dev am: 07a0e79 
am: 671345c

* commit '671345c595b8b54746b04dfb44d7f933f1a72c4a':
  Fix name of Samsung in PrintServiceRecommendationService.

Change-Id: Ib20da2188c1a879a055bea60c9f3997aa950bdf4
 2016-04-05 18:36:23 +00:00
Yohei Yukawa
f98b1d4dba Revert "Do not set docked divider as IME target." 
This reverts commit ebe9c0dbeb [1],
because it caused a regression that IME window becomes transparent on
the lock screen (Bug 28013209).

 [1]: I7d406cc88aae40a8b22c1fc1d856ccb7b6bb4558

Bug: 26387930
Bug: 28013209
Change-Id: I11243703030e34b917136b69a35245e9ef73c87c
 2016-04-05 11:35:35 -07:00
Philip P. Moltmann
671345c595 Merge "Fix name of Samsung in PrintServiceRecommendationService." into nyc-dev 
am: 07a0e79

* commit '07a0e79aa4df64abd5b2c70eabd98a2e6ce8b341':
  Fix name of Samsung in PrintServiceRecommendationService.

Change-Id: I640dfec1185b6103798ec9b238224cd8cacfbace
 2016-04-05 18:33:10 +00:00
Andrii Kulian
910a1cb225 Merge "Fix override insets when dragging divider in split-screen" into nyc-dev am: 5cec2d8 
am: 190e7e8

* commit '190e7e8134aa68a1720f79f33791a9ed3c353af5':
  Fix override insets when dragging divider in split-screen

Change-Id: If9e64cfbacc0cda2ec0faf2dd7c6199d9c192e8e
 2016-04-05 18:30:17 +00:00
Andrii Kulian
190e7e8134 Merge "Fix override insets when dragging divider in split-screen" into nyc-dev 
am: 5cec2d8

* commit '5cec2d8aa9565a299565148bf04bfdd0efa8c37d':
  Fix override insets when dragging divider in split-screen

Change-Id: I016f8d4787a7c750d887c47c78df8d48e2a51512
 2016-04-05 18:27:14 +00:00
Philip P. Moltmann
07a0e79aa4 Merge "Fix name of Samsung in PrintServiceRecommendationService." into nyc-dev 2016-04-05 18:23:52 +00:00
Jorim Jaggi
d28390f4a8 Merge "Fix wrong inset bounds" into nyc-dev am: 18e89da 
am: 78f0b88

* commit '78f0b88bfda7fb0102a2aaf4a091860bdd9621f9':
  Fix wrong inset bounds

Change-Id: I6ba10c3cd583f1bfb39dad6c9718b5bfdc53235f
 2016-04-05 18:21:12 +00:00
Andrii Kulian
5cec2d8aa9 Merge "Fix override insets when dragging divider in split-screen" into nyc-dev 2016-04-05 18:19:18 +00:00
Philip P. Moltmann
b87510483f Fix name of Samsung in PrintServiceRecommendationService. 
Change-Id: I31af933ffec074e9ee646c5d879f42938229dcf7
 2016-04-05 11:18:19 -07:00
Wanwu Peng
bf6e56755b Merge "Fix MTP_TYPE_UINT128 data conversion issue" am: ba23e45 am: 287dfa1 
am: 7a83ee9

* commit '7a83ee9a320669c6346a6a634e79cab4dbb5e462':
  Fix MTP_TYPE_UINT128 data conversion issue

Change-Id: I7f4af16cb0d978bad4153957a6997156ad05a179
 2016-04-05 18:14:54 +00:00
Jorim Jaggi
78f0b88bfd Merge "Fix wrong inset bounds" into nyc-dev 
am: 18e89da

* commit '18e89da19b1442bfdc001b719581257257ab73d8':
  Fix wrong inset bounds

Change-Id: I3d7d17ce3a7e958c3109a04eab491a1b62a7b73d
 2016-04-05 18:14:21 +00:00
Marco Nelissen
7a83ee9a32 Merge "Fix MTP_TYPE_UINT128 data conversion issue" am: ba23e45 
am: 287dfa1

* commit '287dfa10cd6d5c6eb7cb39e20e1b6532c320927c':
  Fix MTP_TYPE_UINT128 data conversion issue

Change-Id: I72aa6c2bcd009a2e0607832c44dc4b96c5da6b1f
 2016-04-05 18:11:26 +00:00
Jorim Jaggi
18e89da19b Merge "Fix wrong inset bounds" into nyc-dev 2016-04-05 18:07:52 +00:00
Wanwu Peng
287dfa10cd Merge "Fix MTP_TYPE_UINT128 data conversion issue" 
am: ba23e45

* commit 'ba23e453487fcb18e91b4919b933012458f17fdd':
  Fix MTP_TYPE_UINT128 data conversion issue

Change-Id: I03c062ce58283f6886ff1d2922755a9a584a73ec
 2016-04-05 18:01:43 +00:00
Ying Wang
0b17cb0852 Merge "Fix dependency for fontchain_lint" into nyc-dev am: 70dc7e2f 
am: 62ba1df

* commit '62ba1dfeff21edc19b338fff81ee7675b0994d37':
  Fix dependency for fontchain_lint

Change-Id: I89001d13c33de8b05c8725b66aa6df4b7f32d1f7
 2016-04-05 17:55:27 +00:00
Ricky Wai
86695af0cc Merge "Fix SystemUI crash for work challenge" into nyc-dev am: b00ff01 
am: 6547a24

* commit '6547a242821977f96ae2ff4e808762f1c6534897':
  Fix SystemUI crash for work challenge

Change-Id: Ia268a7fc3592f72cbbc0ee7a9ebe6bc46609b462
 2016-04-05 17:55:25 +00:00
Marco Nelissen
ba23e45348 Merge "Fix MTP_TYPE_UINT128 data conversion issue" 2016-04-05 17:51:57 +00:00
Ying Wang
62ba1dfeff Merge "Fix dependency for fontchain_lint" into nyc-dev 
am: 70dc7e2f

* commit '70dc7e2f06ff71d83412ee794488ff6d603755ab':
  Fix dependency for fontchain_lint

Change-Id: Idf17cd474f1c071b954ba5854f7436ae041c7068
 2016-04-05 17:51:50 +00:00
Ricky Wai
6547a24282 Merge "Fix SystemUI crash for work challenge" into nyc-dev 
am: b00ff01

* commit 'b00ff01f7b732eb0b3fb6bacd4597cd6b157e681':
  Fix SystemUI crash for work challenge

Change-Id: Ideae53ce87ec6ffeabb0757719e3e8ed2f74245a
 2016-04-05 17:51:45 +00:00
Ying Wang
70dc7e2f06 Merge "Fix dependency for fontchain_lint" into nyc-dev 2016-04-05 17:47:00 +00:00
George Mount
8ade4ed2af Merge "Restore fragment transaction animation state information." into nyc-dev am: dc63f7c6 
am: 5f2be08

* commit '5f2be085d2179e3409d074a4d4cca98c5db71582':
  Restore fragment transaction animation state information.

Change-Id: I6e63aba83c05bc8820f3776496138413e3091b8b
 2016-04-05 17:44:26 +00:00
Oleksiy Vyalov
a4719f0926 Merge "Send nativeDebuggable byte value as part of HELLO response." into nyc-dev am: 81c9ea4 
am: 4588a46

* commit '4588a4685062f128443fd9c2ffc0c37970d45ab5':
  Send nativeDebuggable byte value as part of HELLO response.

Change-Id: I8da9f902930d5a33527d98503cd4fbdb9940a9ef
 2016-04-05 17:44:23 +00:00
Tony Mak
c13975300e Merge "getProfiles should only returns non-partial user info" into nyc-dev am: 73ebf33 
am: f0490ff

* commit 'f0490ff21d516fe7b4ae55fe5202de757402286f':
  getProfiles should only returns non-partial user info

Change-Id: I56426bacfaef4493281bfd864eeca73a5289bf13
 2016-04-05 17:44:21 +00:00
Ricky Wai
b00ff01f7b Merge "Fix SystemUI crash for work challenge" into nyc-dev 2016-04-05 17:39:46 +00:00
George Mount
5f2be085d2 Merge "Restore fragment transaction animation state information." into nyc-dev 
am: dc63f7c6

* commit 'dc63f7c6248276d003d949dbbe407aafd5e7c6bf':
  Restore fragment transaction animation state information.

Change-Id: I4eb87247e789034b2c468bd4764e4d1c9c44ab09
 2016-04-05 17:36:11 +00:00
Oleksiy Vyalov
4588a46850 Merge "Send nativeDebuggable byte value as part of HELLO response." into nyc-dev 
am: 81c9ea4

* commit '81c9ea4034186cd3ff2c387972389eb3397aba46':
  Send nativeDebuggable byte value as part of HELLO response.

Change-Id: I317d3ee0c8c397671c31b858e9c33bffbe53f7cf
 2016-04-05 17:36:09 +00:00
Tony Mak
f0490ff21d Merge "getProfiles should only returns non-partial user info" into nyc-dev 
am: 73ebf33

* commit '73ebf33d76c1d06b275b011e043680c410fd70ac':
  getProfiles should only returns non-partial user info

Change-Id: I25fe20297bf83094c3b09c8784365546c14cb2ed
 2016-04-05 17:36:07 +00:00
Yohei Yukawa
3b30e66d8a Merge "Fix a remaining View leak in InputMethodManager." into nyc-dev am: e470fcf 
am: eadb88f

* commit 'eadb88fe37825d3f39400c68f2cdc950aec4e30e':
  Fix a remaining View leak in InputMethodManager.

Change-Id: I0c53b76b279c625c79ecdfa22a031ad9eac3e317
 2016-04-05 17:31:44 +00:00
Sudheer Shanka
38464137e6 Merge "Remove the admin from the removing list when refreshing that admin." into nyc-dev am: f4b30e2 
am: 179e913

* commit '179e91355057378a9ad905caab1369241a65cdf7':
  Remove the admin from the removing list when refreshing that admin.

Change-Id: I545916ca6987701013132815f45c75c4dbba2185
 2016-04-05 17:31:41 +00:00
Yohei Yukawa
eadb88fe37 Merge "Fix a remaining View leak in InputMethodManager." into nyc-dev 
am: e470fcf

* commit 'e470fcfeb001d52c4add58f8420709cb6db7e7c4':
  Fix a remaining View leak in InputMethodManager.

Change-Id: I9f83e4de49c527d629091ffc6cf13297bdd6df3b
 2016-04-05 17:28:32 +00:00
Sudheer Shanka
179e913550 Merge "Remove the admin from the removing list when refreshing that admin." into nyc-dev 
am: f4b30e2

* commit 'f4b30e2147671476564c8bba6edf33aa63334f6e':
  Remove the admin from the removing list when refreshing that admin.

Change-Id: Ifd93b6e4d0e495e45fec5388c941675f8edfbf37
 2016-04-05 17:28:30 +00:00
George Mount
dc63f7c624 Merge "Restore fragment transaction animation state information." into nyc-dev 2016-04-05 17:27:34 +00:00
Oleksiy Vyalov
81c9ea4034 Merge "Send nativeDebuggable byte value as part of HELLO response." into nyc-dev 2016-04-05 17:27:24 +00:00
Ying Wang
d5b46b19c6 Fix dependency for fontchain_lint 
fontchain_lint scans directories in $(TARGET_OUT). There is no better
target working as dependency than the system.img.

Change-Id: I560b89f697e5ebd4f1e44a150f5af37996cf427e
 2016-04-05 10:26:14 -07:00
Tony Mak
73ebf33d76 Merge "getProfiles should only returns non-partial user info" into nyc-dev 2016-04-05 17:24:30 +00:00
Yohei Yukawa
e470fcfeb0 Merge "Fix a remaining View leak in InputMethodManager." into nyc-dev 2016-04-05 17:22:47 +00:00
Sudheer Shanka
f4b30e2147 Merge "Remove the admin from the removing list when refreshing that admin." into nyc-dev 2016-04-05 17:21:36 +00:00
Chris Craik
cfa6dade73 Fix software layer alpha 
Fixes: 27429404

Software layers must combine layerpaint alpha, if present, with view
alpha.

Change-Id: If9c7dcb53ab8754b4e123cf9cc332a566fd792c4
 2016-04-05 10:15:11 -07:00
Junda Liu
f8823a516d Merge "Add public API for sim authentication." into nyc-dev am: a27cf02 
am: e823500

* commit 'e8235003c2a1a35c8711d38aefe5406bbd853167':
  Add public API for sim authentication.

Change-Id: I957e4d426df5fc835ea835eb79f682da555c26a3
 2016-04-05 17:13:35 +00:00
Junda Liu
e8235003c2 Merge "Add public API for sim authentication." into nyc-dev 
am: a27cf02

* commit 'a27cf024e5a9fac9c254a533386bcb073817ecb2':
  Add public API for sim authentication.

Change-Id: Iaf27927945b40007110afb2b4e5cb9f231526a0c
 2016-04-05 17:10:17 +00:00
Dianne Hackborn
07da840a9f Merge "(Docs only) Make battery stats process state docs more clear." into nyc-dev am: 4345904 
am: eaa18f9

* commit 'eaa18f954aeedbc96f08ef935d0182d89c1137ab':
  (Docs only) Make battery stats process state docs more clear.

Change-Id: I80fbc3e25c172376e9b841d28be7b81bf5eef49f
 2016-04-05 17:04:22 +00:00