OSDN Git Service
Bryce Lee [Thu, 21 Jan 2016 23:19:06 +0000 (23:19 +0000)]
Merge "DO NOT MERGE ANYWHERE Improve logging in BluetoothHeadsetClientCall." into cw-e-dev
am:
2e7ecddd5b -s ours
* commit '
2e7ecddd5bb13721e5b3d55ee96b9dcf2e9148e6':
DO NOT MERGE ANYWHERE Improve logging in BluetoothHeadsetClientCall.
Bryce Lee [Thu, 21 Jan 2016 23:01:06 +0000 (23:01 +0000)]
Merge "DO NOT MERGE ANYWHERE Improve logging in BluetoothHeadsetClientCall." into cw-e-dev
Bryce Lee [Thu, 21 Jan 2016 22:29:42 +0000 (14:29 -0800)]
DO NOT MERGE ANYWHERE Improve logging in BluetoothHeadsetClientCall.
Change-Id: I3b1b3946ca21c0bbc902a2c521938239a486d98a
Matthew Williams [Thu, 21 Jan 2016 19:13:32 +0000 (19:13 +0000)]
DO NOT MERGE Redact Account info from getCurrentSyncs am:
a5cafd2a93 am:
06ef7dfdf0 am:
5fc753acaf -s ours am:
0d3e46391a am:
9c841923df -s ours am:
a76208d4e4 am:
9e52b29fe2 am:
1f6dbd910b -s ours am:
5cb2597a9d am:
08d7e9608e
am:
c151cec56e
* commit '
c151cec56ec3666b5bb20e8cf7c3dca2500ea353':
DO NOT MERGE Redact Account info from getCurrentSyncs
Matthew Williams [Thu, 21 Jan 2016 19:08:07 +0000 (19:08 +0000)]
DO NOT MERGE Redact Account info from getCurrentSyncs am:
a5cafd2a93 am:
06ef7dfdf0 am:
5fc753acaf -s ours am:
0d3e46391a am:
9c841923df -s ours am:
a76208d4e4 am:
9e52b29fe2 am:
1f6dbd910b -s ours am:
5cb2597a9d
am:
08d7e9608e
* commit '
08d7e9608ea822815b15be15a66f26be664ce541':
DO NOT MERGE Redact Account info from getCurrentSyncs
Matthew Williams [Thu, 21 Jan 2016 19:01:02 +0000 (19:01 +0000)]
DO NOT MERGE Redact Account info from getCurrentSyncs am:
a5cafd2a93 am:
06ef7dfdf0 am:
5fc753acaf -s ours am:
0d3e46391a am:
9c841923df -s ours am:
a76208d4e4 am:
9e52b29fe2 am:
1f6dbd910b -s ours
am:
5cb2597a9d
* commit '
5cb2597a9da3202229fdbc91c12b8e172b2b5667':
DO NOT MERGE Redact Account info from getCurrentSyncs
Matthew Williams [Thu, 21 Jan 2016 18:54:44 +0000 (18:54 +0000)]
DO NOT MERGE Redact Account info from getCurrentSyncs am:
a5cafd2a93 am:
06ef7dfdf0 am:
5fc753acaf -s ours am:
0d3e46391a am:
9c841923df -s ours am:
a76208d4e4 am:
9e52b29fe2
am:
1f6dbd910b -s ours
* commit '
1f6dbd910bf9bf93df8a708209e92add61fbff44':
DO NOT MERGE Redact Account info from getCurrentSyncs
Matthew Williams [Thu, 21 Jan 2016 18:48:55 +0000 (18:48 +0000)]
DO NOT MERGE Redact Account info from getCurrentSyncs am:
a5cafd2a93 am:
06ef7dfdf0 am:
5fc753acaf -s ours am:
0d3e46391a am:
9c841923df -s ours am:
a76208d4e4
am:
9e52b29fe2
* commit '
9e52b29fe27035df4720db582637157ce9ce268d':
DO NOT MERGE Redact Account info from getCurrentSyncs
Matthew Williams [Thu, 21 Jan 2016 18:41:55 +0000 (18:41 +0000)]
DO NOT MERGE Redact Account info from getCurrentSyncs am:
a5cafd2a93 am:
06ef7dfdf0 am:
5fc753acaf -s ours am:
0d3e46391a am:
9c841923df -s ours
am:
a76208d4e4
* commit '
a76208d4e4f7f690f5fde4210a00a5c3022721bd':
DO NOT MERGE Redact Account info from getCurrentSyncs
Matthew Williams [Thu, 21 Jan 2016 18:37:01 +0000 (18:37 +0000)]
DO NOT MERGE Redact Account info from getCurrentSyncs am:
a5cafd2a93 am:
06ef7dfdf0 am:
5fc753acaf -s ours am:
0d3e46391a
am:
9c841923df -s ours
* commit '
9c841923dfc36db046909e388b8a2fda3b694be1':
DO NOT MERGE Redact Account info from getCurrentSyncs
Matthew Williams [Thu, 21 Jan 2016 18:29:33 +0000 (18:29 +0000)]
DO NOT MERGE Redact Account info from getCurrentSyncs am:
a5cafd2a93 am:
06ef7dfdf0 am:
5fc753acaf -s ours
am:
0d3e46391a
* commit '
0d3e46391a0ffa0c428b8c8082195d1cbc4b1efa':
DO NOT MERGE Redact Account info from getCurrentSyncs
Matthew Williams [Thu, 21 Jan 2016 18:19:53 +0000 (18:19 +0000)]
DO NOT MERGE Redact Account info from getCurrentSyncs am:
a5cafd2a93 am:
06ef7dfdf0
am:
5fc753acaf -s ours
* commit '
5fc753acaf9731742957db256b2818376fe8c4a4':
DO NOT MERGE Redact Account info from getCurrentSyncs
Matthew Williams [Thu, 21 Jan 2016 18:14:32 +0000 (18:14 +0000)]
DO NOT MERGE Redact Account info from getCurrentSyncs am:
a5cafd2a93
am:
06ef7dfdf0
* commit '
06ef7dfdf0a3efb44326228c55309ec6df134376':
DO NOT MERGE Redact Account info from getCurrentSyncs
Matthew Williams [Thu, 21 Jan 2016 18:07:55 +0000 (18:07 +0000)]
DO NOT MERGE Redact Account info from getCurrentSyncs
am:
a5cafd2a93
* commit '
a5cafd2a93ce1c481328e2ce25c3bf2a19b81601':
DO NOT MERGE Redact Account info from getCurrentSyncs
Matthew Williams [Tue, 19 Jan 2016 23:04:04 +0000 (23:04 +0000)]
DO NOT MERGE Redact Account info from getCurrentSyncs
BUG:
26094635
If the caller to ContentResolver#getCurrentSyncs does not hold the
GET_ACCOUNTS permission, return a SyncInfo object that does not
contain any Account information.
Change-Id: I5628ebe1f56c8e3f784aaf1b3281e6b829d19314
(cherry picked from commit
b63057e698a01dafcefc7ba09b397b0336bba43d)
Jorim Jaggi [Wed, 20 Jan 2016 00:32:17 +0000 (16:32 -0800)]
Fix SystemUI animator leak
When there was a state change or layout when there was an animation
set as the mobile icon in the status bar, we never stopped the old
animation, which was infinite. This was using more and more CPU because
the animations never got stopped.
To fix this, we don't update the drawable when a layout happens and we
stop the previous animation when replacing the icon.
Bug:
26616870
Change-Id: If501155d1a99d587e50a1b77ebb03a21c940662b
Chenjie Luo [Wed, 20 Jan 2016 23:55:34 +0000 (23:55 +0000)]
Merge "Fix bug in AssetAtlas packing loop" into cw-e-dev
am:
b2b2fb0182
* commit '
b2b2fb018243831144929b1db9db9b8eeab8d984':
Fix bug in AssetAtlas packing loop
Chenjie Luo [Wed, 20 Jan 2016 23:38:46 +0000 (23:38 +0000)]
Merge "Fix bug in AssetAtlas packing loop" into cw-e-dev
Chenjie Luo [Wed, 20 Jan 2016 21:25:11 +0000 (13:25 -0800)]
Fix bug in AssetAtlas packing loop
There is a bug in AssetAtlasService that it always choose the
MAX_SIZE as height. The for loop of height calculation starts
from MAX_SIZE and breaks when it finds a working texture. This
means the height loop will always break for the initial value.
Reording the loop optimize the algorithm to find a smaller
atlas texture. The MIN_SIZE is also changed to 512 for fewer
assets case.
Bug:
26429912
Change-Id: Ic0b2396e9697c417a24f81ec792f8a8af53915ad
Matthew Williams [Wed, 20 Jan 2016 18:31:19 +0000 (18:31 +0000)]
Redact Account info from getCurrentSyncs am:
f39549e389 am:
1a0aed3257 am:
0e7cd0a9fb am:
be136b7a3e am:
a947baa87c am:
0f292147f3 am:
ce3842eb1a
am:
85f169d19f
* commit '
85f169d19f200daa35a30652905d6daf090955c6':
Redact Account info from getCurrentSyncs
Matthew Williams [Wed, 20 Jan 2016 18:08:33 +0000 (18:08 +0000)]
Redact Account info from getCurrentSyncs am:
f39549e389 am:
1a0aed3257 am:
0e7cd0a9fb am:
be136b7a3e am:
a947baa87c am:
0f292147f3
am:
ce3842eb1a
* commit '
ce3842eb1a5184331ee4aad3e36d5f11f999cf2e':
Redact Account info from getCurrentSyncs
Geoff Mendal [Wed, 20 Jan 2016 14:33:02 +0000 (09:33 -0500)]
Import translations. DO NOT MERGE
Change-Id: I875bc3fe8f82fe0b29867e9d4790b2e57c4df566
Auto-generated-cl: translation import
Matthew Williams [Wed, 20 Jan 2016 11:55:52 +0000 (11:55 +0000)]
Redact Account info from getCurrentSyncs am:
f39549e389 am:
1a0aed3257 am:
0e7cd0a9fb am:
be136b7a3e am:
a947baa87c
am:
0f292147f3
* commit '
0f292147f3ac803a8701afd7362ad3e0487fd496':
Redact Account info from getCurrentSyncs
Matthew Williams [Wed, 20 Jan 2016 11:51:42 +0000 (11:51 +0000)]
Redact Account info from getCurrentSyncs am:
f39549e389 am:
1a0aed3257 am:
0e7cd0a9fb am:
be136b7a3e
am:
a947baa87c
* commit '
a947baa87caeb6733846d6de4ef2bf84f7ab0fa1':
Redact Account info from getCurrentSyncs
Matthew Williams [Wed, 20 Jan 2016 11:46:39 +0000 (11:46 +0000)]
Redact Account info from getCurrentSyncs am:
f39549e389 am:
1a0aed3257 am:
0e7cd0a9fb
am:
be136b7a3e
* commit '
be136b7a3e3f117dea283d194d1e6979fb47662b':
Redact Account info from getCurrentSyncs
Matthew Williams [Wed, 20 Jan 2016 11:41:23 +0000 (11:41 +0000)]
Redact Account info from getCurrentSyncs am:
f39549e389 am:
1a0aed3257
am:
0e7cd0a9fb
* commit '
0e7cd0a9fbdcb48c551d54627eb964364dd946d0':
Redact Account info from getCurrentSyncs
Matthew Williams [Wed, 20 Jan 2016 11:37:17 +0000 (11:37 +0000)]
Redact Account info from getCurrentSyncs am:
f39549e389
am:
1a0aed3257
* commit '
1a0aed3257ad1b8216930928090885cf4210bd87':
Redact Account info from getCurrentSyncs
Matthew Williams [Wed, 20 Jan 2016 11:32:56 +0000 (11:32 +0000)]
Redact Account info from getCurrentSyncs
am:
f39549e389
* commit '
f39549e389edf62f43bacd95a1b8580d75ad77ed':
Redact Account info from getCurrentSyncs
Matthew Williams [Tue, 19 Jan 2016 23:04:04 +0000 (23:04 +0000)]
Redact Account info from getCurrentSyncs
BUG:
26094635
If the caller to ContentResolver#getCurrentSyncs does not hold the
GET_ACCOUNTS permission, return a SyncInfo object that does not
contain any Account information.
Change-Id: I5628ebe1f56c8e3f784aaf1b3281e6b829d19314
(cherry picked from commit
b63057e698a01dafcefc7ba09b397b0336bba43d)
Doris Liu [Tue, 19 Jan 2016 19:59:53 +0000 (19:59 +0000)]
Merge "Revert "Get animation update timing for AVD"" into mnc-dr1.5-dev
Doris Liu [Tue, 19 Jan 2016 19:50:18 +0000 (19:50 +0000)]
Revert "Get animation update timing for AVD"
This reverts commit
fc8e3cb768b7dfd7c0ed0fb93dd9d735887e8d45.
Bug:
26616870
Change-Id: I2f018cb34f014f4ebb635e18cd940997507a4a4d
Geoff Mendal [Mon, 18 Jan 2016 14:41:08 +0000 (09:41 -0500)]
Import translations. DO NOT MERGE
Change-Id: I0ff7336ca90107f45266090de0ffc634daa54722
Auto-generated-cl: translation import
Thierry Strudel [Fri, 15 Jan 2016 23:44:45 +0000 (23:44 +0000)]
Merge "Supply content description for QS disconnect buttons" into mnc-dr1.5-dev
Daniel Sandler [Fri, 15 Jan 2016 21:05:41 +0000 (21:05 +0000)]
Merge "Stop leaking Notifications when they change groupKeys." into mnc-dr1.5-dev
Dan Sandler [Thu, 14 Jan 2016 20:49:36 +0000 (15:49 -0500)]
Stop leaking Notifications when they change groupKeys.
If a Notification changes groups (either from one group to
another, or gets a group key for the first time, which takes
it out of its implicit singleton group) it should be removed
from the old group in NotificationGroupManager's mGroupMap
and re-inserted under the new one.
Unfortunately we were passing the *new* notification in the
oldNotification argument, so we would always attempt (and
fail) to remove it from the *new* group, leaving a strong
reference to the Notification inside mGroupMap under an
obsolete group key.
Bug:
26561365
Change-Id: Ie5cdceb4f843dbd363652e00fbc0f3ac6f6ef247
Ian Pedowitz [Thu, 14 Jan 2016 22:18:32 +0000 (22:18 +0000)]
Merge "DO NOT MERGE Fix for syncs being dropped when appIdle is on" into mnc-dr1.5-dev
Alan Viverette [Thu, 14 Jan 2016 21:06:36 +0000 (16:06 -0500)]
Don't verify the scrollbar drawable
Avoids infinite invalidations caused by re-use of scrollbar drawable
during a single draw() pass. Does not address the general problem of
drawable reuse causing unnecessary invalidations as a result of calls
to setBounds() invoking invalidateSelf().
Bug:
26533725
Change-Id: I99e9c2dfe4ddfc833569e40e7268dcb03e931fc9
Dan Sandler [Thu, 14 Jan 2016 16:33:54 +0000 (11:33 -0500)]
Supply content description for QS disconnect buttons
Bug:
26555270
Change-Id: I3803c7ad78a64894eca5c36f5d9ecf7fc4a6ad92
Shreyas Basarge [Mon, 11 Jan 2016 15:43:54 +0000 (15:43 +0000)]
DO NOT MERGE Fix for syncs being dropped when appIdle is on
Syncs were being dropped when appIdleMode was on for
an app. This CL backs off the sync instead of dropping
it. When the app becomes non-idle, backoff is cleared
and the sync is performed.
Bug:
26355386
Change-Id: I2040dfd847011d3ca902e66a8cd52b2a429177c1
Justin Harrison [Thu, 14 Jan 2016 06:42:20 +0000 (06:42 +0000)]
Merge "Fix race condition when setting default ringtones" into mnc-dr1.5-dev
Amit Mahajan [Thu, 14 Jan 2016 06:28:47 +0000 (06:28 +0000)]
Merge "Allow turning off Wi-Fi when emergency call is made [DO NOT MERGE]" into mnc-dr1.5-dev
Amit Mahajan [Thu, 14 Jan 2016 06:26:26 +0000 (06:26 +0000)]
Merge "DO NOT MERGE Adding new intent for EMERGENCY_CALL_STATE_CHANGE" into mnc-dr1.5-dev
Vinit Deshpande [Thu, 14 Jan 2016 00:58:30 +0000 (16:58 -0800)]
Allow turning off Wi-Fi when emergency call is made [DO NOT MERGE]
Bug:
24147407
Change-Id: Ia07b8bc4ccbdaeea18ed22fbfcf813f71ddfa7dc
Chenjie Luo [Thu, 14 Jan 2016 02:24:48 +0000 (02:24 +0000)]
Merge "Add STEM_1, STEM_2 and STEM_3 key as wakeup keys" into cw-e-dev
am:
4a577bff96
* commit '
4a577bff9674f4bc748ab76bf48ac6e7d3e567cc':
Add STEM_1, STEM_2 and STEM_3 key as wakeup keys
Chenjie Luo [Thu, 14 Jan 2016 02:22:15 +0000 (02:22 +0000)]
Merge "Add STEM_1, STEM_2 and STEM_3 key as wakeup keys" into cw-e-dev
Amit Mahajan [Wed, 13 Jan 2016 02:25:33 +0000 (18:25 -0800)]
DO NOT MERGE Adding new intent for EMERGENCY_CALL_STATE_CHANGE
Bug:
24147407
Change-Id: Ida957b9cc6b9c3e13bc8660213ce5cf979c886d5
Chenjie Luo [Wed, 13 Jan 2016 19:01:59 +0000 (11:01 -0800)]
Add STEM_1, STEM_2 and STEM_3 key as wakeup keys
Bug:
25860409
Change-Id: I3f525c9c8df81807d98391c70cd2d1f8c139c8f5
Adam Lesinski [Thu, 14 Jan 2016 00:45:31 +0000 (00:45 +0000)]
Merge "UsageStats: Use new settings key idle_duration2 for app idle" into mnc-dr1.5-dev
Nancy Zheng [Wed, 13 Jan 2016 23:59:42 +0000 (23:59 +0000)]
Pulling in https://android-review.googlesource.com/#/c/186482/1
am:
74dfcf90f1
* commit '
74dfcf90f18d8d0e1128707a5986c4fa94d70350':
Pulling in https://android-review.googlesource.com/#/c/186482/1
Nancy Zheng [Wed, 13 Jan 2016 23:23:56 +0000 (15:23 -0800)]
Pulling in https://android-review.googlesource.com/#/c/186482/1
Fix memory leak in HWUI
std::unique_ptr::release just releases the ownership of the
managed object. To delete the object, std::unique_ptr::reset
function should be called.
Bug:
26116596
Change-Id: If65f74085b1fc2be3a9fffc433326e0bcdb40ff3
Selim Cinek [Wed, 13 Jan 2016 23:01:13 +0000 (23:01 +0000)]
Merge "Fixed a crash with the heads up manager" into mnc-dr1.5-dev
Ian Pedowitz [Wed, 13 Jan 2016 22:47:45 +0000 (22:47 +0000)]
Merge "Revert "Avoid drawable invalidation during draw()"" into mnc-dr1.5-dev
Alan Viverette [Wed, 13 Jan 2016 21:49:10 +0000 (21:49 +0000)]
Revert "Avoid drawable invalidation during draw()"
This reverts commit
e5e59c6da424096da8f57137cdc57d8bd410b079.
Drawables expect to be able to call invalidateSelf() during
draw() to pump animation frames. We shouldn't break this.
Bug:
26533725
Change-Id: Ibe2871f2622faf836637225fc1e3e6f0ca6def47
Selim Cinek [Fri, 6 Nov 2015 19:33:20 +0000 (11:33 -0800)]
Fixed a crash with the heads up manager
Bug:
25693389
Change-Id: Id852e342000bff6de0ce19f442eb53b21e935b7b
Adam Lesinski [Wed, 13 Jan 2016 20:26:07 +0000 (12:26 -0800)]
UsageStats: Use new settings key idle_duration2 for app idle
Ignores the old, re-appropriated key "idle_duration" which is now
set to a high value in order to force disable app idle on devices
with bug b/
26355386
Bug:
26355386
Change-Id: Iff9de843ad6e547d29c1583687fc7f7ce7e15090
Pavel Zhamaitsiak [Wed, 13 Jan 2016 20:30:46 +0000 (20:30 +0000)]
Merge "Add WiFi Calling overlays for T-Mobile's MCCMNCs" into mnc-dr1.5-dev
Pavel Zhamaitsiak [Wed, 13 Jan 2016 19:19:05 +0000 (11:19 -0800)]
Add WiFi Calling overlays for T-Mobile's MCCMNCs
Bug:
26024279
Change-Id: I71920fc45dec3e4fe5a3f4e349ff1ba3df703000
Keisuke Kuroyanagi [Wed, 13 Jan 2016 06:47:34 +0000 (15:47 +0900)]
Tests for getPrimaryHorizontal with grapheme boundaries
Bug:
25375561
Change-Id: I022473627499d7f18105e3a300754fae5be7da8e
Adam Lesinski [Wed, 13 Jan 2016 01:48:45 +0000 (01:48 +0000)]
Merge "UsageStats: Fix issue where initializing data for first time would cause crash" into mnc-dr1.5-dev
Adam Lesinski [Tue, 12 Jan 2016 18:36:09 +0000 (10:36 -0800)]
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
Matthew Bouyack [Tue, 12 Jan 2016 22:33:09 +0000 (22:33 +0000)]
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.
Matthew Bouyack [Tue, 12 Jan 2016 22:28:21 +0000 (22:28 +0000)]
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
Matthew Bouyack [Tue, 12 Jan 2016 20:01:48 +0000 (12:01 -0800)]
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
Alan Viverette [Tue, 12 Jan 2016 19:18:28 +0000 (19:18 +0000)]
Merge "Avoid drawable invalidation during draw()" into mnc-dr1.5-dev
Alan Viverette [Tue, 12 Jan 2016 18:19:33 +0000 (18:19 +0000)]
Merge "Handle null result from getVirtualChildAt()" into mnc-dr1.5-dev
Marco Nelissen [Fri, 6 Nov 2015 00:44:52 +0000 (16:44 -0800)]
Fix race condition when setting default ringtones
If the device was powered off during first boot, after media scanner
inserted some entries but before the default ringtone settings were
set (or committed to disk), the default settings would not be set
on subsequent boots.
Bug:
18625739
Bug:
22349910
Bug:
25633323
Change-Id: I8ff5d3c4f842297d0675e1f5cbe17c0709a14158
Jason Monk [Tue, 12 Jan 2016 15:24:09 +0000 (10:24 -0500)]
Get data type from service state as well
Bug:
26276354
Bug:
26413831
Change-Id: Ic080300db7d5e5200caf611cc2ee1ef3af93736e
Alan Viverette [Mon, 4 Jan 2016 17:36:28 +0000 (12:36 -0500)]
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)
Alan Viverette [Thu, 17 Dec 2015 17:42:39 +0000 (12:42 -0500)]
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)
Doris Liu [Tue, 12 Jan 2016 01:36:23 +0000 (01:36 +0000)]
Merge "Get animation update timing for AVD" into mnc-dr1.5-dev
Raph Levien [Tue, 12 Jan 2016 01:10:52 +0000 (01:10 +0000)]
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.
Raph Levien [Tue, 12 Jan 2016 01:10:52 +0000 (01:10 +0000)]
Merge "Fix measurement to respect grapheme and span boundaries" into mnc-dr1.5-dev
Adam Lesinski [Tue, 12 Jan 2016 00:28:28 +0000 (00:28 +0000)]
Merge "UsageStatsService: Fix app idle issue at rollover time" into mnc-dr1.5-dev
Doris Liu [Thu, 7 Jan 2016 22:24:57 +0000 (14:24 -0800)]
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)
Keisuke Kuroyanagi [Fri, 8 Jan 2016 10:55:17 +0000 (19:55 +0900)]
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
Keisuke Kuroyanagi [Thu, 27 Aug 2015 09:15:48 +0000 (18:15 +0900)]
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)
Raph Levien [Tue, 1 Dec 2015 05:05:46 +0000 (21:05 -0800)]
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
Sungmin Choi [Wed, 23 Dec 2015 05:10:41 +0000 (14:10 +0900)]
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
Geoff Mendal [Mon, 11 Jan 2016 15:51:36 +0000 (15:51 +0000)]
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"
Geoff Mendal [Mon, 11 Jan 2016 15:46:49 +0000 (15:46 +0000)]
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"
Geoff Mendal [Mon, 11 Jan 2016 15:42:10 +0000 (15:42 +0000)]
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"
Geoff Mendal [Mon, 11 Jan 2016 15:37:27 +0000 (15:37 +0000)]
Merge "Revert "Import translations. DO NOT MERGE"" into lmp-mr1-ub-dev
am:
66841a62f1 -s ours
* commit '
66841a62f1d71eba843e69d1c8b5ca9453c5b42b':
Revert "Import translations. DO NOT MERGE"
Geoff Mendal [Mon, 11 Jan 2016 15:33:48 +0000 (15:33 +0000)]
Merge "Revert "Import translations. DO NOT MERGE"" into lmp-mr1-ub-dev
Geoff Mendal [Mon, 11 Jan 2016 15:33:28 +0000 (15:33 +0000)]
Revert "Import translations. DO NOT MERGE"
This reverts commit
a4505e926410cbf20dcd301f35f3496628cad9de.
Change-Id: I5929282b07b1df7a3d618e3be00974609cfcc5cf
Geoff Mendal [Mon, 11 Jan 2016 14:57:38 +0000 (14:57 +0000)]
Merge branch 'mnc-dr1.5-dev' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/frameworks/base into mnc-dr1.5-dev
Geoff Mendal [Mon, 11 Jan 2016 14:57:07 +0000 (14:57 +0000)]
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"
Geoff Mendal [Mon, 11 Jan 2016 14:56:01 +0000 (14:56 +0000)]
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"
Geoff Mendal [Mon, 11 Jan 2016 14:54:39 +0000 (14:54 +0000)]
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
Geoff Mendal [Mon, 11 Jan 2016 14:52:22 +0000 (14:52 +0000)]
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"
Geoff Mendal [Mon, 11 Jan 2016 14:50:39 +0000 (14:50 +0000)]
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
Geoff Mendal [Mon, 11 Jan 2016 14:45:46 +0000 (14:45 +0000)]
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"
Geoff Mendal [Mon, 11 Jan 2016 14:41:17 +0000 (14:41 +0000)]
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"
Geoff Mendal [Mon, 11 Jan 2016 14:36:52 +0000 (14:36 +0000)]
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"
Geoff Mendal [Mon, 11 Jan 2016 14:32:35 +0000 (14:32 +0000)]
Revert "Import translations. DO NOT MERGE" am:
8874f9754f -s ours
am:
4df8f4abe0 -s ours
* commit '
4df8f4abe076d870b0e406efcd9c2d7cb6e4c81f':
Revert "Import translations. DO NOT MERGE"
Geoff Mendal [Mon, 11 Jan 2016 14:28:57 +0000 (14:28 +0000)]
Revert "Import translations. DO NOT MERGE"
am:
8874f9754f -s ours
* commit '
8874f9754f909dafcc2c5c23109e35297263f469':
Revert "Import translations. DO NOT MERGE"
Geoff Mendal [Mon, 11 Jan 2016 14:28:55 +0000 (14:28 +0000)]
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"
Geoff Mendal [Mon, 11 Jan 2016 14:24:19 +0000 (14:24 +0000)]
Revert "Import translations. DO NOT MERGE"
This reverts commit
9f9e736e0dc08f7fd84d3b557ee4ae8212c61be4.
Change-Id: I7164f13dedd0713b948b4f6bcf4b54aa0bdcc0c8
Geoff Mendal [Mon, 11 Jan 2016 14:22:02 +0000 (14:22 +0000)]
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"
Geoff Mendal [Mon, 11 Jan 2016 14:16:41 +0000 (14:16 +0000)]
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
Geoff Mendal [Mon, 11 Jan 2016 14:16:40 +0000 (14:16 +0000)]
Revert "Import translations. DO NOT MERGE" am:
9e5fe1a7da -s ours
am:
1c51eb41ee -s ours
* commit '
1c51eb41ee57bb2aeff62dd23576c6565a86de17':
Revert "Import translations. DO NOT MERGE"