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

206429 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Pavel Zhamaitsiak
b6baaf30cd Add WiFi Calling overlays for T-Mobile's MCCMNCs 
Bug: 26024279
Change-Id: I71920fc45dec3e4fe5a3f4e349ff1ba3df703000
 2016-01-13 11:19:05 -08:00
Adam Lesinski
f2cc98bc96 Merge "UsageStats: Fix issue where initializing data for first time would cause crash" into mnc-dr1.5-dev 2016-01-13 01:48:45 +00:00
Adam Lesinski
76e9d76c22 UsageStats: Fix issue where initializing data for first time would cause crash 
With the updated rolling window of stats for app idleness, we need to make sure
it is populated before we initialize some defaults.

Now that we look at older entries to figure out idleness, if those
entries are in the future (due to time change), set them to the current
screen on time.
Bug:26504153

Change-Id: Ia22add0e8eaf0f137002bbe3e91d747fef5b7d69
 2016-01-12 16:52:45 -08:00
Matthew Bouyack
e0845e8629 Merge "In CanvasContext::doFrame, make a separate call to computeFrameTimeNanos and save the result. Then pass that value to UiFrameInfoBuilder::setVsync as both arguments." into cw-e-dev 
am: eebf168e43

* commit 'eebf168e43e4a455a74e949cc0d7e156b231a697':
  In CanvasContext::doFrame, make a separate call to computeFrameTimeNanos and save the result. Then pass that value to UiFrameInfoBuilder::setVsync as both arguments.
 2016-01-12 22:33:09 +00:00
Matthew Bouyack
eebf168e43 Merge "In CanvasContext::doFrame, make a separate call to computeFrameTimeNanos and save the result. Then pass that value to UiFrameInfoBuilder::setVsync as both arguments." into cw-e-dev 2016-01-12 22:28:21 +00:00
Matthew Bouyack
7f667e7a08 In CanvasContext::doFrame, make a separate call to computeFrameTimeNanos 
and save the result. Then pass that value to
UiFrameInfoBuilder::setVsync as both arguments.

The order of function argument evaluation is undefined in C++. Because
the value returned from TimeLord::latestVsync may be changed by
the preceding call to TimeLord::computeFrameTimeNanos the values of the
arguments passed to UiFrameInfoBuilder::setVsync is also undefined. This
change removes any ambiguity.

Change-Id: Ie71ee453f9ccc725edfe5f7cc9b277f2a809dfdc
 2016-01-12 12:01:48 -08:00
Alan Viverette
cf6885b7b7 Merge "Avoid drawable invalidation during draw()" into mnc-dr1.5-dev 2016-01-12 19:18:28 +00:00
Alan Viverette
d9434699e4 Merge "Handle null result from getVirtualChildAt()" into mnc-dr1.5-dev 2016-01-12 18:19:33 +00:00
Jason Monk
67b2c16a9a Get data type from service state as well 
Bug: 26276354
Bug: 26413831
Change-Id: Ic080300db7d5e5200caf611cc2ee1ef3af93736e
 2016-01-12 10:24:09 -05:00
Alan Viverette
e5e59c6da4 Avoid drawable invalidation during draw() 
Prevents infinite invalidation loop when reusing a drawable asset within
a single draw() call. Also reduces unnecessary extra invalidations due to
drawable setters (ex. setBounds()) being called during draw().

Bug: 26329675
Change-Id: I31b3c99e8efd4193415cc562a84c8939a2f56c2d
(cherry picked from commit 8cda8e915916b3166e4496589b802fd1ed553c77)
 2016-01-12 15:07:47 +00:00
Alan Viverette
ec2891b562 Handle null result from getVirtualChildAt() 
Also adds final where the method was being called, adds Nullable
annotation to method, and updates docs.

Bug: 25985497
Change-Id: I847a8507f2e3970f1340cddf4abf8650dda22b35
(cherry picked from commit ad52693cf3dfe3f5e84f5a22fe4c3787f2f2cbfb)
 2016-01-12 14:23:05 +00:00
Doris Liu
a73abeaf4b Merge "Get animation update timing for AVD" into mnc-dr1.5-dev 2016-01-12 01:36:23 +00:00
Raph Levien
9f2c939730 Merge changes from topic 'grapheme-dr1.5' into mnc-dr1.5-dev 
* changes:
  Respect grapheme clusters in Layout#getOffsetForHorizontal.
  Fix: Cursor can be at an invalid offset in EditText.
 2016-01-12 01:10:52 +00:00
Raph Levien
36c5ab3542 Merge "Fix measurement to respect grapheme and span boundaries" into mnc-dr1.5-dev 2016-01-12 01:10:52 +00:00
Adam Lesinski
15df80f069 Merge "UsageStatsService: Fix app idle issue at rollover time" into mnc-dr1.5-dev 2016-01-12 00:28:28 +00:00
Doris Liu
fc8e3cb768 Get animation update timing for AVD 
The goal for this change is to get the timing for animation update. Since
AnimatorSet does not support update listeners, we have to go with the a different
approach, which sets up a value animator that runs between the start and end of
the AnimatorSet. We can then get the animation update timing from the ValueAnimator.

Bug: 26329675
Change-Id: Ibe7fce81eb6da5e05c87a732c1d3bc904b4e5e6f
(cherry picked from commit I378a0964da8f7090f65f6b56275a302e30668835)
 2016-01-12 00:22:53 +00:00
Keisuke Kuroyanagi
5bff01d72f Respect grapheme clusters in Layout#getOffsetForHorizontal. 
TextUtils#getOffsetAfter was used for getting the next
offset in Layout#getOffsetForHorizontal. However, this
method doesn't treat grapheme clusters properly.
Changed to use TextLine#getOffsetToLeftRightOf instead of
TextUtils#getOffsetAfter.

Bug: 25375561
Change-Id: I96c9e6e5da65adfb5266446ecab852c52628dbb5
 2016-01-11 14:32:55 -08:00
Keisuke Kuroyanagi
720edf95db Fix: Cursor can be at an invalid offset in EditText. 
"getLineEnd(line) - 1" is used as the return value when the
"horiz" is beyond the line end for multiple line text.
In this case, the returned value can point an invalid
offset like the middle point of a surrogate pair.

Bug: 23069901
Change-Id: I1afef7205a15079a42bb0018df73f70fe9ada862
(cherry picked from commit 00ad16d1cd24b788262ab4f62935e720a392da6d)
 2016-01-11 22:29:12 +00:00
Raph Levien
909c7bca57 Fix measurement to respect grapheme and span boundaries 
When measuring in TextLine (important for cursor positioning), the
substring measured must neither be too short (it can't just be the
substring up to the measure limit, but must include additional
characters if they form a ligature) nor too long (it can't extend
beyond the end of the CharacterStyle span, otherwise the measurement
fails to account for the fact that the CharacterStyle span boundary
breaks the ligature). This patch gets it just right.

Bug: 25375561
Change-Id: I36e1c4bdc66424d3b611cf54031756cf54cf3fec
 2016-01-11 21:43:24 +00:00
Sungmin Choi
d3b2826a1a Add carrier config variable to support editable wfc mode 
Some operators support Wi-Fi Calling only, not VoLTE.
They don't need "Cellular preferred" option.
In this case, set uneditalbe attribute for preferred preference.

Bug: 26299288
Change-Id: I58b44bbd85bb5ef436d32a5e34d7372532695b91
 2016-01-11 11:07:06 -08:00
Geoff Mendal
4c042b096e Merge "Revert "Import translations. DO NOT MERGE"" into lmp-mr1-ub-dev am: 66841a62f1 -s ours am: 73992aee94 -s ours am: 0663959eb7 -s ours 
am: 8635657b17  -s ours

* commit '8635657b176ee9f80e8f57a7d1da9278722ff8a0':
  Revert "Import translations. DO NOT MERGE"
 2016-01-11 15:51:36 +00:00
Geoff Mendal
8635657b17 Merge "Revert "Import translations. DO NOT MERGE"" into lmp-mr1-ub-dev am: 66841a62f1 -s ours am: 73992aee94 -s ours 
am: 0663959eb7  -s ours

* commit '0663959eb73127a49d0a72a70000f3b092adc3e6':
  Revert "Import translations. DO NOT MERGE"
 2016-01-11 15:46:49 +00:00
Geoff Mendal
0663959eb7 Merge "Revert "Import translations. DO NOT MERGE"" into lmp-mr1-ub-dev am: 66841a62f1 -s ours 
am: 73992aee94  -s ours

* commit '73992aee94ce78b8827fe05bb5537068a96c835d':
  Revert "Import translations. DO NOT MERGE"
 2016-01-11 15:42:10 +00:00
Geoff Mendal
73992aee94 Merge "Revert "Import translations. DO NOT MERGE"" into lmp-mr1-ub-dev 
am: 66841a62f1  -s ours

* commit '66841a62f1d71eba843e69d1c8b5ca9453c5b42b':
  Revert "Import translations. DO NOT MERGE"
 2016-01-11 15:37:27 +00:00
Geoff Mendal
66841a62f1 Merge "Revert "Import translations. DO NOT MERGE"" into lmp-mr1-ub-dev 2016-01-11 15:33:48 +00:00
Geoff Mendal
376082a67f Revert "Import translations. DO NOT MERGE" 
This reverts commit a4505e926410cbf20dcd301f35f3496628cad9de.

Change-Id: I5929282b07b1df7a3d618e3be00974609cfcc5cf
 2016-01-11 15:33:28 +00:00
Geoff Mendal
ddee7d949d Merge branch 'mnc-dr1.5-dev' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/frameworks/base into mnc-dr1.5-dev 2016-01-11 14:57:38 +00:00
Geoff Mendal
38aaa9981a Revert "Import translations. DO NOT MERGE" am: 8874f9754f -s ours am: 4df8f4abe0 -s ours am: 009fb756ec -s ours am: b409a99ccc -s ours am: 14c37a57ea -s ours am: 0b8de39728 -s ours 
am: 9f094ac04d  -s ours

* commit '9f094ac04d55cc3a2da2038cc3f3e46dc472269b':
  Revert "Import translations. DO NOT MERGE"
 2016-01-11 14:57:07 +00:00
Geoff Mendal
7053b8926f Revert "Import translations. DO NOT MERGE" am: 8874f9754f -s ours am: 4df8f4abe0 -s ours am: 009fb756ec -s ours am: b409a99ccc -s ours am: 14c37a57ea -s ours am: 0b8de39728 -s ours 
am: 9f094ac04d  -s ours

* commit '9f094ac04d55cc3a2da2038cc3f3e46dc472269b':
  Revert "Import translations. DO NOT MERGE"
 2016-01-11 14:56:01 +00:00
Geoff Mendal
67ba224dbf Import translations. DO NOT MERGE am: 9f9e736e0d -s ours am: b441c6926b -s ours am: 83bf32ebe5 -s ours am: 42692affe2 -s ours am: 8ea585955c -s ours am: 4ae777097e -s ours 
am: 23c92d99cf  -s ours

* commit '23c92d99cf4f613f212710e73bb46c9c5895918f':
  Import translations. DO NOT MERGE
 2016-01-11 14:54:39 +00:00
Geoff Mendal
9f094ac04d Revert "Import translations. DO NOT MERGE" am: 8874f9754f -s ours am: 4df8f4abe0 -s ours am: 009fb756ec -s ours am: b409a99ccc -s ours am: 14c37a57ea -s ours 
am: 0b8de39728  -s ours

* commit '0b8de39728014ad51ff6784a3850a3d752f715e3':
  Revert "Import translations. DO NOT MERGE"
 2016-01-11 14:52:22 +00:00
Geoff Mendal
23c92d99cf Import translations. DO NOT MERGE am: 9f9e736e0d -s ours am: b441c6926b -s ours am: 83bf32ebe5 -s ours am: 42692affe2 -s ours am: 8ea585955c -s ours 
am: 4ae777097e  -s ours

* commit '4ae777097e4242e546c0b7e477cbd0829689dff5':
  Import translations. DO NOT MERGE
 2016-01-11 14:50:39 +00:00
Geoff Mendal
0b8de39728 Revert "Import translations. DO NOT MERGE" am: 8874f9754f -s ours am: 4df8f4abe0 -s ours am: 009fb756ec -s ours am: b409a99ccc -s ours 
am: 14c37a57ea  -s ours

* commit '14c37a57eaf9fe962fe7ee9ecb33bc883ededf7b':
  Revert "Import translations. DO NOT MERGE"
 2016-01-11 14:45:46 +00:00
Geoff Mendal
14c37a57ea Revert "Import translations. DO NOT MERGE" am: 8874f9754f -s ours am: 4df8f4abe0 -s ours am: 009fb756ec -s ours 
am: b409a99ccc  -s ours

* commit 'b409a99ccc0a42814f3918c689d06526c09f726b':
  Revert "Import translations. DO NOT MERGE"
 2016-01-11 14:41:17 +00:00
Geoff Mendal
b409a99ccc Revert "Import translations. DO NOT MERGE" am: 8874f9754f -s ours am: 4df8f4abe0 -s ours 
am: 009fb756ec  -s ours

* commit '009fb756ecabd78e5300c619c267f2e55cfd0922':
  Revert "Import translations. DO NOT MERGE"
 2016-01-11 14:36:52 +00:00
Geoff Mendal
009fb756ec Revert "Import translations. DO NOT MERGE" am: 8874f9754f -s ours 
am: 4df8f4abe0  -s ours

* commit '4df8f4abe076d870b0e406efcd9c2d7cb6e4c81f':
  Revert "Import translations. DO NOT MERGE"
 2016-01-11 14:32:35 +00:00
Geoff Mendal
4df8f4abe0 Revert "Import translations. DO NOT MERGE" 
am: 8874f9754f  -s ours

* commit '8874f9754f909dafcc2c5c23109e35297263f469':
  Revert "Import translations. DO NOT MERGE"
 2016-01-11 14:28:57 +00:00
Geoff Mendal
d344dc256b Revert "Import translations. DO NOT MERGE" am: 9e5fe1a7da -s ours am: 1c51eb41ee -s ours am: eab7785333 -s ours 
am: 2ed7b6d82a  -s ours

* commit '2ed7b6d82a921f085ee22914ecb0a09456ac44ed':
  Revert "Import translations. DO NOT MERGE"
 2016-01-11 14:28:55 +00:00
Geoff Mendal
8874f9754f Revert "Import translations. DO NOT MERGE" 
This reverts commit 9f9e736e0dc08f7fd84d3b557ee4ae8212c61be4.

Change-Id: I7164f13dedd0713b948b4f6bcf4b54aa0bdcc0c8
 2016-01-11 14:24:19 +00:00
Geoff Mendal
2ed7b6d82a Revert "Import translations. DO NOT MERGE" am: 9e5fe1a7da -s ours am: 1c51eb41ee -s ours 
am: eab7785333  -s ours

* commit 'eab778533331bc25b3b201ebb9519a016a451ae4':
  Revert "Import translations. DO NOT MERGE"
 2016-01-11 14:22:02 +00:00
Geoff Mendal
4ae777097e Import translations. DO NOT MERGE am: 9f9e736e0d -s ours am: b441c6926b -s ours am: 83bf32ebe5 -s ours am: 42692affe2 -s ours 
am: 8ea585955c  -s ours

* commit '8ea585955c8aa06daa87a6690421f73f98bb036e':
  Import translations. DO NOT MERGE
 2016-01-11 14:16:41 +00:00
Geoff Mendal
eab7785333 Revert "Import translations. DO NOT MERGE" am: 9e5fe1a7da -s ours 
am: 1c51eb41ee  -s ours

* commit '1c51eb41ee57bb2aeff62dd23576c6565a86de17':
  Revert "Import translations. DO NOT MERGE"
 2016-01-11 14:16:40 +00:00
Geoff Mendal
8ea585955c Import translations. DO NOT MERGE am: 9f9e736e0d -s ours am: b441c6926b -s ours am: 83bf32ebe5 -s ours 
am: 42692affe2  -s ours

* commit '42692affe23352b7e0bbcc9ef4d6f5fb661cc943':
  Import translations. DO NOT MERGE
 2016-01-11 14:11:44 +00:00
Geoff Mendal
1c51eb41ee Revert "Import translations. DO NOT MERGE" 
am: 9e5fe1a7da  -s ours

* commit '9e5fe1a7da02055c03b434db04f0927ba174f3f9':
  Revert "Import translations. DO NOT MERGE"
 2016-01-11 14:11:44 +00:00
Geoff Mendal
42692affe2 Import translations. DO NOT MERGE am: 9f9e736e0d -s ours am: b441c6926b -s ours 
am: 83bf32ebe5  -s ours

* commit '83bf32ebe589fa2ed4c8501eb6b0def97e2dd9ac':
  Import translations. DO NOT MERGE
 2016-01-11 14:05:05 +00:00
Geoff Mendal
9e5fe1a7da Revert "Import translations. DO NOT MERGE" 
This reverts commit f7e5202668cd2b0dc26a65e46b68a4267567bce0.

Change-Id: Ia54e4b766ea2a9f9815baef29df546605d1c3672
 2016-01-11 14:04:51 +00:00
Geoff Mendal
83bf32ebe5 Import translations. DO NOT MERGE am: 9f9e736e0d -s ours 
am: b441c6926b  -s ours

* commit 'b441c6926bbc977956cd1cb6afcc338b09e5d6e3':
  Import translations. DO NOT MERGE
 2016-01-11 13:59:58 +00:00
Geoff Mendal
82666a9f2a Import translations. DO NOT MERGE am: a4505e9264 -s ours am: bc3b9e2a83 -s ours am: a6a761d9fd -s ours 
am: a8ae80950e  -s ours

* commit 'a8ae80950eae564cae9b8bf3b8146eede57317c7':
  Import translations. DO NOT MERGE
 2016-01-11 13:59:57 +00:00
Geoff Mendal
62e77bd206 Import translations. DO NOT MERGE am: f7e5202668 -s ours am: 0b1a880876 -s ours am: f272b0a87e -s ours 
am: 0c6bf20b04  -s ours

* commit '0c6bf20b04b8eb3c3b66d563ed497491ddb511c5':
  Import translations. DO NOT MERGE
 2016-01-11 13:57:31 +00:00
Geoff Mendal
b441c6926b Import translations. DO NOT MERGE 
am: 9f9e736e0d  -s ours

* commit '9f9e736e0dc08f7fd84d3b557ee4ae8212c61be4':
  Import translations. DO NOT MERGE
 2016-01-11 13:54:49 +00:00