OSDN Git Service

android-x86/frameworks-base.git
7 years agoMerge "Import translations. DO NOT MERGE"
TreeHugger Robot [Tue, 9 May 2017 18:30:01 +0000 (18:30 +0000)]
Merge "Import translations. DO NOT MERGE"

7 years agoMerge "Merge "Don't commit snooze on horizontal swipes or when its in its expanded...
Android Build Merger (Role) [Tue, 9 May 2017 18:23:57 +0000 (18:23 +0000)]
Merge "Merge "Don't commit snooze on horizontal swipes or when its in its expanded state" into oc-dev am: 5ddf88dfe6 am: 0efd4ee719"

7 years agoMerge "Import translations. DO NOT MERGE"
TreeHugger Robot [Tue, 9 May 2017 18:23:29 +0000 (18:23 +0000)]
Merge "Import translations. DO NOT MERGE"

7 years agoMerge "Import translations. DO NOT MERGE"
TreeHugger Robot [Tue, 9 May 2017 18:22:55 +0000 (18:22 +0000)]
Merge "Import translations. DO NOT MERGE"

7 years agoMerge "Don't commit snooze on horizontal swipes or when its in its expanded state...
Mady Mellor [Tue, 9 May 2017 18:22:00 +0000 (18:22 +0000)]
Merge "Don't commit snooze on horizontal swipes or when its in its expanded state" into oc-dev am: 5ddf88dfe6
am: 0efd4ee719

Change-Id: Ib46bee991ccf218ee89e96f8d7e3e913be0099a5

7 years agoMerge "Import translations. DO NOT MERGE"
TreeHugger Robot [Tue, 9 May 2017 18:21:26 +0000 (18:21 +0000)]
Merge "Import translations. DO NOT MERGE"

7 years agoMerge "Fix IME Keyguard exit animation" into oc-dev am: b4566b30fc
Jorim Jaggi [Tue, 9 May 2017 18:04:48 +0000 (18:04 +0000)]
Merge "Fix IME Keyguard exit animation" into oc-dev am: b4566b30fc
am: 6a5cefcfcc

Change-Id: If7ae622824fed84e56088bc92c5d01f7a4401983

7 years agoMerge "Add BLE results counter to batterystats" into oc-dev am: 7080fa5282
Bookatz [Tue, 9 May 2017 17:48:49 +0000 (17:48 +0000)]
Merge "Add BLE results counter to batterystats" into oc-dev am: 7080fa5282
am: eb5a068cbc

Change-Id: I2e3bb04a7283d9aa64181e221462cff7b40839af

7 years agoMerge "Don't commit snooze on horizontal swipes or when its in its expanded state...
Mady Mellor [Tue, 9 May 2017 17:48:32 +0000 (17:48 +0000)]
Merge "Don't commit snooze on horizontal swipes or when its in its expanded state" into oc-dev
am: 5ddf88dfe6

Change-Id: I7881f729644e80d8fd881e780390e7102b732eba

7 years agoMerge "Fix IME Keyguard exit animation" into oc-dev
Jorim Jaggi [Tue, 9 May 2017 17:40:27 +0000 (17:40 +0000)]
Merge "Fix IME Keyguard exit animation" into oc-dev
am: b4566b30fc

Change-Id: Ia857135f520ca1633f1ca4d53379ca7135c217b4

7 years agoMerge "Merge "Remove redundant TextClassificationService" into oc-dev am: 104590844e...
Android Build Merger (Role) [Tue, 9 May 2017 17:31:07 +0000 (17:31 +0000)]
Merge "Merge "Remove redundant TextClassificationService" into oc-dev am: 104590844e am: 41564af248"

7 years agoMerge "Remove redundant TextClassificationService" into oc-dev am: 104590844e
Abodunrinwa Toki [Tue, 9 May 2017 17:26:01 +0000 (17:26 +0000)]
Merge "Remove redundant TextClassificationService" into oc-dev am: 104590844e
am: 41564af248

Change-Id: Ib7c77dd40de6c72bd843af680f59972708a4b121

7 years agoMerge "Merge "SurfaceView: Release Surface with SurfaceControl." into oc-dev am:...
Android Build Merger (Role) [Tue, 9 May 2017 17:25:31 +0000 (17:25 +0000)]
Merge "Merge "SurfaceView: Release Surface with SurfaceControl." into oc-dev am: 3630fd4e11 am: 9cbe611f4a"

7 years agoMerge "Add system feature flag FEATURE_WIFI_PASSPOINT"
TreeHugger Robot [Tue, 9 May 2017 17:21:17 +0000 (17:21 +0000)]
Merge "Add system feature flag FEATURE_WIFI_PASSPOINT"

7 years agoMerge "SurfaceView: Release Surface with SurfaceControl." into oc-dev am: 3630fd4e11
Rob Carr [Tue, 9 May 2017 17:14:05 +0000 (17:14 +0000)]
Merge "SurfaceView: Release Surface with SurfaceControl." into oc-dev am: 3630fd4e11
am: 9cbe611f4a

Change-Id: I1b18f556b4b42f81ddca69ae5ce420d7a612bf6b

7 years agoMerge "NumberPicker a11y (and a11y-inspired) fixes" into oc-dev am: 8d25b77e4c
Phil Weaver [Tue, 9 May 2017 17:10:02 +0000 (17:10 +0000)]
Merge "NumberPicker a11y (and a11y-inspired) fixes" into oc-dev am: 8d25b77e4c
am: bcc047ca4f

Change-Id: I7814872b4f530ed408587887225243a3fc1c59ce

7 years agoMerge "Add BLE results counter to batterystats" into oc-dev
Bookatz [Tue, 9 May 2017 17:08:03 +0000 (17:08 +0000)]
Merge "Add BLE results counter to batterystats" into oc-dev
am: 7080fa5282

Change-Id: I8e485d5a97d46f6787b5b32c17ab5b85463f2653

7 years agoMerge "Remove redundant TextClassificationService" into oc-dev
Abodunrinwa Toki [Tue, 9 May 2017 16:59:38 +0000 (16:59 +0000)]
Merge "Remove redundant TextClassificationService" into oc-dev
am: 104590844e

Change-Id: Ib2881e478819eaff8910f5a0982e4f048e4bb7c1

7 years agoMerge "Always throw a ConnectionException on error" into oc-dev am: 1c7445565d
Todd Kennedy [Tue, 9 May 2017 16:58:00 +0000 (16:58 +0000)]
Merge "Always throw a ConnectionException on error" into oc-dev am: 1c7445565d
am: dbb567838b

Change-Id: Ia0a54bdbc11fee2f39a851546fde191055b55c3f

7 years agoMerge "Use static imports for constants."
TreeHugger Robot [Tue, 9 May 2017 16:51:13 +0000 (16:51 +0000)]
Merge "Use static imports for constants."

7 years agoMerge "Merge "Fix crash in a11y cache" into oc-dev am: 64d6e3e11d am: 2af1fda3ca"
Android Build Merger (Role) [Tue, 9 May 2017 16:50:31 +0000 (16:50 +0000)]
Merge "Merge "Fix crash in a11y cache" into oc-dev am: 64d6e3e11d am: 2af1fda3ca"

7 years agoMerge "Fix crash in a11y cache" into oc-dev am: 64d6e3e11d
Phil Weaver [Tue, 9 May 2017 16:46:34 +0000 (16:46 +0000)]
Merge "Fix crash in a11y cache" into oc-dev am: 64d6e3e11d
am: 2af1fda3ca

Change-Id: Ib2aaaf46de7a402e34288ea9dcad45b9b2ba55eb

7 years agoMerge "ColorExtractor available through Dependency"
Lucas Dupin [Tue, 9 May 2017 16:42:06 +0000 (16:42 +0000)]
Merge "ColorExtractor available through Dependency"

7 years agoMerge "SurfaceView: Release Surface with SurfaceControl." into oc-dev
Rob Carr [Tue, 9 May 2017 16:36:57 +0000 (16:36 +0000)]
Merge "SurfaceView: Release Surface with SurfaceControl." into oc-dev
am: 3630fd4e11

Change-Id: I8c841d11033c9bf18987b59edce0ccf93bb984b9

7 years agoMerge "NumberPicker a11y (and a11y-inspired) fixes" into oc-dev
Phil Weaver [Tue, 9 May 2017 16:31:19 +0000 (16:31 +0000)]
Merge "NumberPicker a11y (and a11y-inspired) fixes" into oc-dev
am: 8d25b77e4c

Change-Id: If3d5182c2830b7a4a8e147426414ec16593ed229

7 years agoMerge "Don't commit snooze on horizontal swipes or when its in its expanded state...
TreeHugger Robot [Tue, 9 May 2017 16:29:45 +0000 (16:29 +0000)]
Merge "Don't commit snooze on horizontal swipes or when its in its expanded state" into oc-dev

7 years agoMerge "Fix IME Keyguard exit animation" into oc-dev
TreeHugger Robot [Tue, 9 May 2017 16:24:08 +0000 (16:24 +0000)]
Merge "Fix IME Keyguard exit animation" into oc-dev

7 years agoMerge "Always throw a ConnectionException on error" into oc-dev
Todd Kennedy [Tue, 9 May 2017 16:23:01 +0000 (16:23 +0000)]
Merge "Always throw a ConnectionException on error" into oc-dev
am: 1c7445565d

Change-Id: Ib80975794f05d97aec6c3bdc3639d113a7085f90

7 years agoMerge "Fix crash in a11y cache" into oc-dev
Phil Weaver [Tue, 9 May 2017 16:20:06 +0000 (16:20 +0000)]
Merge "Fix crash in a11y cache" into oc-dev
am: 64d6e3e11d

Change-Id: I86b25241a07ab47bc1c7e9a069867db90872ad4f

7 years agoMerge "Merge "Fix double bolding" into oc-dev am: 1b7e17b135 -s ours am: e99f3c3c77...
Android Build Merger (Role) [Tue, 9 May 2017 16:17:30 +0000 (16:17 +0000)]
Merge "Merge "Fix double bolding" into oc-dev am: 1b7e17b135  -s ours am: e99f3c3c77  -s ours"

7 years agoMerge "Fix double bolding" into oc-dev am: 1b7e17b135 -s ours
Seigo Nonaka [Tue, 9 May 2017 16:15:44 +0000 (16:15 +0000)]
Merge "Fix double bolding" into oc-dev am: 1b7e17b135  -s ours
am: e99f3c3c77  -s ours

Change-Id: I4700cfb3a3b790c181bad48595831b85e9657a53

7 years agoMerge "Add BLE results counter to batterystats" into oc-dev
TreeHugger Robot [Tue, 9 May 2017 16:03:16 +0000 (16:03 +0000)]
Merge "Add BLE results counter to batterystats" into oc-dev

7 years agoMerge "Remove redundant TextClassificationService" into oc-dev
TreeHugger Robot [Tue, 9 May 2017 16:02:10 +0000 (16:02 +0000)]
Merge "Remove redundant TextClassificationService" into oc-dev

7 years agoMerge "Fix double bolding" into oc-dev am: 1b7e17b135 -s ours
Seigo Nonaka [Tue, 9 May 2017 15:57:00 +0000 (15:57 +0000)]
Merge "Fix double bolding" into oc-dev am: 1b7e17b135  -s ours
am: e99f3c3c77  -s ours

Change-Id: Iabe234d3a1401c31f92d8477576230aad5a39946

7 years agoMerge "SurfaceView: Release Surface with SurfaceControl." into oc-dev
Rob Carr [Tue, 9 May 2017 15:49:20 +0000 (15:49 +0000)]
Merge "SurfaceView: Release Surface with SurfaceControl." into oc-dev

7 years agoMerge "NumberPicker a11y (and a11y-inspired) fixes" into oc-dev
Phil Weaver [Tue, 9 May 2017 15:35:54 +0000 (15:35 +0000)]
Merge "NumberPicker a11y (and a11y-inspired) fixes" into oc-dev

7 years agoMerge "Always throw a ConnectionException on error" into oc-dev
TreeHugger Robot [Tue, 9 May 2017 15:32:22 +0000 (15:32 +0000)]
Merge "Always throw a ConnectionException on error" into oc-dev

7 years agoMerge "Fix crash in a11y cache" into oc-dev
Phil Weaver [Tue, 9 May 2017 15:30:24 +0000 (15:30 +0000)]
Merge "Fix crash in a11y cache" into oc-dev

7 years agoMerge "Fix double bolding" into oc-dev
Seigo Nonaka [Tue, 9 May 2017 15:25:34 +0000 (15:25 +0000)]
Merge "Fix double bolding" into oc-dev
am: 1b7e17b135  -s ours

Change-Id: Ia466856897b22565206c4cad88ff193b88bc0c42

7 years agoMerge "Fix cannot share text from twitter to managed profile"
TreeHugger Robot [Tue, 9 May 2017 15:23:15 +0000 (15:23 +0000)]
Merge "Fix cannot share text from twitter to managed profile"

7 years agoMerge "Fix double bolding" into oc-dev
TreeHugger Robot [Tue, 9 May 2017 15:13:48 +0000 (15:13 +0000)]
Merge "Fix double bolding" into oc-dev

7 years agoMerge "Update Typeface_Delegate following Change Ied73189b"
TreeHugger Robot [Tue, 9 May 2017 15:07:46 +0000 (15:07 +0000)]
Merge "Update Typeface_Delegate following Change Ied73189b"

7 years agoFix IME Keyguard exit animation
Jorim Jaggi [Mon, 8 May 2017 21:42:02 +0000 (23:42 +0200)]
Fix IME Keyguard exit animation

Keyguard exit animation was always applied no matter whether the
current window is shown or not. Because Keyguard exit starts with
alpha=0, this lead to a flicker with the IME window as a frame
later IME was applied its dismissal animation, which reverts it to
alpha=1 at the beginning.

Fix this by only applying exit animation if window is currently
hidden only by policy. Requires readding the old visibility method
*cough cough cough*

Ideally we would apply non-app window policy visibility/animation
at the same place...but today is not the day! (to minimize risk)

Test: Set password, unlock phone
Test: Don't set password, unlock to activity with IME up
Change-Id: I46110c80da4438223282903fd4defeba2c3f0550
Fixes: 36200726

7 years agoUse static imports for constants.
Artem Iglikov [Tue, 9 May 2017 10:00:03 +0000 (11:00 +0100)]
Use static imports for constants.

This is an automated change with some manual formatting.

Bug: 36850431
Test: mmma frameworks/base
Change-Id: I126747e57ae1b666e5281b25d063d22d774b0718

7 years agoRemove redundant TextClassificationService
Abodunrinwa Toki [Thu, 4 May 2017 15:29:04 +0000 (16:29 +0100)]
Remove redundant TextClassificationService

Text classification is now being done entirely in the app's proccess.
See android.view.textclassifier.TextClassificationManager
Reverts Ic428d00f291e268211866b3fc6b7acbc3eb04e1e

Test: bit FrameworksCoreTests:android.view.textclassifier.TextClassificationManagerTest
Fixes: 36852122
Change-Id: Iffff3ab6e7d3b761576eb6bdcd5032db34b7a1b2

7 years agoUpdate Typeface_Delegate following Change Ied73189b
Jerome Gaillard [Tue, 9 May 2017 12:49:07 +0000 (13:49 +0100)]
Update Typeface_Delegate following Change Ied73189b

Test: layoutlib tests
Change-Id: I86ef9794751c6adb3f304ae6e00c5e24428da5dd

7 years agoMerge "Update SystemUpdatePolicy wording" into oc-dev am: 7cf5f74f3f
Rubin Xu [Tue, 9 May 2017 12:05:57 +0000 (12:05 +0000)]
Merge "Update SystemUpdatePolicy wording" into oc-dev am: 7cf5f74f3f
am: 0311911b9e

Change-Id: Ibaa5ed8533bfd36911aacd8738a0811b5a41d8cc

7 years agoMerge "Update SystemUpdatePolicy wording" into oc-dev
Rubin Xu [Tue, 9 May 2017 11:57:57 +0000 (11:57 +0000)]
Merge "Update SystemUpdatePolicy wording" into oc-dev
am: 7cf5f74f3f

Change-Id: Ifac890402f5f352d00ccb5eb3809b67a125d2b24

7 years agoMerge "Update SystemUpdatePolicy wording" into oc-dev
Rubin Xu [Tue, 9 May 2017 11:48:56 +0000 (11:48 +0000)]
Merge "Update SystemUpdatePolicy wording" into oc-dev

7 years agoMerge "Disable flaky test"
TreeHugger Robot [Tue, 9 May 2017 11:28:39 +0000 (11:28 +0000)]
Merge "Disable flaky test"

7 years agoMerge "Refactor and improve logging." am: c3d41d5093 am: 8af8235bca am: 9f76683c59
Erik Kline [Tue, 9 May 2017 10:59:36 +0000 (10:59 +0000)]
Merge "Refactor and improve logging." am: c3d41d5093 am: 8af8235bca am: 9f76683c59
am: d1ea33a039

Change-Id: I744b048224e0b8bf6fe4da763833b755441c0911

7 years agoMerge "Refactor and improve logging." am: c3d41d5093 am: 8af8235bca
Erik Kline [Tue, 9 May 2017 10:53:36 +0000 (10:53 +0000)]
Merge "Refactor and improve logging." am: c3d41d5093 am: 8af8235bca
am: 9f76683c59

Change-Id: Ieb9a8e3f85f41d18056a7827997f12986ff13ca1

7 years agoMerge "Prepare for removal of junit and android.test classes from Android API (step...
Paul Duffin [Tue, 9 May 2017 10:51:32 +0000 (10:51 +0000)]
Merge "Prepare for removal of junit and android.test classes from Android API (step 1)" am: b2ac85e76d am: edefe593e3 am: 5d43c16797  -s ours
am: a0297e34dd  -s ours

Change-Id: Idd9d7ffc96e37e4d31ac0ba11a6ab819912d9f15

7 years agoMerge "Refactor and improve logging." am: c3d41d5093
Erik Kline [Tue, 9 May 2017 10:47:03 +0000 (10:47 +0000)]
Merge "Refactor and improve logging." am: c3d41d5093
am: 8af8235bca

Change-Id: Id583ab11513ab86f85d1c4001cf36e74fc521753

7 years agoMerge "Prepare for removal of junit and android.test classes from Android API (step...
Paul Duffin [Tue, 9 May 2017 10:45:05 +0000 (10:45 +0000)]
Merge "Prepare for removal of junit and android.test classes from Android API (step 1)" am: b2ac85e76d am: edefe593e3
am: 5d43c16797  -s ours

Change-Id: I077e5c803f06c2ae994514850ee64c18a57a81eb

7 years agoMerge "Refactor and improve logging."
Erik Kline [Tue, 9 May 2017 10:40:29 +0000 (10:40 +0000)]
Merge "Refactor and improve logging."
am: c3d41d5093

Change-Id: I8ef193a9ee0f5bf04ae18620c1a68228ed7ed929

7 years agoMerge "Prepare for removal of junit and android.test classes from Android API (step...
Paul Duffin [Tue, 9 May 2017 10:36:03 +0000 (10:36 +0000)]
Merge "Prepare for removal of junit and android.test classes from Android API (step 1)" am: b2ac85e76d
am: edefe593e3

Change-Id: I35a3d6230c92d892d5eb3936532929b28314273f

7 years agoMerge "Refactor and improve logging."
Treehugger Robot [Tue, 9 May 2017 10:33:50 +0000 (10:33 +0000)]
Merge "Refactor and improve logging."

7 years agoMerge "Prepare for removal of junit and android.test classes from Android API (step 1)"
Paul Duffin [Tue, 9 May 2017 10:29:59 +0000 (10:29 +0000)]
Merge "Prepare for removal of junit and android.test classes from Android API (step 1)"
am: b2ac85e76d

Change-Id: I2c06dbace44b4578a6cd94cb62a3ae67e558aaaa

7 years agoMerge "Prepare for removal of junit and android.test classes from Android API (step 1)"
Paul Duffin [Tue, 9 May 2017 10:23:15 +0000 (10:23 +0000)]
Merge "Prepare for removal of junit and android.test classes from Android API (step 1)"

7 years agoMerge "Move LockSettingsService into locksettings package."
Andrew Scull [Tue, 9 May 2017 09:48:46 +0000 (09:48 +0000)]
Merge "Move LockSettingsService into locksettings package."

7 years agoRefactor and improve logging.
Erik Kline [Mon, 8 May 2017 08:56:35 +0000 (17:56 +0900)]
Refactor and improve logging.

Test: as follows
    - build
    - flashed
    - booted
    - "runtest frameworks-net" passed
    - "dumpsys connectivity" shows new log output
Bug: 32163131
Bug: 36504926

Change-Id: I14d6da18660223f7cace156cb6594ee18928a7b0

7 years agoMerge "Add some tests for TarBackupReader"
Artem Iglikov [Tue, 9 May 2017 08:28:20 +0000 (08:28 +0000)]
Merge "Add some tests for TarBackupReader"

7 years agoMerge "Return exit code 1 when an error occurs during 'aapt2 dump'."
Pierre Lecesne [Tue, 9 May 2017 08:20:32 +0000 (08:20 +0000)]
Merge "Return exit code 1 when an error occurs during 'aapt2 dump'."

7 years agoReturn exit code 1 when an error occurs during 'aapt2 dump'.
Pierre Lecesne [Fri, 5 May 2017 13:58:21 +0000 (14:58 +0100)]
Return exit code 1 when an error occurs during 'aapt2 dump'.

Bug: 37975355
Test: Manual
Change-Id: Ia29483a4aa10c98e75fe38ac0082759c8574a649

7 years agoMerge "FingerprintService: refresh auth id after enroll and remove." into oc-dev...
Charles He [Tue, 9 May 2017 08:11:53 +0000 (08:11 +0000)]
Merge "FingerprintService: refresh auth id after enroll and remove." into oc-dev am: d2915725d9
am: 567564a1b0

Change-Id: Ia1abaee42c84496c6318094216b63958087d15ff

7 years agoMerge "FingerprintService: refresh auth id after enroll and remove." into oc-dev
Charles He [Tue, 9 May 2017 08:04:18 +0000 (08:04 +0000)]
Merge "FingerprintService: refresh auth id after enroll and remove." into oc-dev
am: d2915725d9

Change-Id: I817dbc31f61ef0dced2103b386124029562f0a48

7 years agoMerge "FingerprintService: refresh auth id after enroll and remove." into oc-dev
Charles He [Tue, 9 May 2017 07:58:20 +0000 (07:58 +0000)]
Merge "FingerprintService: refresh auth id after enroll and remove." into oc-dev

7 years agoImport translations. DO NOT MERGE
Bill Yi [Tue, 9 May 2017 07:11:42 +0000 (00:11 -0700)]
Import translations. DO NOT MERGE

Change-Id: I3e3c8aedb6452a57ed6e356563eb15f012ee004b
Auto-generated-cl: translation import

7 years agoMerge "Merge "Move some NetworkStats tests to tests/net." into oc-dev am: 74fe2cbc3a...
Android Build Merger (Role) [Tue, 9 May 2017 06:49:20 +0000 (06:49 +0000)]
Merge "Merge "Move some NetworkStats tests to tests/net." into oc-dev am: 74fe2cbc3a  -s ours am: ea28d269ea  -s ours"

7 years agoMerge "Move some NetworkStats tests to tests/net." into oc-dev am: 74fe2cbc3a -s...
Lorenzo Colitti [Tue, 9 May 2017 06:46:48 +0000 (06:46 +0000)]
Merge "Move some NetworkStats tests to tests/net." into oc-dev am: 74fe2cbc3a  -s ours
am: ea28d269ea  -s ours

Change-Id: I40b5bb1e640358e6889f92dacdd2a977bc9758fb

7 years agoMerge "Move some NetworkStats tests to tests/net." into oc-dev
Lorenzo Colitti [Tue, 9 May 2017 06:40:41 +0000 (06:40 +0000)]
Merge "Move some NetworkStats tests to tests/net." into oc-dev
am: 74fe2cbc3a  -s ours

Change-Id: I4c58d302385c733108614c681632d3a8bc2dbdcf

7 years agoMerge changes I4872f8ba,I92039f29,Iaad13e13 am: 767ac317e2 am: 717238a614 am: 44e9b81c54
Hugo Benichi [Tue, 9 May 2017 06:39:13 +0000 (06:39 +0000)]
Merge changes I4872f8ba,I92039f29,Iaad13e13 am: 767ac317e2 am: 717238a614 am: 44e9b81c54
am: 515a54c4b8

Change-Id: Ia0f85518fd0e75e768fa037c5d0bcf062b3c1f93

7 years agoMerge "Move some NetworkStats tests to tests/net." into oc-dev
TreeHugger Robot [Tue, 9 May 2017 06:36:35 +0000 (06:36 +0000)]
Merge "Move some NetworkStats tests to tests/net." into oc-dev

7 years agoMerge changes I4872f8ba,I92039f29,Iaad13e13 am: 767ac317e2 am: 717238a614
Hugo Benichi [Tue, 9 May 2017 06:30:48 +0000 (06:30 +0000)]
Merge changes I4872f8ba,I92039f29,Iaad13e13 am: 767ac317e2 am: 717238a614
am: 44e9b81c54

Change-Id: I9c38d1254f82b50f4d1e953e72bf15a46562d3b8

7 years agoMerge changes I4872f8ba,I92039f29,Iaad13e13 am: 767ac317e2
Hugo Benichi [Tue, 9 May 2017 06:23:46 +0000 (06:23 +0000)]
Merge changes I4872f8ba,I92039f29,Iaad13e13 am: 767ac317e2
am: 717238a614

Change-Id: Id7ca8a16da5774a00517cfb60b877d181a358353

7 years agoImport translations. DO NOT MERGE
Bill Yi [Tue, 9 May 2017 06:15:12 +0000 (23:15 -0700)]
Import translations. DO NOT MERGE

Change-Id: I6e0931e889755b20c3a8f486fbe7d6fc9bbe22bd
Auto-generated-cl: translation import

7 years agoMerge changes I4872f8ba,I92039f29,Iaad13e13
Hugo Benichi [Tue, 9 May 2017 06:14:47 +0000 (06:14 +0000)]
Merge changes I4872f8ba,I92039f29,Iaad13e13
am: 767ac317e2

Change-Id: Ibf618a27b2e5cfb3e8a69528dfecd275b33f0336

7 years agoImport translations. DO NOT MERGE
Bill Yi [Tue, 9 May 2017 06:10:14 +0000 (23:10 -0700)]
Import translations. DO NOT MERGE

Change-Id: I2f7445a06b22c322973ba6e0fe78670d20563f00
Auto-generated-cl: translation import

7 years agoMerge changes I4872f8ba,I92039f29,Iaad13e13
Hugo Benichi [Tue, 9 May 2017 06:08:18 +0000 (06:08 +0000)]
Merge changes I4872f8ba,I92039f29,Iaad13e13

* changes:
  NsdService: simple cleanups
  NsdService: test coverage for client requests.
  NsdManager: remove duplicated argument validation

7 years agoImport translations. DO NOT MERGE
Bill Yi [Tue, 9 May 2017 05:16:09 +0000 (22:16 -0700)]
Import translations. DO NOT MERGE

Change-Id: Id725df3ce9c2ddef04c9979f7b798e3cf816d269
Auto-generated-cl: translation import

7 years agoMerge "Merge "Handling the touch better when the screen turns off" into oc-dev am...
Android Build Merger (Role) [Tue, 9 May 2017 05:11:22 +0000 (05:11 +0000)]
Merge "Merge "Handling the touch better when the screen turns off" into oc-dev am: bd54d2c2bd am: 9bf8edfc49  -s ours"

7 years agoMerge "update trust state immediately when user auths via FP on keyguard"
TreeHugger Robot [Tue, 9 May 2017 05:09:22 +0000 (05:09 +0000)]
Merge "update trust state immediately when user auths via FP on keyguard"

7 years agoMerge "Handling the touch better when the screen turns off" into oc-dev am: bd54d2c2bd
Selim Cinek [Tue, 9 May 2017 05:07:01 +0000 (05:07 +0000)]
Merge "Handling the touch better when the screen turns off" into oc-dev am: bd54d2c2bd
am: 9bf8edfc49  -s ours

Change-Id: Ic52dca65fb9e809d22ff8e7bccb45f3a05295445

7 years agoMerge "Handling the touch better when the screen turns off" into oc-dev
Selim Cinek [Tue, 9 May 2017 04:59:41 +0000 (04:59 +0000)]
Merge "Handling the touch better when the screen turns off" into oc-dev
am: bd54d2c2bd

Change-Id: Id015cd13042de40521b2d5b951ce39cab53d5e49

7 years agoMerge "Handling the touch better when the screen turns off" into oc-dev
TreeHugger Robot [Tue, 9 May 2017 04:54:20 +0000 (04:54 +0000)]
Merge "Handling the touch better when the screen turns off" into oc-dev

7 years agoMerge "Fixing issue with wrong initial multi-window mode." into oc-dev am: 82792153c3
Winson Chung [Tue, 9 May 2017 04:18:48 +0000 (04:18 +0000)]
Merge "Fixing issue with wrong initial multi-window mode." into oc-dev am: 82792153c3
am: 5c6486b344

Change-Id: I1ee658c0ca43c345bfb24c9544af4b949f2e0f6e

7 years agoFix double bolding
Seigo Nonaka [Tue, 2 May 2017 05:17:36 +0000 (22:17 -0700)]
Fix double bolding

resolveStyle increases minikinStyle's weight value based on Skia's style
value. Since we compute Skia's style based on given weight value, we
should not add extra bold weight to minikinStyle.

This CL also fixes misunderstanding of base weight.
The base weight is only used for computing weight relative to the
weighted alias. Thus, base weight should not be updated except for
createWeightAlias method.

To be clear, this CL changes the function names but keeps the same
semantics as before.

Test: adb shell /data/nativetest/hwui_unit_tests/hwui_unit_tests
Test: am instrument -w -e class android.graphics.cts.TypefaceTest\
      android.graphics.cts/android.support.test.runner.AndroidJUnitRunner
Bug: 37880319
Merged-In: Ied73189b11792fb062da46f45afd2db664e6ecb4

Change-Id: I82350a1bfb99ce198b955f127949e21bccccb1cb

7 years agoFix double bolding
Seigo Nonaka [Tue, 9 May 2017 04:05:22 +0000 (04:05 +0000)]
Fix double bolding
am: 264d3bef34

Change-Id: Id22cd02c81dd157c5264199745491858e89dbeb5

7 years agoMerge "Fixing issue with wrong initial multi-window mode." into oc-dev
Winson Chung [Tue, 9 May 2017 04:05:03 +0000 (04:05 +0000)]
Merge "Fixing issue with wrong initial multi-window mode." into oc-dev
am: 82792153c3

Change-Id: I2a5ca7a9c5ee04ff007fab9c67ee8b9e766f36a1

7 years agoFix double bolding
Seigo Nonaka [Tue, 2 May 2017 05:17:36 +0000 (22:17 -0700)]
Fix double bolding

resolveStyle increases minikinStyle's weight value based on Skia's style
value. Since we compute Skia's style based on given weight value, we
should not add extra bold weight to minikinStyle.

This CL also fixes misunderstanding of base weight.
The base weight is only used for computing weight relative to the
weighted alias. Thus, base weight should not be updated except for
createWeightAlias method.

To be clear, this CL changes the function names but keeps the same
semantics as before.

Test: adb shell /data/nativetest/hwui_unit_tests/hwui_unit_tests
Test: am instrument -w -e class android.graphics.cts.TypefaceTest\
      android.graphics.cts/android.support.test.runner.AndroidJUnitRunner
Bug: 37880319

Change-Id: Ied73189b11792fb062da46f45afd2db664e6ecb4
(cherry picked from commit 1f9c461e6a9537f91a6509e73eeb04ee6d5706cf)

7 years agoMerge "Fixing issue with wrong initial multi-window mode." into oc-dev
Winson Chung [Tue, 9 May 2017 03:58:02 +0000 (03:58 +0000)]
Merge "Fixing issue with wrong initial multi-window mode." into oc-dev

7 years agoMerge "Add API for querying if a given keyphrase/locale is supported for AOHD."
TreeHugger Robot [Tue, 9 May 2017 03:41:10 +0000 (03:41 +0000)]
Merge "Add API for querying if a given keyphrase/locale is supported for AOHD."

7 years agoMerge "Merge "Fixed issue with associating WindowToken with null binder." into oc...
Wale Ogunwale [Tue, 9 May 2017 03:05:20 +0000 (03:05 +0000)]
Merge "Merge "Fixed issue with associating WindowToken with null binder." into oc-dev am: d193972a7f" into oc-dev-plus-aosp
am: f14f5fa42f

Change-Id: I1934f8baa7f4e0c43a5d69c0a4d1b74a28407f5a

7 years agoMerge "Merge "Fix left/top in ViewNode for suppressed parents" into oc-dev am: 9f0286...
Philip P. Moltmann [Tue, 9 May 2017 02:59:45 +0000 (02:59 +0000)]
Merge "Merge "Fix left/top in ViewNode for suppressed parents" into oc-dev am: 9f028643c2" into oc-dev-plus-aosp
am: d4f7a808a2

Change-Id: Ic2fdc1b93dc817ab7f046f2dbeff3755f02e9a9f

7 years agoMerge "Fix left/top in ViewNode for suppressed parents" into oc-dev am: 9f028643c2
Philip P. Moltmann [Tue, 9 May 2017 02:55:27 +0000 (02:55 +0000)]
Merge "Fix left/top in ViewNode for suppressed parents" into oc-dev am: 9f028643c2
am: b1e1d2bf0a

Change-Id: I9b96fdd581401389b2d1e494e3fab49683787518

7 years agoMerge "Handling the touch better when the screen turns off"
Selim Cinek [Tue, 9 May 2017 02:53:28 +0000 (02:53 +0000)]
Merge "Handling the touch better when the screen turns off"

7 years agoMerge "Merge "Fixed issue with associating WindowToken with null binder." into oc...
Android Build Merger (Role) [Tue, 9 May 2017 02:50:20 +0000 (02:50 +0000)]
Merge "Merge "Fixed issue with associating WindowToken with null binder." into oc-dev am: d193972a7f" into oc-dev-plus-aosp

7 years agoMerge "Fixed issue with associating WindowToken with null binder." into oc-dev
Wale Ogunwale [Tue, 9 May 2017 02:48:59 +0000 (02:48 +0000)]
Merge "Fixed issue with associating WindowToken with null binder." into oc-dev
am: d193972a7f

Change-Id: I70b18aebd8ba5eb0cb8bac5c8bfdb4ca460885e1

7 years agoMerge "Merge "Fix left/top in ViewNode for suppressed parents" into oc-dev am: 9f0286...
Android Build Merger (Role) [Tue, 9 May 2017 02:48:29 +0000 (02:48 +0000)]
Merge "Merge "Fix left/top in ViewNode for suppressed parents" into oc-dev am: 9f028643c2" into oc-dev-plus-aosp