Commit Graph

266851 Commits

Author SHA1 Message Date
Chih-Hung Hsieh
ca3f49d594 Merge "Fix misc-macro-parentheses warnings in audio media jni."
am: 9ecb10d1b5

* commit '9ecb10d1b5a6cb0eb77beb432f2a4d657835414f':
  Fix misc-macro-parentheses warnings in audio media jni.

Change-Id: I201e57e87ae5eb52412f846e7652b695b1e15edb
2016-05-24 18:46:10 +00:00
Android Build Merger (Role)
111bab51dd Merge "Merge "Use correct synchronization lock" into nyc-dev am: 638cc6cac9 am: 23ef1f7653" into nyc-mr1-dev-plus-aosp 2016-05-24 18:45:07 +00:00
Felipe Leme
dfcc21c6b9 Merge "Fixed enforceMeteredApnPolicy when Data Saver is on." into nyc-dev am: efd3a1749f am: 964914602b
am: 88873f92ab

* commit '88873f92ab5c618091df213bde131faf17d07ed5':

Change-Id: I68641babb3ffb81000cef3ce5adf0e655810a198
2016-05-24 18:44:56 +00:00
Adarsh Fernando
b7349b2990 Docs: Changed URL references of relocated test_framework.png am: b4c6f2b637 am: 9b81008076
am: 7932d67607

* commit '7932d676071e36b88a4105515cfb81c255398dd8':
  Docs: Changed URL references of relocated test_framework.png

Change-Id: I17beb0583813d51213fb977f3ffd68bb919bda26
2016-05-24 18:44:48 +00:00
Felipe Leme
719bae19dd Merge "Fixed enforceMeteredApnPolicy when Data Saver is on." into nyc-dev am: efd3a1749f am: 223d4fff18
am: 3886a8cb0f

* commit '3886a8cb0f5e834352cfc28cd533ad1fd9115a33':
  Fixed enforceMeteredApnPolicy when Data Saver is on.

Change-Id: If9e525f86b29960ed4dfdd6ca27bc5d0077454ae
2016-05-24 18:44:45 +00:00
Adarsh Fernando
8dc27182df Docs: Changed URL references of relocated test_framework.png am: b4c6f2b637 am: 9b81008076
am: 7932d67607

* commit '7932d676071e36b88a4105515cfb81c255398dd8':
  Docs: Changed URL references of relocated test_framework.png

Change-Id: Ifbfdcb353bf4b7100af20c0f0d784274945df2aa
2016-05-24 18:44:41 +00:00
Amith Yamasani
000f1df358 Merge "Use correct synchronization lock" into nyc-dev am: 638cc6cac9
am: 23ef1f7653

* commit '23ef1f7653a792492fd5c64a786480b0a7b4e934':
  Use correct synchronization lock

Change-Id: Ife205c9b527546edab562bd936fb2649cb26e3c2
2016-05-24 18:44:38 +00:00
Mady Mellor
b0a824687f Children should have backgrounds
To add a background to children of a group, a couple of things
are changed when a group is in the expanded state:
- The parent's shadow + background is removed
- The group header is given a background and elevation
- The children are elevated to cast a shadow and have backgrounds
- When it's fully expanded the dividers won't be shown
- There's extra height added to the parent so that the child
  may cast the bottom shadow of the group
- As the children move into the bottom stack the last visible
  one alters its height and the ones below it are hidden
  to achieve the clipping effect

Fixes: 27591195
Fixes: 28655641
Change-Id: I0484308843e9b8bc10391387e54de07973a48f7d
2016-05-24 11:39:12 -07:00
Amith Yamasani
663cf283de Merge "Use correct synchronization lock" into nyc-dev am: 638cc6cac9
am: 32257dbb4d

* commit '32257dbb4dffb680445d6a18a7418fb95cf63171':
  Use correct synchronization lock

Change-Id: Ia95571c01a08d2eed39f1c4a6b0266578578956a
2016-05-24 18:38:58 +00:00
TreeHugger Robot
aba6e2c78f Merge "media: unhide codec levels" into nyc-dev 2016-05-24 18:36:57 +00:00
Treehugger Robot
9ecb10d1b5 Merge "Fix misc-macro-parentheses warnings in audio media jni." 2016-05-24 18:33:48 +00:00
Sid Soundararajan
1103bfca8d Add support for dismissing in Talkback Mode
This should let the user be able to access dismiss in talkback
mode. However, because talkback relies on focus changes to work,
the focus change animator is disabled. This means some visuals
will not work the same as when talkback is turned off.

BUG: 28594452
Change-Id: Idb443fe559bd7a636ff381e6727f81d41d0bd325
2016-05-24 11:33:01 -07:00
Felipe Leme
88873f92ab Merge "Fixed enforceMeteredApnPolicy when Data Saver is on." into nyc-dev am: efd3a1749f
am: 964914602b

* commit '964914602b4a62a72e448b0ad7109fea9115ac0e':

Change-Id: I34481e18cf75a8715d7169ce72c8affd5b86c79b
2016-05-24 18:29:50 +00:00
Amith Yamasani
23ef1f7653 Merge "Use correct synchronization lock" into nyc-dev
am: 638cc6cac9

* commit '638cc6cac9e35ec5a1410ba2fd63550b53e699ab':
  Use correct synchronization lock

Change-Id: I834766e3191a2bc4cef1587714522031fe3f24de
2016-05-24 18:29:50 +00:00
Amith Yamasani
32257dbb4d Merge "Use correct synchronization lock" into nyc-dev
am: 638cc6cac9

* commit '638cc6cac9e35ec5a1410ba2fd63550b53e699ab':
  Use correct synchronization lock

Change-Id: Ibc7475f21c585ae457412214986cc14ac9ecbe8b
2016-05-24 18:29:45 +00:00
Adarsh Fernando
7932d67607 Docs: Changed URL references of relocated test_framework.png am: b4c6f2b637
am: 9b81008076

* commit '9b810080769b26b1aecd97b96b3a1ffcd69341c1':
  Docs: Changed URL references of relocated test_framework.png

Change-Id: Ibcd8728ed898c32cac19eeff5ab55cb919acc14d
2016-05-24 18:25:31 +00:00
Ben Lin
0f6394a2c0 Merge "Merge "Register change Uri and notify changes in bugreportServices." into nyc-dev am: 5d5ddfa80e am: 6d80e074ec" into nyc-mr1-dev-plus-aosp
am: d4a0910148

* commit 'd4a0910148fa511f451b3400f75a6df78e7818f2':

Change-Id: Id7c7763eab190c203dbcd7363d6dd89a9f5d4420
2016-05-24 18:24:41 +00:00
Ben Lin
a32f08d292 Merge "Register change Uri and notify changes in bugreportServices." into nyc-dev am: 5d5ddfa80e am: 9c14d14f43
am: 44738dd376

* commit '44738dd3762fdd2ddd8ee997e51f3ab300019d91':
  Register change Uri and notify changes in bugreportServices.

Change-Id: Ie42852b75efd2f9a499924361b4eeb6416ec0ade
2016-05-24 18:24:28 +00:00
Felipe Leme
3886a8cb0f Merge "Fixed enforceMeteredApnPolicy when Data Saver is on." into nyc-dev am: efd3a1749f
am: 223d4fff18

* commit '223d4fff18002369fdc716ee2109f3e949563964':
  Fixed enforceMeteredApnPolicy when Data Saver is on.

Change-Id: I62eb108dfad2ac1ffd2b541470f01a7923d92731
2016-05-24 18:23:58 +00:00
Christopher Wiley
4bc8d6b1ac Rely on Tethering mutex for TetherInterfaceSM
Stop passing Tethering's mutex into TetherInterfaceSM, and instead
simply rely on Tethering to acquire its own mutex when accessing
instances of TetherInterfaceSM.

While here, remove some boolean fields (previously guarded by the mutex)
which duplicate state information.

Change-Id: Ie6b2128970981786a5d64fbf700c9f3d0a6721fb
Test: Compiles, unittests pass, WiFi tethering continues to work.
Bug: 28910007
2016-05-24 11:15:32 -07:00
Android Build Merger (Role)
d4a0910148 Merge "Merge "Register change Uri and notify changes in bugreportServices." into nyc-dev am: 5d5ddfa80e am: 6d80e074ec" into nyc-mr1-dev-plus-aosp 2016-05-24 18:13:39 +00:00
Felipe Leme
223d4fff18 Merge "Fixed enforceMeteredApnPolicy when Data Saver is on." into nyc-dev
am: efd3a1749f

* commit 'efd3a1749f2737199643cc29bea6132a9786223b':
  Fixed enforceMeteredApnPolicy when Data Saver is on.

Change-Id: I87b596346c058c7ac8efbebb67b43664f1be0fed
2016-05-24 18:13:16 +00:00
Felipe Leme
964914602b Merge "Fixed enforceMeteredApnPolicy when Data Saver is on." into nyc-dev
am: efd3a1749f

* commit 'efd3a1749f2737199643cc29bea6132a9786223b':
  Fixed enforceMeteredApnPolicy when Data Saver is on.

Change-Id: I5cd9701e6620abcc950f6a182b6e2b5f95127371
2016-05-24 18:13:14 +00:00
Ben Lin
8bca54cd22 Merge "Register change Uri and notify changes in bugreportServices." into nyc-dev am: 5d5ddfa80e
am: 6d80e074ec

* commit '6d80e074ec7c20e1e6a10fd67a4d409990f76fcb':
  Register change Uri and notify changes in bugreportServices.

Change-Id: Ic0e793c959ca9061e3367f2808205234ade908d7
2016-05-24 18:13:14 +00:00
Ben Lin
44738dd376 Merge "Register change Uri and notify changes in bugreportServices." into nyc-dev am: 5d5ddfa80e
am: 9c14d14f43

* commit '9c14d14f43caff0497c5c1edfa63527575a6f083':
  Register change Uri and notify changes in bugreportServices.

Change-Id: I9b77e4eb8b7d699a97a265244bb808f17c07e259
2016-05-24 18:11:46 +00:00
Adarsh Fernando
9b81008076 Docs: Changed URL references of relocated test_framework.png
am: b4c6f2b637

* commit 'b4c6f2b63713c958e46b02b6c520271ec77fdda2':
  Docs: Changed URL references of relocated test_framework.png

Change-Id: Ief551478b2fa023cdea013c766017e3bc0eba79e
2016-05-24 18:11:43 +00:00
Amith Yamasani
638cc6cac9 Merge "Use correct synchronization lock" into nyc-dev 2016-05-24 18:10:57 +00:00
Allen Hair
3fb03313e9 Deprecate shell-based UI Automator.
Change-Id: I15aee7a6aba551b737d2c41b4fafd5b0ced9a4b7
2016-05-24 11:10:44 -07:00
Eric Laurent
c28f8aef36 Merge "Fix AudioTrack and AudioRecord documentation" into nyc-dev am: b143e3de34 am: a30335698c
am: 731eb18bd7

* commit '731eb18bd799685ef45a328f04fc678ee5a2f03d':

Change-Id: Ifaaa393f1f968013d8e26b65075a4d483de8c0f1
2016-05-24 18:02:35 +00:00
Eric Laurent
a65262e9a9 Merge "Fix AudioTrack and AudioRecord documentation" into nyc-dev am: b143e3de34 am: 50103561d2
am: 45309a4a95

* commit '45309a4a950a0c46f8933481e22c16f1d618db4d':
  Fix AudioTrack and AudioRecord documentation

Change-Id: I9da5a69426b790bbf4a0c6a22ae894b7f1258220
2016-05-24 18:02:25 +00:00
Chong Zhang
95dbbac839 Merge "Fix wallpaper crop during unlock animation" into nyc-dev am: d4a45e0c40 am: 863289d2cd
am: 8a83cbf3e5

* commit '8a83cbf3e5059d6b7aa3210303faad75c36a66ba':

Change-Id: Iae39452d1084522aee80fa47f457fd202194adac
2016-05-24 18:02:15 +00:00
Ben Lin
6d80e074ec Merge "Register change Uri and notify changes in bugreportServices." into nyc-dev
am: 5d5ddfa80e

* commit '5d5ddfa80ecb482e34ed4bfebae2c7308269a1c4':
  Register change Uri and notify changes in bugreportServices.

Change-Id: I02eadb5e4c4b7735bf3f1ac142e75a513f12ca85
2016-05-24 18:01:34 +00:00
Ben Lin
9c14d14f43 Merge "Register change Uri and notify changes in bugreportServices." into nyc-dev
am: 5d5ddfa80e

* commit '5d5ddfa80ecb482e34ed4bfebae2c7308269a1c4':
  Register change Uri and notify changes in bugreportServices.

Change-Id: Ic118dd61f0471f61af3fe5fbace8a0dbae258484
2016-05-24 18:01:16 +00:00
Adarsh Fernando
05c98d5458 Doc: delete old test_framework.png
- file now relocated to /studio/images/test/test-framework.png

Change-Id: Ieb2d93472e29741be73f104bf319911b09accf6f
2016-05-24 10:58:43 -07:00
Tony Mak
fd30332708 Fix first notification of each app is not shown
When app tries to post its first notification,
value of now is equal to that of mLastEventTime.
And hence getRate return a very large number.

Bug: 28902358

Change-Id: If5b5b3c46e2bb80a9b40988ba7f7d777e40cc8e7
2016-05-24 18:57:50 +01:00
TreeHugger Robot
efd3a1749f Merge "Fixed enforceMeteredApnPolicy when Data Saver is on." into nyc-dev 2016-05-24 17:51:36 +00:00
Mitchell Wills
2a86e67c41 Merge "Rename TetherInterfaceSM to TetherInterfaceStateMachine" 2016-05-24 17:51:33 +00:00
Eric Laurent
731eb18bd7 Merge "Fix AudioTrack and AudioRecord documentation" into nyc-dev am: b143e3de34
am: a30335698c

* commit 'a30335698c1d9c7c34fa09f5f2af2f62f353eb9c':

Change-Id: I0cd478c8b1c3dd7b00d9d7a0ab0d159eb1a4c11e
2016-05-24 17:50:29 +00:00
Ben Lin
5d5ddfa80e Merge "Register change Uri and notify changes in bugreportServices." into nyc-dev 2016-05-24 17:48:24 +00:00
Xiaohui Chen
605733b09a Initialize device locked state during boot
Bug: 28682128
Change-Id: I4d56d6935b5f122b5eb8c33cfdb6e21f9c71807e
(cherry picked from commit 91df2a912af717176f5b6238741071222d60d5c7)
2016-05-24 17:47:53 +00:00
Chong Zhang
be90f43e2c Merge "Fix wallpaper crop during unlock animation" into nyc-dev am: d4a45e0c40 am: d2b0d2e231
am: 8843af290b

* commit '8843af290b1f1af869456f0eb2a599d066b5c14f':
  Fix wallpaper crop during unlock animation

Change-Id: I53559df05f7b8651d12196cbd4eb5bdd5923e953
2016-05-24 17:44:01 +00:00
Eric Laurent
45309a4a95 Merge "Fix AudioTrack and AudioRecord documentation" into nyc-dev am: b143e3de34
am: 50103561d2

* commit '50103561d24dfa2b0c2d7e64b719d43351505ca3':
  Fix AudioTrack and AudioRecord documentation

Change-Id: Iaab599f5e3c9edf1cf127264a7602f463dc219c5
2016-05-24 17:43:36 +00:00
Eric Laurent
a30335698c Merge "Fix AudioTrack and AudioRecord documentation" into nyc-dev
am: b143e3de34

* commit 'b143e3de34ab98463a641fd6d67165fce878f1ff':
  Fix AudioTrack and AudioRecord documentation

Change-Id: I861c0047b33730465c3ceeae1c4072f17b29d804
2016-05-24 17:43:34 +00:00
Chong Zhang
8a83cbf3e5 Merge "Fix wallpaper crop during unlock animation" into nyc-dev am: d4a45e0c40
am: 863289d2cd

* commit '863289d2cd0243f133ccec750f8ac9bebab84bf1':

Change-Id: I77962256318c3eb0955e0a529c81d93ee1e6181f
2016-05-24 17:43:29 +00:00
Dianne Hackborn
9e3935f4b0 Merge "Work on issue #27995384: Time in the top bar different..." into nyc-dev am: cdcc53d007 am: 45c02ee9d5
am: e4d341503b

* commit 'e4d341503bc02f5e5712ec1eb3c8da4653b84f99':

Change-Id: Ibb3968bc70defd4676765e2936291e62da6504c2
2016-05-24 17:33:43 +00:00
Dianne Hackborn
0b3d3b5c26 Merge "Work on issue #27995384: Time in the top bar different..." into nyc-dev am: cdcc53d007 am: 6d8d2a0330
am: 238aaf735f

* commit '238aaf735f102169f307afcccbbe86a93d794a4e':
  Work on issue #27995384: Time in the top bar different...

Change-Id: I5e0b6959d420ce88bebdada253f4b805e0016a8a
2016-05-24 17:33:18 +00:00
Eric Laurent
50103561d2 Merge "Fix AudioTrack and AudioRecord documentation" into nyc-dev
am: b143e3de34

* commit 'b143e3de34ab98463a641fd6d67165fce878f1ff':
  Fix AudioTrack and AudioRecord documentation

Change-Id: I2fe322e51f6a7dc548d8f7964fae033b14219b02
2016-05-24 17:33:13 +00:00
Chong Zhang
863289d2cd Merge "Fix wallpaper crop during unlock animation" into nyc-dev
am: d4a45e0c40

* commit 'd4a45e0c40b46e3d57617a91dbb0a9dc4412208c':
  Fix wallpaper crop during unlock animation

Change-Id: I06518707f4a1d4661f0e039f3a9f4778ae3f4a1b
2016-05-24 17:32:54 +00:00
Chong Zhang
8843af290b Merge "Fix wallpaper crop during unlock animation" into nyc-dev am: d4a45e0c40
am: d2b0d2e231

* commit 'd2b0d2e231dc09231e5bfe52ae42b7f16e7f03c2':
  Fix wallpaper crop during unlock animation

Change-Id: I215425d36b6bf8822c91809e8ff7fbd635b5eb11
2016-05-24 17:30:46 +00:00
Diego Perez
790e5f6c1c Workaround to display menus for AppCompat themes
Layoutlib currently does not implement menus for the support Toolbar.
When it detects that an AppCompat theme is being used, it will try to
use by default the support Toolbar which breaks the display of menus.
This works around the problem by forcing layoutlib
to use the framework toolbar in menu previews (regular activities
won't display the menu if they use AppCompat).

Bug: http://b.android.com/210946
Change-Id: Ic1d162c6d74119ef42895776c3bc3851a9549120
2016-05-24 18:27:35 +01:00