Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
301,020 Commits 3 Branches 0 Tags
83fcc421c599fffcb27c0161e7ceadfb6232ebc3
Commit Graph

301020 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jean-Michel Trivi
83fcc421c5 Merge "Do not translate system-reserved stream type names" 2016-12-27 19:48:37 +00:00
Selim Cinek
6ccfe2ad16 Merge "DO NOT MERGE Revert "Add Brightness setting for VR Mode."" into nyc-mr2-dev am: cbb057d3da 
am: cbffdfabea  -s ours

Change-Id: I325c4da2f9a6605f7c9edb4b95d5f12770849e14
 2016-12-27 19:30:06 +00:00
Selim Cinek
c2ceabfb66 DO NOT MERGE Revert "Add Brightness setting for VR Mode." am: 966045d070 
am: 7e5cff0167  -s ours

Change-Id: Id97065997a9e4d296c7b86fb910fc0b86e2feef4
 2016-12-27 19:29:00 +00:00
Selim Cinek
cbffdfabea Merge "DO NOT MERGE Revert "Add Brightness setting for VR Mode."" into nyc-mr2-dev 
am: cbb057d3da

Change-Id: I2c4f83b83dfa685c8b838b9206e26231a0b9aac0
 2016-12-27 19:22:10 +00:00
Selim Cinek
7e5cff0167 DO NOT MERGE Revert "Add Brightness setting for VR Mode." 
am: 966045d070

Change-Id: Ib1be78a47f5947f4fcc6eabc2f6af76523690ed9
 2016-12-27 19:22:04 +00:00
TreeHugger Robot
cbb057d3da Merge "DO NOT MERGE Revert "Add Brightness setting for VR Mode."" into nyc-mr2-dev 2016-12-27 19:08:59 +00:00
TreeHugger Robot
e097432e30 Merge "Revert "Add Brightness setting for VR Mode."" 2016-12-27 19:02:23 +00:00
Selim Cinek
966045d070 DO NOT MERGE Revert "Add Brightness setting for VR Mode." 
This reverts commit 84980c7a93.

Bug: 33895226
Bug: 30984614
Change-Id: I2652e77512bc870190e2172a629abac9341b2c4f
 2016-12-27 18:28:40 +00:00
Ian Pedowitz
7e96654f1b Revert "Add Brightness setting for VR Mode." 
This reverts commit c7e853f511.

Bug: 33895226
Bug: 30984614
Change-Id: Icca320e02651b7dd7b8db84ab414f41edee32760
 2016-12-27 18:28:36 +00:00
Jorim Jaggi
1bdb5e2442 Merge "Fix window transformation related issue" am: 8760e60da5 am: 1200cfb48d am: a4a4cfc8f5 
am: 8d4fa7f6b6

Change-Id: Icd2d42a026c4f514cc3efbd5883fcf4a0ee7d0e2
 2016-12-27 16:44:55 +00:00
Jorim Jaggi
8d4fa7f6b6 Merge "Fix window transformation related issue" am: 8760e60da5 am: 1200cfb48d 
am: a4a4cfc8f5

Change-Id: Ib6a4dcb09317891decacff94340ac8b015b8db74
 2016-12-27 16:37:50 +00:00
Jorim Jaggi
a4a4cfc8f5 Merge "Fix window transformation related issue" am: 8760e60da5 
am: 1200cfb48d

Change-Id: I6a105898193544119e3ca7a911faed67e46e539d
 2016-12-27 16:32:24 +00:00
Jorim Jaggi
1200cfb48d Merge "Fix window transformation related issue" 
am: 8760e60da5

Change-Id: I686b637ea76402c4d4c666b60ece83755a24a5d1
 2016-12-27 16:23:49 +00:00
Jorim Jaggi
8760e60da5 Merge "Fix window transformation related issue" 2016-12-27 16:08:44 +00:00
Jean-Michel Trivi
807313917f New player type values for Open SL ES 
Define new player types to describe the two types of AudioPlayer
  in OpenSL ES: those with a buffer queue source, those that
  play from a given URI or FD.
Add a warning in the interface description of AudioService
  that changes should be reflected in the native interface too.

Test: make, NDK tests to follow
Bug: 30955183
Change-Id: I7b530ea6e3b13f238f662ce8b9612e7df574a9c5
 2016-12-26 16:03:22 -08:00
Jean-Michel Trivi
0310e8c8f3 Do not translate system-reserved stream type names 
Do not translate the names of stream types that are reserved
  for the internal workings of the audio system, and are
  never meant to be read by the end user.
Also fix the string for STREAM_TTS.

Test: make
Bug: 33790976
Change-Id: Ied97b1ad38ad90911ac41ed277a618bc50c531c4
 2016-12-23 20:54:11 +00:00
Niels Egberts
2c80a03823 Remove redundant public modifiers in interfaces. 
Also applied formatter on modified lines.

Test: refactoring CL. Existing unit tests still pass.
Change-Id: I9a7c33e7590260ede0811dd1b50b565b0f8d2f87
 2016-12-23 12:23:54 +00:00
Lorenzo Colitti
6e22c50d7b Don't loop forever on zero-length ICMPv6 ND options. am: 2f157c421a 
am: 9bfda163e2

Change-Id: Ice002fa65828eb738323425597dec1549c0f9a42
 2016-12-23 08:32:03 +00:00
Lorenzo Colitti
9bfda163e2 Don't loop forever on zero-length ICMPv6 ND options. 
am: 2f157c421a

Change-Id: Id8fbe5361b8a826677638213eed565be333f2c4d
 2016-12-23 08:26:29 +00:00
Lorenzo Colitti
2f157c421a Don't loop forever on zero-length ICMPv6 ND options. 
Bug: 33828433
Change-Id: Ie1905167126c8c8f3896eaa5e36cd006ca354e99
 2016-12-23 13:54:50 +09:00
Santos Cordon
69c1163137 Merge "Add Brightness setting for VR Mode." into nyc-mr2-dev am: cfdf27f24b 
am: 13d418bea8  -s ours

Change-Id: I7d17f24018e646e96ce74bbd826345bea7b5560d
 2016-12-23 00:10:04 +00:00
Santos Cordon
fd747c5c32 Add Brightness setting for VR Mode. am: 84980c7a93 
am: 84334e25cd  -s ours

Change-Id: I89de340dc25d767f49d163db00fcc3837f71963e
 2016-12-23 00:09:04 +00:00
Santos Cordon
13d418bea8 Merge "Add Brightness setting for VR Mode." into nyc-mr2-dev 
am: cfdf27f24b

Change-Id: I1edc922f659f83f36102a3e6d3e36e2a6f74716f
 2016-12-22 23:58:15 +00:00
Santos Cordon
84334e25cd Add Brightness setting for VR Mode. 
am: 84980c7a93

Change-Id: I4a9c3db7bdf73e673cf8b2409404339df94086c2
 2016-12-22 23:58:05 +00:00
Santos Cordon
cfdf27f24b Merge "Add Brightness setting for VR Mode." into nyc-mr2-dev 2016-12-22 23:49:20 +00:00
Santos Cordon
84980c7a93 Add Brightness setting for VR Mode. 
This change saves and loads a different brightness setting when the user
goes in and out of VR Mode.

Bug: 30984614
Merged-In: Ie5578bbd6ea346f0eb34fe4abbfd604a5d7c0c93
Change-Id: Ie5578bbd6ea346f0eb34fe4abbfd604a5d7c0c93
 2016-12-22 23:26:49 +00:00
Santos Cordon
6982a108b2 Merge "Add Brightness setting for VR Mode." 2016-12-22 23:08:55 +00:00
TreeHugger Robot
8644daa39f Merge "Adjust tooltip layout" 2016-12-22 22:39:43 +00:00
Jean-Michel Trivi
c0a0c2bdd1 Merge "Notification of playback activity" 2016-12-22 22:08:21 +00:00
Android Build Merger (Role)
0464e07159 Merge "Merge "Add simplified_network_settings_bool to CarrierConfig." am: 4ce798f45f am: 6f87331902 am: 715acea102 am: dfee8e5f2d -s ours" 2016-12-22 21:59:30 +00:00
TreeHugger Robot
d6e332c001 Merge "Switch to HIDL service based HAL" 2016-12-22 21:59:20 +00:00
Joe LaPenna
a780aec23e Merge "Add simplified_network_settings_bool to CarrierConfig." am: 4ce798f45f am: 6f87331902 am: 715acea102 
am: dfee8e5f2d  -s ours

Change-Id: I20a62e19cd4c7645122822da41a3693f4fc584f8
 2016-12-22 21:58:32 +00:00
Joe LaPenna
dfee8e5f2d Merge "Add simplified_network_settings_bool to CarrierConfig." am: 4ce798f45f am: 6f87331902 
am: 715acea102

Change-Id: I44bc0113697be113ef79ac9a904485b49bed2f87
 2016-12-22 21:51:57 +00:00
Joe LaPenna
715acea102 Merge "Add simplified_network_settings_bool to CarrierConfig." am: 4ce798f45f 
am: 6f87331902

Change-Id: I3681893e43949060922f72c65f8f106090005d14
 2016-12-22 21:47:00 +00:00
Joe LaPenna
6f87331902 Merge "Add simplified_network_settings_bool to CarrierConfig." 
am: 4ce798f45f

Change-Id: I7343422cd3405628d6c2b90092af631b77eb37a7
 2016-12-22 21:41:23 +00:00
Treehugger Robot
4ce798f45f Merge "Add simplified_network_settings_bool to CarrierConfig." 2016-12-22 21:29:56 +00:00
pkanwar
4bab824ca6 Revert "DO NOT MERGE: Add API to indicate carrier networks." 
am: d3d5cb4645  -s ours

Change-Id: Ib3f0dd6b10eeb94032cca51371db753dd8ed9bb9
 2016-12-22 21:26:42 +00:00
Vladislav Kaznacheev
20a12da3ce Adjust tooltip layout 
Position a mouse hover tooltip closer to the target.
Limit tooltip width and make it multiline (maxLines=3).
Show a long press tooltip above the target, not below.

Bug: 33352391
Bug: 33353823
Bug: 33354000

Test: manual
Change-Id: Ie00353d715d73d432b5d892a0a7c04508a003a78
 2016-12-22 13:17:20 -08:00
pkanwar
d3d5cb4645 Revert "DO NOT MERGE: Add API to indicate carrier networks." 
These changes are not applicable for aosp and will be implemented in
master.

This reverts commit 9f47a5d85e.

Bug: 31003437
 2016-12-22 13:16:53 -08:00
Daniel Nishi
5347018e8d Merge "Fix a bug where the package stats query timeout may crash." into nyc-mr2-dev am: dfe1bc2f34 
am: 70eb66a904

Change-Id: I46f86f7c166ebf91723675467847d2ff472164b2
 2016-12-22 21:16:42 +00:00
Daniel Nishi
bca4c7fc0d Fix a bug where the package stats query timeout may crash. am: cf76a16e66 
am: e76b9dcb62

Change-Id: I341041c0edec8706cc449527b1dd130384a4ab01
 2016-12-22 21:15:43 +00:00
TreeHugger Robot
6318e36a52 Merge "Restoring last focused view when teleporting to a cluster." 2016-12-22 21:11:38 +00:00
Daniel Nishi
70eb66a904 Merge "Fix a bug where the package stats query timeout may crash." into nyc-mr2-dev 
am: dfe1bc2f34

Change-Id: I1c06fad6316f3cc34b917cbbf359d838e01d650e
 2016-12-22 21:10:00 +00:00
Daniel Nishi
e76b9dcb62 Fix a bug where the package stats query timeout may crash. 
am: cf76a16e66

Change-Id: Ibc146f89412387eb05a164c2a1969210fcea4262
 2016-12-22 21:09:53 +00:00
Steven Moreland
42bf224ed4 Merge "HwBinder: fail gracefully for device w/o hwbinder" am: 380697ca79 am: b6022b9fa0 am: 5e1efa2cc7 
am: 8b775f96b9

Change-Id: I9a9d8f353055362d8c9cd85cde56fce9ab56852f
 2016-12-22 21:09:19 +00:00
Pankaj Kanwar
1ed11ee012 Merge "DO NOT MERGE: Add UI toggle to control connections to carrier networks." into nyc-mr2-dev am: f6d8e1f635 
am: 55a0803234  -s ours

Change-Id: Ic188d4136d408214fd3f537c961183bbdd32bede
 2016-12-22 21:06:21 +00:00
pkanwar
07c4aa34a9 DO NOT MERGE: Add UI toggle to control connections to carrier networks. am: 57f383709b 
am: 21f8870abc  -s ours

Change-Id: Ia87b47762c4176e28a0733214ac6fc29d89eb7b6
 2016-12-22 21:05:25 +00:00
TreeHugger Robot
dfe1bc2f34 Merge "Fix a bug where the package stats query timeout may crash." into nyc-mr2-dev 2016-12-22 21:03:04 +00:00
Steven Moreland
8b775f96b9 Merge "HwBinder: fail gracefully for device w/o hwbinder" am: 380697ca79 am: b6022b9fa0 
am: 5e1efa2cc7

Change-Id: I190fab7adf1222c71d6d5d71ab8cbe2928600a34
 2016-12-22 20:58:54 +00:00
Alex Klyubin
3a8eac544b Merge "resolve merge conflicts of b53d984 to master" 2016-12-22 20:56:59 +00:00