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

237577 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ajay Panicker
b6e1dafe78 Allow factory reset when bluetooth is off (1/2) 
Bug: 27348444
Change-Id: I6c2709371b86581709649d7faf09391230449b9b
 2016-04-05 20:23:21 +00:00
Winson Chung
d1427fbe0d Merge "Fixing tiny issue with empty state graphic not being centered correctly." into nyc-dev 2016-04-05 20:10:31 +00:00
Chong Zhang
c0b8c119d3 Merge "Add the app back to mOpeningApps if transition is unset but ready." into nyc-dev 2016-04-05 19:40:37 +00:00
Chong Zhang
81a1c176ba Add the app back to mOpeningApps if transition is unset but ready. 
This means a rotation is started while we have a transition pending,
and startFreezingDisplayLocked() called mAppTransition.freeze() to
cancel the transition by setting it to TRANSIT_UNSET but ready
immediately. Screen unfreeze will wait for mOpeningApps to empty.
handleAppTransitionReadyLocked() will remove the app from
mOpeningApps once it's drawn, and allow screen to unfreeze.

We don't add the app to mOpeningApps if the transition is neither
set nor ready. We don't have any transtition and the app won't be
removed from mOpeningApps.

bug: 27784481
bug: 27391256
Change-Id: Id2c0759732593121769c402ae0c6edde3ebc7dc6
 2016-04-05 19:36:04 +00:00
Selim Cinek
fdb3073a28 Merge "Fixed a bug where the minHeight of groups was inaccurate" into nyc-dev 2016-04-05 19:19:28 +00:00
Philip P. Moltmann
34efee8eec Merge "Fix package name of canon and xerox." into nyc-dev 2016-04-05 19:05:46 +00:00
Philip P. Moltmann
a99d077d62 Fix package name of canon and xerox. 
Change-Id: I9c08cf166f96327c145d17f283a0f231e5946d5a
 2016-04-05 12:04:42 -07: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
Yohei Yukawa
f98b1d4dba Revert "Do not set docked divider as IME target." 
This reverts commit ebe9c0dbebbd8c2a23a76ff827b90e66ce3813bf [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
07a0e79aa4 Merge "Fix name of Samsung in PrintServiceRecommendationService." into nyc-dev 2016-04-05 18:23:52 +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
Selim Cinek
567e845d99 Fixed a bug where the minHeight of groups was inaccurate 
Also cleaned up the methods names a bit and fixed some small
bugs in border cases where the algorithm was using the wrong
sizes.

Bug: 24866646
Change-Id: I6622814f8cec3fe143234e349030a19e3dc11353
 2016-04-05 11:17:15 -07:00
Jorim Jaggi
18e89da19b Merge "Fix wrong inset bounds" into nyc-dev 2016-04-05 18:07:52 +00:00
Ying Wang
70dc7e2f06 Merge "Fix dependency for fontchain_lint" into nyc-dev 2016-04-05 17:47:00 +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
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
a27cf024e5 Merge "Add public API for sim authentication." into nyc-dev 2016-04-05 17:03:31 +00:00
Tony Mak
80189cdece getProfiles should only returns non-partial user info 
Bug: 26928524
Change-Id: I537bb0a9632cad603717a367b81d5e072452a6d7
 2016-04-05 16:59:39 +00:00
Dianne Hackborn
4345904050 Merge "(Docs only) Make battery stats process state docs more clear." into nyc-dev 2016-04-05 16:54:55 +00:00
Dianne Hackborn
a7d301c5d4 Merge "Fix issue #28001806: Background check is incorrectly restricting binding of services" into nyc-dev 2016-04-05 16:54:36 +00:00
Dianne Hackborn
a0200e3702 (Docs only) Make battery stats process state docs more clear. 
Change-Id: I7e86705ec5fa7be8d6a74e708bbf166bec17494f
 2016-04-05 09:54:02 -07:00
Dianne Hackborn
4fb9c4af59 Fix issue #28001806: Background check is incorrectly restricting binding of services 
Change-Id: Ie79937d2696e28651c8ef2bdcc5c9c84f9f801c6
 2016-04-05 09:53:09 -07:00
Winson
24251b68f1 Fixing tiny issue with empty state graphic not being centered correctly. 
- The centering is based on the size not including insets, so it should
  be offset by the top/left insets.

Bug: 28005632
Change-Id: I114bcaadddb0d4777d4c013097c0d1a20e4fab0b
 2016-04-05 16:52:19 +00:00
Alan Viverette
9d8ec0f12e Merge "Rewrite popup window positioning algorithm" into nyc-dev 2016-04-05 16:29:08 +00:00
Ricky Wai
a8c37a1806 Fix SystemUI crash for work challenge 
We should not assume createConfirmDeviceCredentialIntent()
can always return an intent, for example, it has separate work challenge
but lock type is None, then createConfirmDeviceCredentialIntent() will
return null.

Bug: 27782917
Change-Id: I33e40f893f61e35a2e6ce732a47d651139f246a1
 2016-04-05 16:28:59 +00:00
Glenn Kasten
5cb05f810b Merge "Fix typo" into nyc-dev 2016-04-05 15:00:22 +00:00
Kirill Grouchnikov
bbcf4327d2 Merge "Add a hidden test-only API to get Toolbar's navigation view." into nyc-dev 2016-04-05 14:54:48 +00:00
Rubin Xu
63d1ee45ee Merge "Split ACTION_MANAGED_PROFILE_AVAILABILITY_CHANGED into two." into nyc-dev 2016-04-05 14:52:02 +00:00
Alan Viverette
29e2d427a4 Merge "Make Material switch style public" into nyc-dev 2016-04-05 14:51:04 +00:00
Oleksiy Vyalov
b68bcbdfe7 Send nativeDebuggable byte value as part of HELLO response. 
Bug: 27942453

Change-Id: I4a222c88e104040b08e603e300e54a1ca2c038fe
 2016-04-05 07:25:18 -07:00
Bill Yi
5798a425ec Merge "Import translations. DO NOT MERGE" into nyc-dev 2016-04-05 14:22:21 +00:00
Bill Yi
06296dbb87 Merge "Import translations. DO NOT MERGE" into nyc-dev 2016-04-05 14:21:52 +00:00
Bill Yi
22092d7794 Merge "Import translations. DO NOT MERGE" into nyc-dev 2016-04-05 14:16:49 +00:00
Bill Yi
ba6880ec51 Merge "Import translations. DO NOT MERGE" into nyc-dev 2016-04-05 14:16:18 +00:00
Bill Yi
8a9cc710f2 Merge "Import translations. DO NOT MERGE" into nyc-dev 2016-04-05 14:15:41 +00:00
Alan Viverette
16aaa3e535 Merge "Fix bad workaround docs in Resources.getDrawable()" into nyc-dev 2016-04-05 14:15:10 +00:00
Bill Yi
a0480cc36b Merge "Import translations. DO NOT MERGE" into nyc-dev 2016-04-05 14:14:57 +00:00
Alan Viverette
9e902f86ac Make Material switch style public 
Bug: 28001482
Change-Id: I0dcbf585db13d2efffd09ec0e329170114f372a1
 2016-04-05 10:14:27 -04:00
Jason Monk
b65b7105cd Revert "Add Preference#onDetachedFromActivity" 
This reverts commit e18dc50c63110a57cfc29ec9bd21bf3f59abb6b4.
Fixes: 27807793

Change-Id: Ib0384e3deb8d6376265e8e60f14490de128c9b68
(cherry picked from commit eff3ca5480789c51768a3a1697503fbbdadc1bd6)
 2016-04-05 14:06:47 +00:00
Robin Lee
691b1a6005 Merge "Switch to work challenge if MP calls resetPassword" into nyc-dev 2016-04-05 14:04:40 +00:00
Jason Monk
723a65a51b Merge "Fix Build" into nyc-dev 2016-04-05 13:49:41 +00:00