Yi Jin
c82d4ed96a
Merge "Only replace new line characters if the wakelock name contains one The original operation creates new string everytime which is expensive"
2017-08-04 20:52:03 +00:00
Yi Jin
8529150860
Only replace new line characters if the wakelock name contains one
...
The original operation creates new string everytime which is expensive
Bug: 64272195
Test: NA
Change-Id: Id93d588a7d5a6b6c192a057fcd4296bd1c508516
2017-08-04 13:27:20 -07:00
TreeHugger Robot
b186823314
Merge "Improve TextView.onMeasure() for multiline text."
2017-08-04 19:24:01 +00:00
Seigo Nonaka
917748ef50
Improve TextView.onMeasure() for multiline text.
...
Previously, measures all paragraph for deciding view width.
However, in case AT_MOST measurment, we can stop calculating measure if
the measured paragraph already exceeds the upper limit.
Bug: 64389125
Test: bit CtsWidgetTestCases:*
Test: CorePerfTest. Here is a result before and after this patch.
Before:
INSTRUMENTATION_STATUS: measure_AtMost_median=50332114
INSTRUMENTATION_STATUS: measure_Exactly_median=28276317
INSTRUMENTATION_STATUS: measure_Unspecified_median=50193036
After:
INSTRUMENTATION_STATUS: measure_AtMost_median=28475187
INSTRUMENTATION_STATUS: measure_Exactly_median=26944710
INSTRUMENTATION_STATUS: measure_Unspecified_median=50880088
Change-Id: I2a39eb39817a8f845c4fa2e174a905a2d057096e
2017-08-04 17:21:06 +00:00
Andrei Stingaceanu
b969b3eb98
Merge "AutoSize TextView - fix transformation method" into oc-mr1-dev am: 8719c2a8e6
...
am: 45d18e2834
2017-08-04 13:32:21 +00:00
Andrei Stingaceanu
45d18e2834
Merge "AutoSize TextView - fix transformation method" into oc-mr1-dev
...
am: 8719c2a8e6
2017-08-04 13:20:16 +00:00
Andrei Stingaceanu
8719c2a8e6
Merge "AutoSize TextView - fix transformation method" into oc-mr1-dev
2017-08-04 13:08:40 +00:00
TreeHugger Robot
680a74c056
Merge "Refactor TextView TextAppearance attributes reading"
2017-08-04 07:58:00 +00:00
Tadashi G. Takaoka
93dcf32590
Remove @hide ACTION_SHOW_INPUT_METHOD_PICKER am: 7b16a3c64a
...
am: 7d7f68d49f
2017-08-04 05:26:10 +00:00
Tadashi G. Takaoka
7d7f68d49f
Remove @hide ACTION_SHOW_INPUT_METHOD_PICKER
...
am: 7b16a3c64a
2017-08-04 05:14:36 +00:00
Tadashi G. Takaoka
7b16a3c64a
Remove @hide ACTION_SHOW_INPUT_METHOD_PICKER
...
All references to
android.provider.Settings.ACTION_SHOW_INPUT_METHOD_PICKER have been
removed by the following CLs.
Id36c8c34159bea8b72557b40bcf024d401f580b6 frameworks/base
Id990c66516c9b3ed7ada6891746ec0e0eecbe545 packages/apps/Settings
I915231678b94f97c1b5105cb607d6631e3df6b6a vendor/google_clockworks
I3e26ed807445725262485ac1065fdfa299d1b624 cts
Test: make checkbuild
Fixes: 64008672
Bug: 6364455
Change-Id: I4210a5b5662be497d395a454f7f1cc395637683e
2017-08-04 04:30:33 +00:00
Yi Jin
a92f00b750
Merge "There must not have newline character in wakelock name" into oc-mr1-dev
...
am: 10841a9670
2017-08-04 02:27:58 +00:00
TreeHugger Robot
10841a9670
Merge "There must not have newline character in wakelock name" into oc-mr1-dev
2017-08-04 02:18:50 +00:00
Amith Yamasani
d76830053d
Merge "Ignore isolated uid's process state in BatteryStats tracking" into oc-dr1-dev am: 5a800cf069 am: 26f8f5c868
...
am: 7d00772ceb
2017-08-03 23:40:10 +00:00
Christopher Tate
1fb409cbf5
Merge "Use normal API for legacy wallpaper restore" into oc-mr1-dev am: 4204f1658c
...
am: 454f1466b7
2017-08-03 23:30:09 +00:00
Amith Yamasani
7d00772ceb
Merge "Ignore isolated uid's process state in BatteryStats tracking" into oc-dr1-dev am: 5a800cf069
...
am: 26f8f5c868
2017-08-03 23:29:23 +00:00
Christopher Tate
454f1466b7
Merge "Use normal API for legacy wallpaper restore" into oc-mr1-dev
...
am: 4204f1658c
2017-08-03 23:18:57 +00:00
Amith Yamasani
26f8f5c868
Merge "Ignore isolated uid's process state in BatteryStats tracking" into oc-dr1-dev
...
am: 5a800cf069
2017-08-03 23:18:32 +00:00
Amith Yamasani
6aaaa2bbb0
Merge "Ignore isolated uid's process state in BatteryStats tracking" into oc-dr1-dev
...
am: 5a800cf069
2017-08-03 23:18:29 +00:00
TreeHugger Robot
bb29df8b14
Merge "Reverse check for multi-character ellipsis"
2017-08-03 23:16:46 +00:00
TreeHugger Robot
4204f1658c
Merge "Use normal API for legacy wallpaper restore" into oc-mr1-dev
2017-08-03 23:07:53 +00:00
Amith Yamasani
5a800cf069
Merge "Ignore isolated uid's process state in BatteryStats tracking" into oc-dr1-dev
2017-08-03 23:07:32 +00:00
Lucas Dupin
89f58e156e
Merge "Multi-user and WallpaperColors" into oc-dr1-dev
...
am: e09e5ef21b
2017-08-03 22:56:54 +00:00
Yi Jin
1533ffdc3e
There must not have newline character in wakelock name
...
Bug: 64272195
Test: N/A
Change-Id: I07a7d9b9dfbf69acba0123bf4ec6e309c2a5a359
(cherry picked from commit dd214c2d36
2017-08-03 22:56:15 +00:00
Yi Jin
be738c5a28
Merge "There must not have newline character in wakelock name"
2017-08-03 22:53:10 +00:00
Lucas Dupin
e09e5ef21b
Merge "Multi-user and WallpaperColors" into oc-dr1-dev
2017-08-03 22:48:27 +00:00
Roozbeh Pournader
55fd45b273
Reverse check for multi-character ellipsis
...
Reverse a recently-introduced incorrect check for multi-character
ellipsis in Layout.java. The check was introduced in
Id1dfdc503f87fabed2447d55ab2107eee0eccd08.
Test: bit CtsTextTestCases:*
Test: bit FrameworksCoreTests:android.text.
Change-Id: I79198be0bd202a303f8db02a235c2af3b76abf32
2017-08-03 14:01:09 -07:00
Jeremy Joslin
f16bb77191
Merge "NetworkRecommendationProviders require the location permission." into oc-mr1-dev
...
am: 589ba65d91
2017-08-03 20:46:38 +00:00
TreeHugger Robot
589ba65d91
Merge "NetworkRecommendationProviders require the location permission." into oc-mr1-dev
2017-08-03 20:37:16 +00:00
Tor Norbye
3f1ccec743
64123323: Allow marking fields with @TargetApi(XX)
...
Test: Tested as part of lint
Change-Id: I52dcc0ea788ed916d23be4d7c9fb76755a1aa6b8
2017-08-03 20:02:31 +00:00
Yi Jin
dd214c2d36
There must not have newline character in wakelock name
...
Bug: 64272195
Test: N/A
Change-Id: I07a7d9b9dfbf69acba0123bf4ec6e309c2a5a359
2017-08-03 11:29:49 -07:00
Abodunrinwa Toki
213791f74d
Merge "Remove LangId related code." into oc-mr1-dev am: 38bbbdfae6
...
am: 2566e91f9f
2017-08-03 18:19:23 +00:00
Christopher Tate
9f22443b4e
Use normal API for legacy wallpaper restore
...
No longer do we play crazy rename-into-place tricks! Just take
the restored image and treat it as an ordinary new system wallpaper,
and let the system machinery do all its proper work. While we're at
it, we get rid of the now-spurious shenanigans about backing up the
wallpaper under the 'android' package, an overdue and welcome bit
of thinning.
In addition, we now fully migrate a legacy wallpaper image to have
both a source and a display crop in place. We were previously
not generating the equivalent source image, which made N+ backups
unable to store the image properly.
Fix 64269208
Fix 62809439
Test: manual (set wallpaper under M, backup, flash to ToT,
force restore)
Change-Id: If9b26b777f0fda95cf37c3c790a3fa4e82ff0340
2017-08-03 11:10:41 -07:00
Abodunrinwa Toki
2566e91f9f
Merge "Remove LangId related code." into oc-mr1-dev
...
am: 38bbbdfae6
2017-08-03 18:07:19 +00:00
TreeHugger Robot
38bbbdfae6
Merge "Remove LangId related code." into oc-mr1-dev
2017-08-03 17:54:29 +00:00
Tomasz Wasilczyk
5874ba903a
Merge "Address Broadcast Radio HAL review notes." into oc-mr1-dev am: 36ea87b075
...
am: 4da1bf10b7
2017-08-03 17:15:04 +00:00
Tomasz Wasilczyk
4da1bf10b7
Merge "Address Broadcast Radio HAL review notes." into oc-mr1-dev
...
am: 36ea87b075
2017-08-03 17:02:52 +00:00
Tomasz Wasilczyk
36ea87b075
Merge "Address Broadcast Radio HAL review notes." into oc-mr1-dev
2017-08-03 16:52:31 +00:00
Lucas Dupin
23789bc947
Merge "Multi-user and WallpaperColors" into oc-mr1-dev am: 22b418448b
...
am: 430d7450ed
2017-08-03 16:46:16 +00:00
Lucas Dupin
430d7450ed
Merge "Multi-user and WallpaperColors" into oc-mr1-dev
...
am: 22b418448b
2017-08-03 16:35:36 +00:00
Lucas Dupin
22b418448b
Merge "Multi-user and WallpaperColors" into oc-mr1-dev
2017-08-03 16:23:41 +00:00
Robert Carr
e46a041f36
Merge "Merge "Inform SurfaceFlinger of which Surface is the RoundedCorners overlay." into oc-dr1-dev am: 48ed8aa4d0 am: e64d0028ae" into oc-mr1-dev-plus-aosp
...
am: eee9fe304c
2017-08-03 13:13:48 +00:00
Robert Carr
3f81745199
Merge "Inform SurfaceFlinger of which Surface is the RoundedCorners overlay." into oc-dr1-dev am: 48ed8aa4d0
...
am: e64d0028ae
2017-08-03 13:01:15 +00:00
Robert Carr
e64d0028ae
Merge "Inform SurfaceFlinger of which Surface is the RoundedCorners overlay." into oc-dr1-dev
...
am: 48ed8aa4d0
2017-08-03 12:53:40 +00:00
Robert Carr
76136dcf45
Merge "Inform SurfaceFlinger of which Surface is the RoundedCorners overlay." into oc-dr1-dev
...
am: 48ed8aa4d0
2017-08-03 12:53:38 +00:00
TreeHugger Robot
48ed8aa4d0
Merge "Inform SurfaceFlinger of which Surface is the RoundedCorners overlay." into oc-dr1-dev
2017-08-03 12:45:07 +00:00
Alan Stokes
6d45286679
Merge "Fix trivial typo in javadoc for ActivityManager#getRunningTasks() Test: Comment change only"
2017-08-03 11:00:35 +00:00
Hugo Benichi
73d8e0a0f1
NsdManager: remove duplicated argument validation am: cf96a1b36d
...
am: 2096edd6f2
2017-08-03 07:38:46 +00:00
Hugo Benichi
2096edd6f2
NsdManager: remove duplicated argument validation
...
am: cf96a1b36d
2017-08-03 07:28:16 +00:00
Sudheer Shanka
d0b09dc73d
Merge "Refactor BatteryStatsImpl.updateCpuTimeLocked."
2017-08-03 05:53:03 +00:00
