Commit Graph

214052 Commits

Author SHA1 Message Date
Michael Wright
cb034e495c Merge "Animate backlight quickly when display state request to change or power mode changed"
am: 3a87cb0192

* commit '3a87cb0192052e20724b9107bc37d9e2d80978e2':
  Animate backlight quickly when display state request to change or power mode changed
2016-01-12 21:55:08 +00:00
Michael Wright
3a87cb0192 Merge "Animate backlight quickly when display state request to change or power mode changed" 2016-01-12 21:46:38 +00:00
Kenny Root
5defc912cd Merge "Track changes in libcore"
am: a15ef2abab

* commit 'a15ef2abab566468af66d431303a1645069dd094':
  Track changes in libcore
2016-01-12 21:07:06 +00:00
Kenny Root
a15ef2abab Merge "Track changes in libcore" 2016-01-12 20:59:32 +00:00
Kenny Root
790c944eca Track changes in libcore
The OCSP update added some API changes necessary to interact with it.
This change tracks the addition of the API.

Change-Id: I22c0448848747943bc039ff8e8fd0a1f0c531224
2016-01-12 12:58:07 -08:00
Alan Viverette
ea2e422c23 Merge "Avoid drawable invalidation during draw()" into mnc-dr1.5-dev am: cf6885b7b7
am: c783ebc13a

* commit 'c783ebc13a350f3f83dbe0713af9581e39b355ec':
  Avoid drawable invalidation during draw()
2016-01-12 20:43:33 +00:00
Alan Viverette
c783ebc13a Merge "Avoid drawable invalidation during draw()" into mnc-dr1.5-dev
am: cf6885b7b7

* commit 'cf6885b7b7665b5589c0640e1cf4b98780f3aeec':
  Avoid drawable invalidation during draw()
2016-01-12 19:22:16 +00: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
19150f05c4 Merge "Handle null result from getVirtualChildAt()" into mnc-dr1.5-dev am: d9434699e4
am: 9c0890ea4b

* commit '9c0890ea4b2144ac3175d07a09df1dd18f0e2e22':
  Handle null result from getVirtualChildAt()
2016-01-12 19:00:26 +00:00
Jason Monk
8ced692e44 Get data type from service state as well am: 67b2c16a9a
am: 05130f3f23

* commit '05130f3f237efbbf497b770938e0b758a646de1a':
  Get data type from service state as well
2016-01-12 18:58:28 +00:00
Alan Viverette
9c0890ea4b Merge "Handle null result from getVirtualChildAt()" into mnc-dr1.5-dev
am: d9434699e4

* commit 'd9434699e4ef8c528ce01223ee9ef200bfd693e4':
  Handle null result from getVirtualChildAt()
2016-01-12 18:53:45 +00:00
Jason Monk
05130f3f23 Get data type from service state as well
am: 67b2c16a9a

* commit '67b2c16a9a9060d37888bdab4dfadd384a76e9d7':
  Get data type from service state as well
2016-01-12 18:51:32 +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 8cda8e9159)
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 ad52693cf3)
2016-01-12 14:23:05 +00:00
mochangming
f0cb46cd65 Animate backlight quickly when display state request to change or power mode changed
* mAppliedDimming should be false when power request policy is not dim.
  * mAppliedLowPower should be false when low power mode is disabled.
  * Backlight brightness changes quickly.

Change-Id: I44bf9c216554f8dce5abd0520f198824df5e8dcf
Signed-off-by: mochangming <mochangming@xiaomi.com>
2016-01-12 12:42:52 +08:00
Doris Liu
65abc0e3d3 Merge "Get animation update timing for AVD" into mnc-dr1.5-dev am: a73abeaf4b
am: 7537aa7596

* commit '7537aa75968d127525ef8fba84f365514ae789a3':
  Get animation update timing for AVD
2016-01-12 01:44:19 +00:00
Doris Liu
7537aa7596 Merge "Get animation update timing for AVD" into mnc-dr1.5-dev
am: a73abeaf4b

* commit 'a73abeaf4b7b158664c34124d8df39ad843f7451':
  Get animation update timing for AVD
2016-01-12 01:39: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
07ee518281 Merge branch 'mnc-dr2-dev-plus-aosp' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/frameworks/base into mnc-dr2-dev-plus-aosp 2016-01-12 01:20:52 +00:00
Raph Levien
957bdc56c5 Merge changes from topic \'grapheme-dr1.5\' into mnc-dr1.5-dev am: 9f2c939730
am: 728a2fa272

* commit '728a2fa2723e6ee68853a55563fbf47aed965435':
  Respect grapheme clusters in Layout#getOffsetForHorizontal.
  Fix: Cursor can be at an invalid offset in EditText.
2016-01-12 01:20:09 +00:00
Raph Levien
6c0276ce63 Merge changes from topic \'grapheme-dr1.5\' into mnc-dr1.5-dev am: 9f2c939730
am: 728a2fa272

* commit '728a2fa2723e6ee68853a55563fbf47aed965435':
  Respect grapheme clusters in Layout#getOffsetForHorizontal.
  Fix: Cursor can be at an invalid offset in EditText.
2016-01-12 01:19:11 +00:00
Raph Levien
243efe13a4 Merge "Fix measurement to respect grapheme and span boundaries" into mnc-dr1.5-dev am: 36c5ab3542
am: 50c22adc25

* commit '50c22adc2564fa1c31b9d0aea88707da4299d6ed':
  Fix measurement to respect grapheme and span boundaries
2016-01-12 01:17:37 +00:00
Raph Levien
728a2fa272 Merge changes from topic \'grapheme-dr1.5\' into mnc-dr1.5-dev
am: 9f2c939730

* commit '9f2c939730730e76afc46e891b82499b499503e1':
  Respect grapheme clusters in Layout#getOffsetForHorizontal.
  Fix: Cursor can be at an invalid offset in EditText.
2016-01-12 01:15:06 +00:00
Raph Levien
50c22adc25 Merge "Fix measurement to respect grapheme and span boundaries" into mnc-dr1.5-dev
am: 36c5ab3542

* commit '36c5ab3542624f9634106390fa34482babe2d8d3':
  Fix measurement to respect grapheme and span boundaries
2016-01-12 01:13:37 +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
551fc6823a Merge "UsageStatsService: Fix app idle issue at rollover time" into mnc-dr1.5-dev am: 15df80f069
am: 1f1cbc01c1

* commit '1f1cbc01c1c137892da86b969dd54d7bc0809280':
  UsageStatsService: Fix app idle issue at rollover time
2016-01-12 00:56:22 +00:00
Adam Lesinski
1f1cbc01c1 Merge "UsageStatsService: Fix app idle issue at rollover time" into mnc-dr1.5-dev
am: 15df80f069

* commit '15df80f069c72989539df560c02f377ae9214ae2':
  UsageStatsService: Fix app idle issue at rollover time
2016-01-12 00:38:09 +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 00ad16d1cd)
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
68514d5325 Add carrier config variable to support editable wfc mode am: d3b2826a1a
am: c52870bb90

* commit 'c52870bb90477af26078afb2be1e3db73a384687':
  Add carrier config variable to support editable wfc mode
2016-01-11 20:36:41 +00:00
Sungmin Choi
c52870bb90 Add carrier config variable to support editable wfc mode
am: d3b2826a1a

* commit 'd3b2826a1a3ff128db1e89a081124192ac70c509':
  Add carrier config variable to support editable wfc mode
2016-01-11 20:31:57 +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
e4476a7904 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 am: 4c042b096e -s ours
am: e7ca49b098  -s ours

* commit 'e7ca49b098cf64c106275703ddae36a5cbf4ade0':
  Revert "Import translations. DO NOT MERGE"
2016-01-11 16:06:23 +00:00
Geoff Mendal
e7ca49b098 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
am: 4c042b096e  -s ours

* commit '4c042b096e3b25f7292d13b4c44d79cb79ebeb36':
  Revert "Import translations. DO NOT MERGE"
2016-01-11 16:01:55 +00: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 a4505e9264.

Change-Id: I5929282b07b1df7a3d618e3be00974609cfcc5cf
2016-01-11 15:33:28 +00:00
Geoff Mendal
4fdce74459 Merge branch \'mnc-dr1.5-dev\' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/frameworks/base into mnc-dr1.5-dev am: ddee7d949d
am: da3a7d4cff

* commit 'da3a7d4cff5b1269ce06e88d94271cb0d4502afa':
2016-01-11 15:07:22 +00:00
Geoff Mendal
ef3e9e66b0 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 am: 38aaa9981a -s ours
am: 188ed31261  -s ours

* commit '188ed31261ed27b764feaa970ac8eea0ed59ff62':
  Revert "Import translations. DO NOT MERGE"
2016-01-11 15:05:31 +00:00
Geoff Mendal
4fdd7772e2 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 am: 67ba224dbf -s ours
am: 18ad80370f  -s ours

* commit '18ad80370f7b96a0edccbfc2801a8f56a093f158':
  Import translations. DO NOT MERGE
2016-01-11 15:03:55 +00:00
Geoff Mendal
da3a7d4cff Merge branch \'mnc-dr1.5-dev\' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/frameworks/base into mnc-dr1.5-dev
am: ddee7d949d

* commit 'ddee7d949dbd1fd5d18e11322532e78cd8330554':
2016-01-11 15:02:10 +00:00