Commit Graph

301953 Commits

Author SHA1 Message Date
Philip P. Moltmann
60b98d391f Merge "Do not write if apply() did not change the file." 2016-12-13 22:50:31 +00:00
Wale Ogunwale
162ea7f014 Merge "Fixed issue with ordering of non-app token windows" 2016-12-13 22:43:31 +00:00
Rob Carr
b8eac24ff2 Merge "Correct error in Configuration.updateFrom" 2016-12-13 22:34:30 +00:00
Vladislav Kaznacheev
2e96c63c4c Fix InputMonitor.updateInputWindowsLw
Drag and drop (as well as window positioning by drag)
was broken by commit 6213caa. Drag-related window
handles got wiped out by a call to clearInputWindowHandlesLw.

Bug: 33499942
Test: cts-tradefed ... android.server.cts.CrossAppDragAndDropTests
Change-Id: I2504b1b6623fc8551c8110606c06156e49bfc63d
2016-12-13 14:31:24 -08:00
Wale Ogunwale
6ce0fb8ddb Fixed issue with ordering of non-app token windows
We tried to fix this issue in I83357975c87c704af9d0702c939ca99984462365
but the fix introduced other problems. So, we are going to have sys-ui
create a separate binder for object for each type of window it adds.
Long term we want to allow one binder object to map to multiple window
tokens on the same display in window manager.

Change-Id: Iee53b8bf95b87f79ab7a1b574a54111c678f7413
Fixes: 33567674
Fixes: 33538278
Test: bit FrameworksServicesTests:com.android.server.wm.DisplayContentTests
2016-12-13 14:24:00 -08:00
jackqdyulei
2254d87273 Add tint for ic_menu.xml
Bug: 32592245
Test: Visual
Change-Id: I4aa46ac558a466f06bae39e93a1fabc57a7a9967
2016-12-13 13:35:15 -08:00
Marco Nelissen
0c3518cc77 Remove AmrInputStream
Bug: 32114618
Change-Id: I55328e6f003377f4d3c2ba2266844047b1422f49
2016-12-13 13:31:10 -08:00
Ben Lin
ffe1c112a0 DO NOT MERGE Using Activity#setTitle to have TalkBack announce root traversal. am: ab58b5a3dd
am: 7ef13276c1  -s ours

Change-Id: I2c8e035ad92988cba898e82efb8a6437d21fe469
2016-12-13 21:21:23 +00:00
jackqdyulei
626eed47be Remove hardcode color for battery_detail
Bug: 32592245
Test: Manual
Change-Id: I3b692efbe90469b989acecbd1c02b118824e3d3b
2016-12-13 13:16:03 -08:00
Ben Lin
7ef13276c1 DO NOT MERGE Using Activity#setTitle to have TalkBack announce root traversal.
am: ab58b5a3dd

Change-Id: Id9c2e3ff42a2ec8fe554e5d3d830d2d70d107086
2016-12-13 21:15:15 +00:00
Robert Carr
0bfaa461c6 [DO NOT MERGE] Prevent crash from early Toast surface destruction.
To understand this change it's first helpful to review Toasts.
The ViewRoot is constructed on the client side, but it's added,
to a window token controlled by the NotificationManagerService.
When we call NotificationManagerService#cancelToast, the system
will remove this window token. With the window token removed,
the WindowManager needs to destroy the surface to prevent orphaned
windows. If we destroy the Surface before removing the toast on the
client side however, we've never asked the ViewRoot to stop rendering
and we could have a crash. To solve this we just have to ensure we call
removeView before cancelToast.

Bug: 31547288
Bug: 30150688
Change-Id: I96672b0ac07ff18e9f51348f2ed42913c5a5226f
2016-12-13 21:11:10 +00:00
Julia Reynolds
0b6be624bf DND string change.
Change-Id: I2a83ee3018f539602726670f7e8614d6f13cfc90
Fixes: 33282732
Test: manual
2016-12-13 16:08:35 -05:00
TreeHugger Robot
6c634feae0 Merge "Fixing issue in current and max duration calculations." 2016-12-13 21:03:30 +00:00
sergeyv
9c97e48fbe HWUI: set correct sampler for external texture in shaders
Test: hwuimacro hwbitmapcompositeshader
bug:30999911
Change-Id: Ic63f7109a4a7069b62c0b21efae2d4ba7e6d64be
2016-12-13 12:59:12 -08:00
Ivan Podogov
06ad76c318 Merge "Finish resolving conflict from d23dc17" into nyc-mr2-dev-plus-aosp
am: 966d2357c5

Change-Id: I20f596ecc7171d9aaa86e9a25005ac93ccbf9922
2016-12-13 20:56:31 +00:00
Ivan Podogov
60192004bf Finish resolving conflict from d23dc17
am: 4460839e5c  -s ours

Change-Id: Id560c17d069d6405696e5fbc7e307c95f8922abd
2016-12-13 20:56:24 +00:00
TreeHugger Robot
fb1bc8bc97 Merge "SkCanvas is no longer refcnted, use SkClipOps" 2016-12-13 20:49:05 +00:00
Ivan Podogov
cbe1a792b7 Merge "Really resolve merge conflicts of 903d641 to nyc-mr2-dev-plus-aosp" into nyc-mr2-dev-plus-aosp
am: 0cc0222bdf

Change-Id: I294e13cff04b77b3fa6160a7948e72d29b98e3eb
2016-12-13 20:44:47 +00:00
Ivan Podogov
bdcaa8499c Really resolve merge conflicts of 903d641 to nyc-mr2-dev-plus-aosp
am: d97e21c0e1  -s ours

Change-Id: I5c9784c3e3c349585f32d44364f7876417483dd9
2016-12-13 20:44:41 +00:00
Hakan Seyalioglu
bcbbb428e1 Merge "Don't auto-launch if switching to managed account" 2016-12-13 20:41:22 +00:00
TreeHugger Robot
966d2357c5 Merge "Finish resolving conflict from d23dc17" into nyc-mr2-dev-plus-aosp 2016-12-13 20:38:55 +00:00
Polina Bondarenko
a6dba0ab35 Make TelephonyManager APIs public:
TelephonyManager.getSimState(slotIdx) and
TelephonyManager.SIM_STATE_CARD_RESTRICTED.

It is needed for OobConfig app unbundling.

Bug: 33479833
Test: run cts -m CtsTelephonyTestCases
Change-Id: I375f436bc4e1dcedc0656866a0838c7bf5948422
2016-12-13 21:37:01 +01:00
Ivan Podogov
4460839e5c Finish resolving conflict from d23dc17
Test: Treehugger
Change-Id: If7fa9f7e300f3d810e41447369ccbbfbc3963b94
2016-12-13 20:36:04 +00:00
Ivan Podogov
a629c956b5 Merge changes from topic 'f-radio-toggle' into cw-f-dev am: e5592abb83 am: 4d2c60173e
am: 4418dbb2cb

Change-Id: I1ec3470b9184e7166f7536d1213dad38a4c970f6
2016-12-13 20:34:50 +00:00
Svetoslav Ganov
753e65ec26 Add WiFi toggle prompts - framework am: 82737b42a6 am: 4c63779d4b
am: a5758cf1a5

Change-Id: I2b1409e2e3915218f0fa0fdbfb3fd3132d046db9
2016-12-13 20:33:05 +00:00
Ivan Podogov
daed2bd2d5 resolve merge conflicts of 903d641 to nyc-mr2-dev-plus-aosp
am: 90a198a659  -s ours

Change-Id: I9139e70e694cf024ce633a03dba7f620bc7fac56
2016-12-13 20:31:55 +00:00
TreeHugger Robot
0cc0222bdf Merge "Really resolve merge conflicts of 903d641 to nyc-mr2-dev-plus-aosp" into nyc-mr2-dev-plus-aosp 2016-12-13 20:30:03 +00:00
Ivan Podogov
d97e21c0e1 Really resolve merge conflicts of 903d641 to nyc-mr2-dev-plus-aosp
Test: Treehugger
Change-Id: Idd62dc36b4257f31148b29dec19a2785043e3d11
2016-12-13 20:27:15 +00:00
Ivan Podogov
4418dbb2cb Merge changes from topic 'f-radio-toggle' into cw-f-dev am: e5592abb83
am: 4d2c60173e

Change-Id: If7c29499a229e1a71c200816bc87073e4f238e45
2016-12-13 20:25:42 +00:00
Svetoslav Ganov
a5758cf1a5 Add WiFi toggle prompts - framework am: 82737b42a6
am: 4c63779d4b

Change-Id: Ib2351eba8d8e4980c36fd328d298c16bab48b0dc
2016-12-13 20:24:44 +00:00
Ivan Podogov
90a198a659 resolve merge conflicts of 903d641 to nyc-mr2-dev-plus-aosp
Test: Treehugger
Change-Id: Ie994c37011f6f4255ca681e4f0c0a99fa5c337fd
2016-12-13 20:15:44 +00:00
Eino-Ville Talvala
283ae234f9 Camera: Updates in preparation for HIDL
- For all camera2 paths, and anything shared between the legacy API and
  camera2, switch to using String for camera IDs.
- Remove assumption that camera device IDs must be a dense set of small
  integers, and rewrite the camera ID query methods
- Change operation of ICameraService.addListener: it now returns the list of
  available devices directly, instead of invoking callbacks. This is
  needed to ensure an up-to-date list of cameras is immediately available
  on connection to the camera service.
- Add new CameraStatus object to use as the addListener return value
- Update tests to work with new interface

Test: cts-tradefed run cts -m Camera --skip-connectivity-check -d -o --abi armeabi-v7a --disable-reboot
Bug: 32991422
Change-Id: I6ff4a5dd014c6aefe0750850eeece6f3267a3e5b
2016-12-13 12:12:21 -08:00
TreeHugger Robot
686ec7a62b Merge "Always reserve space for icon in RestrictedSwitchPreference." 2016-12-13 19:47:34 +00:00
Ivan Podogov
4d2c60173e Merge changes from topic 'f-radio-toggle' into cw-f-dev
am: e5592abb83

Change-Id: I9b6e01eedbbd463e0053bab3a5b8a080aaf7514a
2016-12-13 19:46:45 +00:00
Svetoslav Ganov
4c63779d4b Add WiFi toggle prompts - framework
am: 82737b42a6

Change-Id: I5767478779bf20ad854a0992b73b3cd72737504c
2016-12-13 19:46:20 +00:00
Ben Lin
f5c05332dc Merge "DO NOT MERGE ANYWHERE Revert "Using Activity#setTitle to have TalkBack announce root traversal."" into nyc-mr2-dev am: 52a9e0e1dd -s ours
am: 0ca78d3f85  -s ours

Change-Id: I69db4438267a2f8d50d8f3fbde102d1c878a0520
2016-12-13 19:33:23 +00:00
Ben Lin
5948c226b8 DO NOT MERGE ANYWHERE Revert "Using Activity#setTitle to have TalkBack announce root traversal." am: 98e58262d2 -s ours
am: 233d21d06b  -s ours

Change-Id: Ie7621980589c45ae0b3133b32cb3377600d2620b
2016-12-13 19:32:17 +00:00
Ben Lin
ab58b5a3dd DO NOT MERGE Using Activity#setTitle to have TalkBack announce root
traversal.

Bug: 32260739
Bug: 28275570
Change-Id: Ie3711e8ccbf588838a3f21346f317243516382bd
2016-12-13 11:32:05 -08:00
jackqdyulei
b466d35263 Remove hardcode color for alarm group
Bug: 32592245
Test: manual
Change-Id: If4c87865c9078c0857ba6097b26f7fc6a3a60ef1
2016-12-13 11:24:09 -08:00
Ben Lin
0ca78d3f85 Merge "DO NOT MERGE ANYWHERE Revert "Using Activity#setTitle to have TalkBack announce root traversal."" into nyc-mr2-dev
am: 52a9e0e1dd  -s ours

Change-Id: Ie172e5465319cab3b2fb220174ab9a05fd4b000a
2016-12-13 19:22:19 +00:00
Ben Lin
233d21d06b DO NOT MERGE ANYWHERE Revert "Using Activity#setTitle to have TalkBack announce root traversal."
am: 98e58262d2  -s ours

Change-Id: If75f6d0b7ea512f5b72f84af0e84f58c2c13b398
2016-12-13 19:22:14 +00:00
Kweku Adams
47db5a8bf7 Fixing issue in current and max duration calculations.
It looks like one operation was done out of order and some of the times used in
the calculations were leading to incorrect results.

BUG: 31023263
Test: bit FrameworksCoreTests:com.android.internal.os.BatteryStatsDurationTimerTest

Change-Id: I417cc28c5a55748067b6c7f682a66fe3dbc09f09
2016-12-13 19:17:44 +00:00
Vadim Tryshev
ce3264dac7 Adding public API for marking nodes as clusters and sections.
Clusters:
We need clusters to limit the size of the “tab loop” by
widgets related to the current context: working in the
app’s client area, choosing a command in the action bar
etc.

Clusters are a generalization of the current action bar’s
behavior.
An activity can have several clusters.
A cluster is a view or a view group group marked as such.
Pressing Tab loops inside the cluster, but you can exit it via
arrows.
You can teleport between clusters via special key combos.

Sections:
Sections live inside clusters.
They are needed for simplifying navigation in complex
hierarchies: instead of tabbing or arrowing, you can simply
teleport to the the next/previous section by pressing a
special key combo.
Example: think about panes in GMail app or dir/files
panels in a file manager.

Otherwise, sections are normal view groups: for example,
they don’t limit keyboard navigation in any way.

Bug: 32151632
Test: Checking for syntax errors and that Android starts.
Change-Id: Ic78495d0749db65d5177017553d37f870354c6bc
2016-12-13 11:10:51 -08:00
Ben Lin
52a9e0e1dd Merge "DO NOT MERGE ANYWHERE Revert "Using Activity#setTitle to have TalkBack announce root traversal."" into nyc-mr2-dev 2016-12-13 19:09:43 +00:00
Ben Lin
98e58262d2 DO NOT MERGE ANYWHERE Revert "Using Activity#setTitle to have TalkBack announce root traversal."
This reverts commit 4c80659e99.

Change-Id: Id5fa68f37170e61e2e63fdb3a60e8a3db79c81fa
2016-12-13 19:06:51 +00:00
Lei Yu
500719cf9c Merge "Add tint for edit and setting icon" 2016-12-13 19:03:14 +00:00
Lei Yu
bce06d4847 Merge "Add tint for plus & minus icon" 2016-12-13 19:01:54 +00:00
jackqdyulei
7f7b8d5fbc Change color selector for segment button text
Bug: 32592245
Test: Manual
Change-Id: I810281f516f12e73f150736e88d503396a2b15d6
2016-12-13 10:55:22 -08:00
Wyatt Riley
41f6bcebaf Restoring Network Available Notification to AGnssRil
Adds connectivity notification back for SUPL specific
case, needed esp. for case where WiFi is off and a
general purpose connectivity notification doesn't fire.

Bug: 33350903
Fixes: 33350903
Test: On device GPS-still-works checked, as well as notifications
      going into HAL on airplane mode on/off, and SUPL call flows
      (Further AGnssRil check to be done by partners)

Change-Id: I02af0b839d0bfd21dfefedff743208e02ab9c2dd
2016-12-13 10:45:29 -08:00
Chad Brubaker
b42bee9d8a Require targetSdk >= O for ephemeral installs
This ensures that platform and security features that are gated by
targetSdk are all enabled for ephemeral apps.

Test: adb install --ephemeral succeeds for CUR_DEVELOPMENT, fails for
N_MR1

Change-Id: I41b9ccc4995ba07d9a0c11b2918fa24c71892330
2016-12-13 10:26:36 -08:00