302884 Commits

Author SHA1 Message Date
Colin Cross
1b3470b1b2 Merge "Remove libservicestestsjni" am: d00478e9ad am: 301c714b43 am: dcb0c55c15
am: 9d273bfec1  -s ours

Change-Id: I2c890897639f807e8f8cdd2217d6f3cf13833b4e
2017-01-12 05:16:47 +00:00
Colin Cross
9d273bfec1 Merge "Remove libservicestestsjni" am: d00478e9ad am: 301c714b43
am: dcb0c55c15

Change-Id: I55f8fed5eff824e792cbfc29b7cd7b496cad106c
2017-01-12 05:11:47 +00:00
TreeHugger Robot
adf8b4ca76 Merge "Converting action bars to clusters." 2017-01-12 05:11:26 +00:00
Colin Cross
dcb0c55c15 Merge "Remove libservicestestsjni" am: d00478e9ad
am: 301c714b43

Change-Id: I08e2298e7dd1ba8729e6d4a03e3c940012bb5e12
2017-01-12 05:05:41 +00:00
Colin Cross
301c714b43 Merge "Remove libservicestestsjni"
am: d00478e9ad

Change-Id: I062f8bd18730a8c3ee090fc4665f652fe10ff75c
2017-01-12 04:59:42 +00:00
Roozbeh Pournader
153071c70a Merge "Rename language+country resources to just language" 2017-01-12 04:58:45 +00:00
Joe LaPenna
cd54da4595 Add networkrecommendation permissions to privapp perms list.
Bug: 34235587
Test: Flashed and checked logcat for crash.
Change-Id: Ib35070ea87e23a3be8804eb3796e02c76a5628d0
2017-01-11 20:54:03 -08:00
Ashutosh Joshi
e33eb92809 Add an uncalibrated acclerometer sensor type.
Adding the uncalibrated accelerometer sensor type.

Test: Build compiles.
Change-Id: I586bd924e0fb90ef4b4a9565f8fbf72a39eccb36
2017-01-11 20:52:29 -08:00
Treehugger Robot
d00478e9ad Merge "Remove libservicestestsjni" 2017-01-12 04:50:57 +00:00
Erik Kline
452b4b7218 Simplify UpstreamNetworkMonitor callback handling
In the callback post a lamba to the target state machine's handler
that does the processing we need before sending a notification to
the state machine.

No semantic change, just a bit cleaner.

Test: as follows
    - built (bullhead)
    - flashed
    - booted
    - runtest frameworks-net passes
    - tested basic wifi-to-mobile tethering (no DUN)
Bug: 32163131
Change-Id: I07e1b510c1ebaa5dffd42a3f16ba96e961cb58f1
2017-01-12 13:43:00 +09:00
TreeHugger Robot
393a954d5f Merge "API for setting default focus per cluster." 2017-01-12 04:19:16 +00:00
Colin Cross
3bc99892e6 Remove libservicestestsjni
frameworks/base/services/tests/servicestests/jni no longer exists
after I993eeaa5dec001c39389023f355f506129b356e7, remove it.

Test: m -j FrameworksServicesTests
Change-Id: I8f307373aede9e749f1b992dde0f7252bf74b065
(cherry-picked from e399468b88ae84a586f9d583251ee0a6a7e94a43)
Merged-In: I8f307373aede9e749f1b992dde0f7252bf74b065
2017-01-12 03:24:57 +00:00
Shijian Li
896619a7ed Merge "Sync the startConsentUiIfNeeded logics to master. We are missing the package name when starting the activity now. am: 5e7fc7ccc8 am: ae21066a59" into nyc-mr2-dev-plus-aosp
am: 8ec5d822c1

Change-Id: Ida281cd80308107dc02bf2b282d1a00ccfdb51c5
2017-01-12 03:19:33 +00:00
Shijian Li
8e8ed2013c Sync the startConsentUiIfNeeded logics to master. We are missing the package name when starting the activity now. am: 5e7fc7ccc8 am: ae21066a59
am: f8d62ca359

Change-Id: I4c4130790fbfc56cb952fc076fd2be611bf51b1f
2017-01-12 03:19:25 +00:00
Shijian Li
b3e7f86997 Sync the startConsentUiIfNeeded logics to master. We are missing the package name when starting the activity now. am: 5e7fc7ccc8 am: 699e7878ef
am: 7eed086b86

Change-Id: I33321847b4e945498bf4ca4c9840605cd9d31947
2017-01-12 03:18:09 +00:00
Android Build Merger (Role)
8ec5d822c1 Merge "Sync the startConsentUiIfNeeded logics to master. We are missing the package name when starting the activity now. am: 5e7fc7ccc8 am: ae21066a59" into nyc-mr2-dev-plus-aosp 2017-01-12 03:13:09 +00:00
Shijian Li
f8d62ca359 Sync the startConsentUiIfNeeded logics to master. We are missing the package name when starting the activity now. am: 5e7fc7ccc8
am: ae21066a59

Change-Id: I3033d6d64d35f2c9c1aafe003eef0860c1f78efc
2017-01-12 03:12:17 +00:00
Shijian Li
7eed086b86 Sync the startConsentUiIfNeeded logics to master. We are missing the package name when starting the activity now. am: 5e7fc7ccc8
am: 699e7878ef

Change-Id: I39aefb9af40cbe6a2cc833bf4e5e96890c0b13a4
2017-01-12 03:12:17 +00:00
Shijian Li
699e7878ef Sync the startConsentUiIfNeeded logics to master. We are missing the package name when starting the activity now.
am: 5e7fc7ccc8

Change-Id: I327673625deafc5c18319ce1b61734a090b6a989
2017-01-12 03:07:23 +00:00
Shijian Li
ae21066a59 Sync the startConsentUiIfNeeded logics to master. We are missing the package name when starting the activity now.
am: 5e7fc7ccc8

Change-Id: I4214dc072d3155cd417ee3577918570e515fa1cf
2017-01-12 03:07:10 +00:00
TreeHugger Robot
c2d478b658 Merge "Remove libservicestestsjni" 2017-01-12 02:55:15 +00:00
Romain Guy
d973affed2 Compile bit on darwin, use -j when invoking make
Test: ran the host tool and checked the output
Change-Id: Idd561139348779982b8c01977fcc18fdfbd0134d
2017-01-11 18:34:57 -08:00
Yifan Hong
ddbf138b80 Merge "BpBase -> BpHwBase" am: d8384b5c15 am: e0707f139d am: 860ef8810d
am: be7a9b89f4

Change-Id: Iac121abc1603f4739a61b8efc6ce7361656d16ba
2017-01-12 02:20:03 +00:00
Tim Murray
06fdb08b44 Merge "add additional logging to ActiityManagerService" into nyc-mr2-dev am: 0b7b79a882
am: d8ecc93ca0

Change-Id: I89b73e795813f4ed251b8612d9058c5d20c30841
2017-01-12 02:14:18 +00:00
Yifan Hong
be7a9b89f4 Merge "BpBase -> BpHwBase" am: d8384b5c15 am: e0707f139d
am: 860ef8810d

Change-Id: I60bdcdd36defa739e346481aa3f3a46ac90ccf32
2017-01-12 02:14:00 +00:00
Yifan Hong
860ef8810d Merge "BpBase -> BpHwBase" am: d8384b5c15
am: e0707f139d

Change-Id: Iae97457100807d318f383eeaea4901f7ca10737e
2017-01-12 02:08:36 +00:00
Yifan Hong
e0707f139d Merge "BpBase -> BpHwBase"
am: d8384b5c15

Change-Id: I647e8ec4461e4d9c859144c123f278216111a2f4
2017-01-12 01:58:33 +00:00
Treehugger Robot
d8384b5c15 Merge "BpBase -> BpHwBase" 2017-01-12 01:50:58 +00:00
Ashutosh Joshi
ccb8e67525 Add a callback handler for nanoApp aborts.
Adding a placeholder for nanoApp abort handling.
The placeholder is necessary to check in HAL changes.
It does not do anything interesting for now.

Test: Build compiles.
Change-Id: Iaf1220c73f28ccd4cb4e5e3830e7988b45c4d899
2017-01-11 17:23:05 -08:00
Vadim Tryshev
1abe85c867 Converting action bars to clusters.
ActionBar keyboard navigation logic is now implemented via clusters.
Old implementation using setTouchscreenBlocksFocus and Ctrl+Shift+<
shortcut is removed.

Looking at the code, I can’t rule out existence of all 3 categories
(1) action bars with a nested toolbar, (2) action bars without a
nested toolbar and (3) Toolbars outside of action bars.
Because of this, I set “cluster” attribute both on action bar and
toolbar, and have code to avoid nested clusters in case (1).

Support lib’s action/tool bars aren’t converted, however, they
didn’t regress since Ctrl+Shift+< never worked for them. Will be
done after feature freeze.

Bug: 32151632
Test: Manual checks.
Change-Id: Ieb93980088c0fb385a9bc8a5d218ffc269b94dc5
2017-01-11 17:19:39 -08:00
Tim Murray
6853e0dcb4 resolve merge conflicts of 8d7b18292b63 to master
Change-Id: Id59ab691bfdb98cff179dfa23e3ddb185e646f53
2017-01-11 17:13:44 -08:00
Selim Cinek
ab24dc9f29 Allowing heads-up notifications now on the lock screen
In order to isolate notifications properly from their group
and in order to allow them to visually reorder, we now allow
heads up notifications on the lock screen.

Merged-In: I1d04a92e66ae92ecee4f8ee23b218c2b167dadd4
Change-Id: I1d04a92e66ae92ecee4f8ee23b218c2b167dadd4
Test: existing tests pass
Test: add heads up on lockscreen
Test: heads up group child on lockscreen
Bug: 33773401
2017-01-12 01:08:09 +00:00
Selim Cinek
add9526b1d Introduced the visual stability manager
Notifications used to roam around and reorder whenever
they wished. Those little beasts must be tamed, hence
a new visual stability manager is introduced that
dictates the terms of their interplay.

Test: manual: add heads-up and see if they correctly appear
Test: runtest -x packages/SystemUI/tests/src/com/android/systemui/notification/VisualStabilityManagerTest.java
Bug: 33773401
Merged-In: I8d7596fa7c14e0df68459a77d445f618d517ad51
Change-Id: I8d7596fa7c14e0df68459a77d445f618d517ad51
2017-01-12 01:05:59 +00:00
Selim Cinek
5e018206e2 Removing notifications always immediately when swiping them away
When swiping away notifications we were previously relying on the
notification manager to cancel the notification for us. If the state
diverges however (due to bugs) this leads to unrecoverable empty
holes which is super bad.

Merged-In: If63c5434b4e438fea560e0013a12c60655103977
Change-Id: If63c5434b4e438fea560e0013a12c60655103977
Test: existing tests pass
Bug: 33457118
2017-01-12 01:03:16 +00:00
bohu
d91dd06591 Emulator: Fix CTS failure caused by removed MANAGE_USERS permission in Shell
BUG: 34132936
BUG: 31648062
Change-Id: I9679c18c0e3611ebc9779408826f182ea8f1e88b
(cherry picked from commit 57f47e8490b68678fd123cdc111d5073ec994382)
(cherry picked from commit 12d23a13bb45cd4f83395f0f45f3382d7571effe)
2017-01-12 00:55:32 +00:00
Vadim Tryshev
5ca739817d API for setting default focus per cluster.
UX spec requires us to allow apps to specify default focus per
cluster.

This change introduces a boolean attribute for Views to do so.

API is designed for cases when the view hierarchy is inflated,
manually constructed, as well as for hybrid scenarios.

The implementation piggybacks the recently introduced logic for
saving/restoring last focus in a cluster. To accommodate new needs,
the focus-saving were rename-generalized in this CL.

Bug: 32151632
Test: Manual checks; CTS are coming after feature freeze.
Change-Id: Ia92600c3a886db9a0d4df9dd9fd0e3479e68e7a4
2017-01-11 16:40:06 -08:00
Fan Zhang
945deea836 Add logging constants for Settings search screen
Bug: 34204146
Test: RunSettingsRoboTests
Test: compile framework
Change-Id: I1c462cda4c3a1973ac05de300231b0939dba0b3c
2017-01-11 16:37:49 -08:00
Tim Murray
d8ecc93ca0 Merge "add additional logging to ActiityManagerService" into nyc-mr2-dev
am: 0b7b79a882

Change-Id: I669aa5012a93c70b7ee7af7c1958159d933b4f4c
2017-01-12 00:32:01 +00:00
Tim Murray
8d7b18292b add additional logging to ActiityManagerService
am: 82e201f03d

Change-Id: I0ea737adc3f59674a0ce313a0a8caa49d926e359
2017-01-12 00:31:54 +00:00
Hakan Seyalioglu
2cddef3329 Merge "Fix some issues with the last used entry" 2017-01-12 00:27:03 +00:00
Tim Murray
0b7b79a882 Merge "add additional logging to ActiityManagerService" into nyc-mr2-dev 2017-01-12 00:24:32 +00:00
Colin Cross
e399468b88 Remove libservicestestsjni
frameworks/base/services/tests/servicestests/jni no longer exists
after I993eeaa5dec001c39389023f355f506129b356e7, remove it.

Test: m -j FrameworksServicesTests
Change-Id: I8f307373aede9e749f1b992dde0f7252bf74b065
2017-01-11 15:57:24 -08:00
Jiaquan He
15fa3246d8 2D Recents: Show shadows behind task views.
Test: Checked that there's a shadow behind each task view in Grid-based
Recents on local sw600dp device.
Bug: 32101881
Change-Id: I2cb2c0f73cbe23c4dcce5a4839965fdff13a0df5
2017-01-11 15:52:57 -08:00
Roozbeh Pournader
a192a8ced6 Treat Latin American locales specially
Due to legacy reasons, Android translations of European Spanish were
kept under 'es', while Latin American Spanish translations were kept
under 'es-US'. The combination of this, and the new locale
preference rules in Nougat, resulted in 'es' winning over 'es-US' for
all Latin American locales, since 'es' was a direct ancestor, while
'es-US' was just a fallback.

The changes in Nougat had assumed that app developers would put Latin
American Spanish translations under 'es-419', but that could create a
backward-compatibility problem under older Android versions that did
not support three-digit region codes properly.

This CL keeps the Nougat logic and its locale parent tree, but
special-cases es-US and es-MX to be treated as equivalents of es-419
in cases where they are present and es-419 is not.

Bug: 31545805
Bug: 34126460
Test: unit tests are included
Change-Id: Iab26f41294587ee044685a5a6560520c7cbb06f7
2017-01-11 15:52:08 -08:00
TreeHugger Robot
847d338a05 Merge "Do not report boot timings on first boot or runtime restart" 2017-01-11 23:48:16 +00:00
TreeHugger Robot
048107fc47 Merge "BpBase -> BpHwBase" 2017-01-11 23:43:20 +00:00
Yorke Lee
13355df536 Merge "Don't clamp override config to screen area for freeform task" 2017-01-11 23:41:56 +00:00
Mark Salyzyn
96bf5985d5 Replace cutils/log.h and log/logger.h with android/log.h or log/log.h
(part deux)

Test: compile
Bug: 26552300
Bug: 31289077
Change-Id: I7417936c4d3666608fccfe51a312c90ecefba2fb
2017-01-11 15:30:30 -08:00
Etan Cohen
7a36073c14 Merge "[AWARE] Unhide Wi-Fi Aware API (baseline)" am: dfe8f5dc13 am: 2a4e3bef2c am: b32dfa4ef5
am: 3fc5b186fa

Change-Id: Ib668ed15ccf1f05c5ed31f700b69e1f3ab8b4cac
2017-01-11 23:28:20 +00:00
Etan Cohen
3fc5b186fa Merge "[AWARE] Unhide Wi-Fi Aware API (baseline)" am: dfe8f5dc13 am: 2a4e3bef2c
am: b32dfa4ef5

Change-Id: If2a6b632cd03984921572b190745865953a8e808
2017-01-11 23:22:51 +00:00