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

160594 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
John Reck
a51a0901ad am bd15e4f5: Merge "Resume RT-animations after a pauseSurface" into lmp-mr1-dev 
* commit 'bd15e4f59c0ac4386ad11ba1555e41cb32d3a52c':
  Resume RT-animations after a pauseSurface
 2014-12-04 15:15:27 +00:00
Winson Chung
4eb896ef01 am ba1307b2: Merge changes Ib255e49f,Ifc33cdf7 into lmp-mr1-dev 
* commit 'ba1307b2b42b60893c88622f41f99efa2356350d':
  Ensuring that the alpha and translation animation durations are the same. (Bug 18609321)
  Fix crash when user is both scrolling and tabbing through Recents. (Bug 18552776)
 2014-12-04 15:15:21 +00:00
Jim Miller
f2b934b42b am 3ea68240: Merge "Stop keyguard from spamming the log" into lmp-mr1-dev 
* commit '3ea6824034ea8fbcd418af8e07606f60fd844e45':
  Stop keyguard from spamming the log
 2014-12-04 15:15:16 +00:00
xinhe
9a4472bf45 am 8f61e754: Merge "Unable to unlock SIM with a PIN/PUK" into lmp-mr1-dev 
* commit '8f61e7549ebb7ccb6bc2d41c30a9f2da2fb9bd7c':
  Unable to unlock SIM with a PIN/PUK
 2014-12-04 15:14:59 +00:00
Wink Saville
0304c529b6 am 82611e6d: Merge "Add getSimStateForSubscriber and additional SIM_STATE_XXXX values" into lmp-mr1-dev 
* commit '82611e6d9c48a1a9b5d8b37b25425b7d7354ef4f':
  Add getSimStateForSubscriber and additional SIM_STATE_XXXX values
 2014-12-04 15:14:49 +00:00
Christopher Tate
e808d2df76 am 758f4521: Merge "Adjust wallpaper-restore acceptance criteria" into lmp-mr1-dev 
* commit '758f45217d9b7d257258ea41aa53f6364ac13918':
  Adjust wallpaper-restore acceptance criteria
 2014-12-04 15:14:43 +00:00
Geoff Mendal
2dadff70d4 Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev 2014-12-04 05:44:59 +00:00
Geoff Mendal
3b05d2bd6f Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev 2014-12-04 05:05:34 +00:00
Geoff Mendal
2253b8c576 Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev 2014-12-04 04:39:37 +00:00
John Reck
bd15e4f59c Merge "Resume RT-animations after a pauseSurface" into lmp-mr1-dev 2014-12-04 00:08:16 +00:00
Winson Chung
ba1307b2b4 Merge changes Ib255e49f,Ifc33cdf7 into lmp-mr1-dev 
* changes:
  Ensuring that the alpha and translation animation durations are the same. (Bug 18609321)
  Fix crash when user is both scrolling and tabbing through Recents. (Bug 18552776)
 2014-12-04 00:07:57 +00:00
Jim Miller
3ea6824034 Merge "Stop keyguard from spamming the log" into lmp-mr1-dev 2014-12-03 23:44:32 +00:00
xinhe
8f61e7549e Merge "Unable to unlock SIM with a PIN/PUK" into lmp-mr1-dev 2014-12-03 23:39:32 +00:00
xinhe
18b9c3cb50 Unable to unlock SIM with a PIN/PUK 
call TelephonyManager.getSimState instead of accessing systemProperty
Bug:18489776

Change-Id: I45d2315a588f706c4815750963dcfec9f8409c5d
 2014-12-03 23:36:16 +00:00
Jim Miller
8b6bd4d3f4 Stop keyguard from spamming the log 
Fixes bug 18147652

Change-Id: I9f6d3a6f1b8e3d6443c112ecf8a61ea2dc4e3434
 2014-12-03 15:33:13 -08:00
Wink Saville
82611e6d9c Merge "Add getSimStateForSubscriber and additional SIM_STATE_XXXX values" into lmp-mr1-dev 2014-12-03 23:32:46 +00:00
Christopher Tate
758f45217d Merge "Adjust wallpaper-restore acceptance criteria" into lmp-mr1-dev 2014-12-03 23:09:34 +00:00
Robert Greenwalt
98f81182fb am 647b437d: Merge "Separate voice/data roaming state and type" into lmp-mr1-dev 
* commit '647b437d0772a8c73ac3936b2f8e69d4bd1953d3':
  Separate voice/data roaming state and type
 2014-12-03 23:00:34 +00:00
Eino-Ville Talvala
6e21817b8e am d23f8b44: Merge "Revert "Camera: Add new capability flags as system features as well"" into lmp-mr1-dev 
* commit 'd23f8b44d575dcdc00965aae5fffd97f0336df43':
  Revert "Camera: Add new capability flags as system features as well"
 2014-12-03 23:00:15 +00:00
Robert Greenwalt
647b437d07 Merge "Separate voice/data roaming state and type" into lmp-mr1-dev 2014-12-03 22:18:24 +00:00
Eino-Ville Talvala
d23f8b44d5 Merge "Revert "Camera: Add new capability flags as system features as well"" into lmp-mr1-dev 2014-12-03 22:01:42 +00:00
Winson Chung
b255e49fe4 Ensuring that the alpha and translation animation durations are the same. (Bug 18609321) 2014-12-03 13:45:36 -08:00
Dianne Hackborn
e6333e5188 am f696efa2: Merge "Fix issue #17948584: Application crash and phone restart when app..." into lmp-mr1-dev 
* commit 'f696efa206089bde1274d972239ffb5a8185f613':
  Fix issue #17948584: Application crash and phone restart when app...
 2014-12-03 21:38:08 +00:00
Dianne Hackborn
f696efa206 Merge "Fix issue #17948584: Application crash and phone restart when app..." into lmp-mr1-dev 2014-12-03 21:32:17 +00:00
Winson Chung
fc33cdf71d Fix crash when user is both scrolling and tabbing through Recents. (Bug 18552776) 2014-12-03 13:16:48 -08:00
Alan Viverette
3977137d86 am d3adf098: Merge "Slightly more button elevation to match Material spec" into lmp-mr1-dev 
* commit 'd3adf0986ba53b794ac8f8b70a8784ca6945d4ba':
  Slightly more button elevation to match Material spec
 2014-12-03 21:12:30 +00:00
Dianne Hackborn
4c4e4686d5 am 281f36f5: Merge "Fix issue #18607384: Run fstrim after every system update" into lmp-mr1-dev 
* commit '281f36f5483ade3800092a42109327347d8aaff6':
  Fix issue #18607384: Run fstrim after every system update
 2014-12-03 21:12:24 +00:00
Alan Viverette
d3adf0986b Merge "Slightly more button elevation to match Material spec" into lmp-mr1-dev 2014-12-03 21:10:21 +00:00
Christopher Tate
31f25696d9 Adjust wallpaper-restore acceptance criteria 
Previously the dimension check had implicit orientation sensitivity.
We now make sure to compare the candidate image's width to the smallest
screen dimension for acceptance purposes; this fixes cases when we would
e.g. get a restored image of (1680x2560) but believe that we needed it
to have a max width of 2048, even though it had originated on that same
device -- due to current-orientation issues.

Bug 18448052

Change-Id: I64ca6a4ed91ce1ccc04f5a9a6851e5cfe511b7c7
 2014-12-03 13:07:24 -08:00
Dianne Hackborn
281f36f548 Merge "Fix issue #18607384: Run fstrim after every system update" into lmp-mr1-dev 2014-12-03 21:06:55 +00:00
John Reck
01a5ea35fb Resume RT-animations after a pauseSurface 
Bug: 18203577

The issue occurs as a result of performTraversals() both doing
a window relayout call *and* early-returning because it's not dirty.

To fix this pauseSurface() returns whether or not the RT-side is
"dirty" to force ViewRootImpl to do a draw even if mDirty is
otherwise empty.

Change-Id: I534f367e75d18d273ebf14df3927f5c464ef6bef
 2014-12-03 13:03:59 -08:00
Yin-Chia Yeh
871571ae0c am 38134308: Merge "Camera: update antibanding spec" into lmp-mr1-dev 
* commit '381343088f964b6428c483f741424a50ef41cb49':
  Camera: update antibanding spec
 2014-12-03 20:54:23 +00:00
Dianne Hackborn
8b22252a6c Fix issue #18607384: Run fstrim after every system update 
Change-Id: I06f4c0b9e6834a8c8bd85710dfd9fa16471b6ad2
 2014-12-03 12:44:48 -08:00
Yin-Chia Yeh
381343088f Merge "Camera: update antibanding spec" into lmp-mr1-dev 2014-12-03 20:44:05 +00:00
Michael Wright
83de9a426a am da79c87f: Merge "Add keylayout for Logitech RedHawk Gamepad DO NO MERGE" into lmp-mr1-dev 
* commit 'da79c87f2e4502b02c29e9081dcdf52a742d29e5':
  Add keylayout for Logitech RedHawk Gamepad DO NO MERGE
 2014-12-03 20:41:52 +00:00
Michael Wright
70d8133cc3 am 22458842: Merge "Added Razer USA, Ltd serval DO NOT MERGE" into lmp-mr1-dev 
* commit '22458842cf0f86044856e6bc3c3a5fb2eda00862':
  Added Razer USA, Ltd serval DO NOT MERGE
 2014-12-03 20:41:47 +00:00
Michael Wright
da79c87f2e Merge "Add keylayout for Logitech RedHawk Gamepad DO NO MERGE" into lmp-mr1-dev 2014-12-03 20:34:34 +00:00
Michael Wright
22458842cf Merge "Added Razer USA, Ltd serval DO NOT MERGE" into lmp-mr1-dev 2014-12-03 20:34:21 +00:00
John Spurlock
06eaac4463 am cdf7f984: Merge "Doze: Fast path for pickup pulses." into lmp-mr1-dev 
* commit 'cdf7f984870344de1b1237e2a7749a3e32b2b688':
  Doze: Fast path for pickup pulses.
 2014-12-03 19:56:12 +00:00
Sreeram Ramachandran
95e4474c70 am 932c3321: Merge "Fix docs per API review." into lmp-mr1-dev 
* commit '932c33214729fe2d2b09f82ef60a72871f182654':
  Fix docs per API review.
 2014-12-03 19:50:19 +00:00
Etan Cohen
89b55fc52d am 7ab0ad1f: Add a global override for VoLTE calls (which leaves user setting in place) 
* commit '7ab0ad1ffe858dbf82d5c3b540c02488f31c51f0':
  Add a global override for VoLTE calls (which leaves user setting in place)
 2014-12-03 19:50:13 +00:00
Craig Mautner
56f10c2685 am a9355bd1: Merge "Handle keyguard dismiss flags correctly" into lmp-mr1-dev 
* commit 'a9355bd1c5d80777172103bd4e694972fedf8e54':
  Handle keyguard dismiss flags correctly
 2014-12-03 19:49:46 +00:00
John Spurlock
cdf7f98487 Merge "Doze: Fast path for pickup pulses." into lmp-mr1-dev 2014-12-03 19:49:26 +00:00
Geoff Mendal
fa89d0dc40 Import translations. DO NOT MERGE 
Change-Id: Icfd76bed7ba5aa54f0549793ce00ad87702125c5
Auto-generated-cl: translation import
 2014-12-03 11:47:54 -08:00
Sreeram Ramachandran
932c332147 Merge "Fix docs per API review." into lmp-mr1-dev 2014-12-03 19:15:38 +00:00
Eino-Ville Talvala
08a125562c Revert "Camera: Add new capability flags as system features as well" 
This reverts commit 6aee1d2ba52cf7f44c9355f279844b8a937903da.
But leaves in some of the improved documentation.

Bug: 18281970
Bug: 18573576
Change-Id: I320f2229456ac039bc8f3cd8bc8b4ea6cf0e80eb
 2014-12-03 11:12:39 -08:00
Etan Cohen
7ab0ad1ffe Add a global override for VoLTE calls (which leaves user setting in place) 
Bug: 18446228
Change-Id: I7d07f066e5933c2aeecf9222bb54da69975099bc
 2014-12-03 18:56:45 +00:00
Sreeram Ramachandran
9e956e9b9a Fix docs per API review. 
Bug: 18573918
Change-Id: I639fe2ce40cdef57d904b9ad1ebb28db7d057144
 2014-12-03 10:53:35 -08:00
John Spurlock
f5d250deec Doze: Fast path for pickup pulses. 
Decrease the pulse duration when pulsing for pickup.
Add an option to skip the proximity check entirely, but don't
turn it on yet.

Bug: 18373928
Change-Id: I54f8dee004229193a18d488759bf797a16470cab
 2014-12-03 13:48:28 -05:00
Craig Mautner
a9355bd1c5 Merge "Handle keyguard dismiss flags correctly" into lmp-mr1-dev 2014-12-03 18:41:30 +00:00