git.osdn.net Git - android-x86/frameworks-base.git/log

Julia Reynolds [Thu, 21 Apr 2016 20:26:09 +0000 (20:26 +0000)]

Merge "Announce when volume controls appear and disappear." into nyc-dev am: c14996393a
am: 767c3e0df1

* commit '767c3e0df1849b760b7f6b5011afaa06bcd92846':

Change-Id: I0011e7a74ba9bbb812a3dd49f70ed45733d0bf56

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 21 Apr 2016 20:24:27 +0000 (20:24 +0000)]

Merge "Merge "Announce when volume controls appear and disappear." into nyc-dev am: c14996393a am: a179d2035c" into nyc-mr1-dev-plus-aosp

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 21 Apr 2016 20:24:21 +0000 (20:24 +0000)]

Merge "Merge "Make Dismiss Icon under Cards show up only when focused." into nyc-dev am: 6efc5dcb27 am: 608e919b3d" into nyc-mr1-dev-plus-aosp

commit | commitdiff | tree

Sid Soundararajan [Thu, 21 Apr 2016 20:23:50 +0000 (20:23 +0000)]

Merge "Make Dismiss Icon under Cards show up only when focused." into nyc-dev am: 6efc5dcb27
am: 608e919b3d

* commit '608e919b3d82faaec21c9e6e6a8bd47c150504fb':
Make Dismiss Icon under Cards show up only when focused.

Change-Id: Id61875edea2b596f13dc7938e85ae85462673428

commit | commitdiff | tree

Julia Reynolds [Thu, 21 Apr 2016 20:23:49 +0000 (20:23 +0000)]

Merge "Announce when volume controls appear and disappear." into nyc-dev am: c14996393a
am: a179d2035c

* commit 'a179d2035cdbbbbafcae4ef9e21090b303f38510':
Announce when volume controls appear and disappear.

Change-Id: I530c4fd88f7c72dfa41a136366fa6ad0baa5641b

commit | commitdiff | tree

Sid Soundararajan [Thu, 21 Apr 2016 20:23:47 +0000 (20:23 +0000)]

Merge "Make Dismiss Icon under Cards show up only when focused." into nyc-dev am: 6efc5dcb27
am: 0565aa2491

* commit '0565aa2491e6c3e9fe2b0b4b9f6ee5766874f8d9':
Make Dismiss Icon under Cards show up only when focused.

Change-Id: Iacd94569365756dac206ff64d632927facb7f748

commit | commitdiff | tree

Julia Reynolds [Thu, 21 Apr 2016 20:21:34 +0000 (20:21 +0000)]

Merge "Announce when volume controls appear and disappear." into nyc-dev
am: c14996393a

* commit 'c14996393a976c1ca9ac7cef01a052614a84a7f4':
Announce when volume controls appear and disappear.

Change-Id: I6ba293a46f1a51413e1ca5c5ae17b5756dc37993

commit | commitdiff | tree

Sid Soundararajan [Thu, 21 Apr 2016 20:21:32 +0000 (20:21 +0000)]

Merge "Make Dismiss Icon under Cards show up only when focused." into nyc-dev
am: 6efc5dcb27

* commit '6efc5dcb274d08ba7dc812c90089bc10a38b890e':
Make Dismiss Icon under Cards show up only when focused.

Change-Id: I5bdd6346c01c432d268bcc23379a2311be5a7069

commit | commitdiff | tree

Julia Reynolds [Thu, 21 Apr 2016 20:21:31 +0000 (20:21 +0000)]

commit | commitdiff | tree

Sid Soundararajan [Thu, 21 Apr 2016 20:21:30 +0000 (20:21 +0000)]

commit | commitdiff | tree

Julia Reynolds [Thu, 21 Apr 2016 20:18:27 +0000 (20:18 +0000)]

Merge "Announce when volume controls appear and disappear." into nyc-dev

commit | commitdiff | tree

Sid Soundararajan [Thu, 21 Apr 2016 20:06:29 +0000 (20:06 +0000)]

Merge "Make Dismiss Icon under Cards show up only when focused." into nyc-dev

commit | commitdiff | tree

Mihai Niță [Thu, 21 Apr 2016 20:05:56 +0000 (20:05 +0000)]

Merge "Framework: change the TTS text to use the current locale" into nyc-dev am: 344bd5c63d
am: f3aa91d9a4

* commit 'f3aa91d9a45ae4595540be46e11bc4132cb18568':

Change-Id: Icd8f84d874d39efb524cfd1fb990d5b1b71d2c4a

commit | commitdiff | tree

Rob Carr [Thu, 21 Apr 2016 20:05:52 +0000 (20:05 +0000)]

Merge "Respect manually set HARDWARE_ACCELERATED flag." into nyc-dev am: 37696cccd8
am: 674bedee2e

* commit '674bedee2ec388201b0482946bd5535c419c8f21':

Change-Id: I69081e1537c0c2624d4ad590095ce05572b0faef

commit | commitdiff | tree

Mihai Niță [Thu, 21 Apr 2016 20:03:38 +0000 (20:03 +0000)]

Merge "Framework: change the TTS text to use the current locale" into nyc-dev am: 344bd5c63d
am: 76dca16404

* commit '76dca1640402e43854feda311b1bfe174afea664':
Framework: change the TTS text to use the current locale

Change-Id: Iaabcdac0fd1bf8c6d3d6d3a9b7e87ca911518949

commit | commitdiff | tree

Rob Carr [Thu, 21 Apr 2016 20:03:34 +0000 (20:03 +0000)]

Merge "Respect manually set HARDWARE_ACCELERATED flag." into nyc-dev am: 37696cccd8
am: ff54c9eeb2

* commit 'ff54c9eeb2eeebebcb8d14fd35dfcdcbafa187a6':
Respect manually set HARDWARE_ACCELERATED flag.

Change-Id: Ie0530121ee8dc34ae41f89acb27eeaf41ddf3534

commit | commitdiff | tree

Mihai Nita [Thu, 21 Apr 2016 20:01:18 +0000 (20:01 +0000)]

Merge "Framework: change the TTS text to use the current locale" into nyc-dev
am: 344bd5c63d

* commit '344bd5c63dfbe9a6aaef68144d04d3613563c080':
Framework: change the TTS text to use the current locale

Change-Id: I23d1acfd0b53fddeec4e9ad183d90d1cf7a9708e

commit | commitdiff | tree

Robert Carr [Thu, 21 Apr 2016 20:01:15 +0000 (20:01 +0000)]

Merge "Respect manually set HARDWARE_ACCELERATED flag." into nyc-dev
am: 37696cccd8

* commit '37696cccd8925ca6e4aa6f2ca6f29807066c7f1e':
Respect manually set HARDWARE_ACCELERATED flag.

Change-Id: I2b63fc161dc7dccf21080ad7dd27d9b958808ad1

commit | commitdiff | tree

Mihai Nita [Thu, 21 Apr 2016 20:01:14 +0000 (20:01 +0000)]

commit | commitdiff | tree

Robert Carr [Thu, 21 Apr 2016 20:01:13 +0000 (20:01 +0000)]

commit | commitdiff | tree

Mihai Niță [Thu, 21 Apr 2016 19:55:41 +0000 (19:55 +0000)]

Merge "Framework: change the TTS text to use the current locale" into nyc-dev

commit | commitdiff | tree

Rob Carr [Thu, 21 Apr 2016 19:52:01 +0000 (19:52 +0000)]

Merge "Respect manually set HARDWARE_ACCELERATED flag." into nyc-dev

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 21 Apr 2016 19:20:36 +0000 (19:20 +0000)]

Merge "Merge "Fix order of operation issue with ResStringPool" into nyc-dev am: b53e8a7a8a am: 19ad9f3f9e" into nyc-mr1-dev-plus-aosp

commit | commitdiff | tree

Adam Lesinski [Thu, 21 Apr 2016 19:20:16 +0000 (19:20 +0000)]

Merge "Fix order of operation issue with ResStringPool" into nyc-dev am: b53e8a7a8a
am: 19ad9f3f9e

* commit '19ad9f3f9e544a2262881a1d35d233ecb36dc3a3':

Change-Id: I1492ed196a8895ea83cda3f602543dfb8042e76d

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 21 Apr 2016 19:18:42 +0000 (19:18 +0000)]

Merge "Merge "Fix order of operation issue with ResStringPool" into nyc-dev am: b53e8a7a8a am: 19ad9f3f9e" into nyc-mr1-dev-plus-aosp

commit | commitdiff | tree

Adam Lesinski [Thu, 21 Apr 2016 19:18:06 +0000 (19:18 +0000)]

Merge "Fix order of operation issue with ResStringPool" into nyc-dev am: b53e8a7a8a
am: 19ad9f3f9e

* commit '19ad9f3f9e544a2262881a1d35d233ecb36dc3a3':
Fix order of operation issue with ResStringPool

Change-Id: I7b19b7162ec9b5df54f503056781e636345d6533

commit | commitdiff | tree

Adam Lesinski [Thu, 21 Apr 2016 19:18:04 +0000 (19:18 +0000)]

Merge "Fix order of operation issue with ResStringPool" into nyc-dev am: b53e8a7a8a
am: da749ed997

* commit 'da749ed997644b2ad5e3643768c13f92e839db62':
Fix order of operation issue with ResStringPool

Change-Id: I00fdd69046f77fbc5d4c41476adc2d0a2073d56a

commit | commitdiff | tree

Adam Lesinski [Thu, 21 Apr 2016 19:15:47 +0000 (19:15 +0000)]

Merge "Fix order of operation issue with ResStringPool" into nyc-dev
am: b53e8a7a8a

* commit 'b53e8a7a8aa495289ab2872032f80501edd472ef':
Fix order of operation issue with ResStringPool

Change-Id: Idaca4dee242389680b82b9d58728d281a65f9116

commit | commitdiff | tree

Adam Lesinski [Thu, 21 Apr 2016 19:15:45 +0000 (19:15 +0000)]

commit | commitdiff | tree

Adam Lesinski [Thu, 21 Apr 2016 19:08:38 +0000 (19:08 +0000)]

Merge "Fix order of operation issue with ResStringPool" into nyc-dev

commit | commitdiff | tree

Julia Reynolds [Thu, 21 Apr 2016 18:58:52 +0000 (14:58 -0400)]

Announce when volume controls appear and disappear.

Bug: 28120156
Change-Id: I4e17b9cf1cd4a442adb7513168c12e3af24c424f

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 21 Apr 2016 18:30:59 +0000 (18:30 +0000)]

Merge "Merge "AudioManager: fix isBluetoothA2dpOn()" into nyc-dev am: dc7ce84095 am: bdf90a2d1c" into nyc-mr1-dev-plus-aosp

commit | commitdiff | tree

Eric Laurent [Thu, 21 Apr 2016 18:30:36 +0000 (18:30 +0000)]

Merge "AudioManager: fix isBluetoothA2dpOn()" into nyc-dev am: dc7ce84095
am: bdf90a2d1c

* commit 'bdf90a2d1c357cb6ebfa0101b06821553d7cd120':

Change-Id: I257fa1af4faea0833cc6f723aedd2185a6629898

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 21 Apr 2016 18:29:06 +0000 (18:29 +0000)]

Merge "Merge "AudioManager: fix isBluetoothA2dpOn()" into nyc-dev am: dc7ce84095 am: bdf90a2d1c" into nyc-mr1-dev-plus-aosp

commit | commitdiff | tree

Eric Laurent [Thu, 21 Apr 2016 18:28:38 +0000 (18:28 +0000)]

Merge "AudioManager: fix isBluetoothA2dpOn()" into nyc-dev am: dc7ce84095
am: 0bf32f0589

* commit '0bf32f0589efc3412af702ce370d7a79432e4ec7':
AudioManager: fix isBluetoothA2dpOn()

Change-Id: I30868022115cd389036efed24189f1f26c21c3af

commit | commitdiff | tree

Eric Laurent [Thu, 21 Apr 2016 18:28:35 +0000 (18:28 +0000)]

Merge "AudioManager: fix isBluetoothA2dpOn()" into nyc-dev am: dc7ce84095
am: bdf90a2d1c

* commit 'bdf90a2d1c357cb6ebfa0101b06821553d7cd120':
AudioManager: fix isBluetoothA2dpOn()

Change-Id: I4f1410e6862e8ae9bfd288d4404bedab387237a7

commit | commitdiff | tree

Eric Laurent [Thu, 21 Apr 2016 18:26:21 +0000 (18:26 +0000)]

Merge "AudioManager: fix isBluetoothA2dpOn()" into nyc-dev
am: dc7ce84095

* commit 'dc7ce840950398518cc116924b173eb7b7f3288a':
AudioManager: fix isBluetoothA2dpOn()

Change-Id: I7a655431e766701b2f02c468aae163554e47ecdb

commit | commitdiff | tree

Eric Laurent [Thu, 21 Apr 2016 18:26:19 +0000 (18:26 +0000)]

commit | commitdiff | tree

Eric Laurent [Thu, 21 Apr 2016 18:22:57 +0000 (18:22 +0000)]

Merge "AudioManager: fix isBluetoothA2dpOn()" into nyc-dev

commit | commitdiff | tree

Sid Soundararajan [Thu, 21 Apr 2016 18:20:52 +0000 (11:20 -0700)]

Make Dismiss Icon under Cards show up only when focused.

BUG: 28299529
Change-Id: I37cd029734da5de8416705746457151c22f64280

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 21 Apr 2016 18:19:38 +0000 (18:19 +0000)]

Merge "Merge "Fix dead surface/window left on screen" into nyc-dev am: 289395b1fe am: 31e3b5c065" into nyc-mr1-dev-plus-aosp

commit | commitdiff | tree

Chong Zhang [Thu, 21 Apr 2016 18:19:15 +0000 (18:19 +0000)]

Merge "Fix dead surface/window left on screen" into nyc-dev am: 289395b1fe
am: 31e3b5c065

* commit '31e3b5c065d596b5a1a8d0638183ac737414f913':

Change-Id: I00caf1bea81a1152eaa47c7a3c9e93c6345af61a

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 21 Apr 2016 18:17:44 +0000 (18:17 +0000)]

Merge "Merge "Fix dead surface/window left on screen" into nyc-dev am: 289395b1fe am: 31e3b5c065" into nyc-mr1-dev-plus-aosp

commit | commitdiff | tree

Chong Zhang [Thu, 21 Apr 2016 18:17:19 +0000 (18:17 +0000)]

Merge "Fix dead surface/window left on screen" into nyc-dev am: 289395b1fe
am: 31e3b5c065

* commit '31e3b5c065d596b5a1a8d0638183ac737414f913':
Fix dead surface/window left on screen

Change-Id: I46664a5f9ca48557fab650385409e445267b109d

commit | commitdiff | tree

Chong Zhang [Thu, 21 Apr 2016 18:17:11 +0000 (18:17 +0000)]

Merge "Fix dead surface/window left on screen" into nyc-dev am: 289395b1fe
am: 786302f2fa

* commit '786302f2fa658740b1819bc53e3ca3e3f2b4e01e':
Fix dead surface/window left on screen

Change-Id: Ibba49102dbd1bdfe7aba4b5cf022b3c3c0098e9a

commit | commitdiff | tree

Chong Zhang [Thu, 21 Apr 2016 18:15:02 +0000 (18:15 +0000)]

Merge "Fix dead surface/window left on screen" into nyc-dev
am: 289395b1fe

* commit '289395b1feca65fc758384bb2d5c12f1c78500c1':
Fix dead surface/window left on screen

Change-Id: Idd818246a5ada66abc24806529848d8d25a2e383

commit | commitdiff | tree

Chong Zhang [Thu, 21 Apr 2016 18:14:59 +0000 (18:14 +0000)]

commit | commitdiff | tree

Chong Zhang [Thu, 21 Apr 2016 17:58:50 +0000 (17:58 +0000)]

Merge "Fix dead surface/window left on screen" into nyc-dev

commit | commitdiff | tree

Daniel Nishi [Thu, 21 Apr 2016 17:57:04 +0000 (17:57 +0000)]

Merge "Add a branded VPN icon for quick settings and status bar." into nyc-mr1-dev
am: 0cdb8177ea

* commit '0cdb8177eaa47a3a5d3c1ba5112bc3385b70c78a':
Add a branded VPN icon for quick settings and status bar.

Change-Id: I61b79cb9b3007116ad8b6c37987f511f1c623ddf

commit | commitdiff | tree

Daniel Nishi [Thu, 21 Apr 2016 17:39:59 +0000 (17:39 +0000)]

Merge "Add a branded VPN icon for quick settings and status bar." into nyc-mr1-dev

commit | commitdiff | tree

Yohei Yukawa [Thu, 21 Apr 2016 17:20:53 +0000 (17:20 +0000)]

Merge "Accept null subtype in InputMethodSubtypeHandle." into nyc-dev am: d67a1ca49b
am: e3512894af

* commit 'e3512894afbdc0f28b67e021edb76d0c5d13c2f7':

Change-Id: I6d9f12a9161fdd2ff0aaf0694ec21bdc500a69b5

commit | commitdiff | tree

Chris Craik [Thu, 21 Apr 2016 17:20:51 +0000 (17:20 +0000)]

Merge "Fix shadow radius too large for RS" into nyc-dev am: 924d8227c4
am: ef79274692

* commit 'ef7927469226df2a41f9b83528fc29787a439af9':

Change-Id: Ieb8c9e27439d822cf1c72fe5e4c6b08b77142d6c

commit | commitdiff | tree

Yohei Yukawa [Thu, 21 Apr 2016 17:18:38 +0000 (17:18 +0000)]

Merge "Accept null subtype in InputMethodSubtypeHandle." into nyc-dev am: d67a1ca49b
am: 1f79c0fea1

* commit '1f79c0fea1b8ed938fe77633739abcbee0f43456':
Accept null subtype in InputMethodSubtypeHandle.

Change-Id: I04c3bde21a2d837bcf04c43d9460818b00f6fd3d

commit | commitdiff | tree

Chris Craik [Thu, 21 Apr 2016 17:18:36 +0000 (17:18 +0000)]

Merge "Fix shadow radius too large for RS" into nyc-dev am: 924d8227c4
am: 4293527405

* commit '42935274055b0760a61d234f73a7c69bebc163f9':
Fix shadow radius too large for RS

Change-Id: I166302f76457272bfbd22dabbb8174ac6641a139

commit | commitdiff | tree

Yohei Yukawa [Thu, 21 Apr 2016 17:16:19 +0000 (17:16 +0000)]

Merge "Accept null subtype in InputMethodSubtypeHandle." into nyc-dev
am: d67a1ca49b

* commit 'd67a1ca49b138056d53490322ffdadef61d95fec':
Accept null subtype in InputMethodSubtypeHandle.

Change-Id: I8eb560fa0176836894164a9e7856d44bd0b91a09

commit | commitdiff | tree

Chris Craik [Thu, 21 Apr 2016 17:16:16 +0000 (17:16 +0000)]

Merge "Fix shadow radius too large for RS" into nyc-dev
am: 924d8227c4

* commit '924d8227c4c790f05fb90d6140de15fa8abb704b':
Fix shadow radius too large for RS

Change-Id: I14e606d89f456bedb240f564acc7867b629bf8ed

commit | commitdiff | tree

Yohei Yukawa [Thu, 21 Apr 2016 17:16:15 +0000 (17:16 +0000)]

commit | commitdiff | tree

Chris Craik [Thu, 21 Apr 2016 17:16:14 +0000 (17:16 +0000)]

Merge "Fix shadow radius too large for RS" into nyc-dev
am: 924d8227c4

* commit '924d8227c4c790f05fb90d6140de15fa8abb704b':
Fix shadow radius too large for RS

Change-Id: I165e946b30e47ba711efb23996ec9d08b0043310

commit | commitdiff | tree

Yohei Yukawa [Thu, 21 Apr 2016 17:11:53 +0000 (17:11 +0000)]

Merge "Accept null subtype in InputMethodSubtypeHandle." into nyc-dev

commit | commitdiff | tree

Chris Craik [Thu, 21 Apr 2016 17:09:02 +0000 (17:09 +0000)]

Merge "Fix shadow radius too large for RS" into nyc-dev

commit | commitdiff | tree

Adam Lesinski [Thu, 21 Apr 2016 17:05:06 +0000 (10:05 -0700)]

Fix order of operation issue with ResStringPool

Due to ! taking precedence over bitwise &, the condition for
checking non-null terminated string blocks is incorrect.

Adds parentheses for the correct behavior.

Bug:28288210
Change-Id: Ie31fa239e5f869e6bb28deb6ae190f41f1aa4d92

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 21 Apr 2016 16:36:22 +0000 (16:36 +0000)]

Merge "Merge "PIP: Fix system UI crash" into nyc-dev am: 28d9c9f7b2 am: 552c5af941" into nyc-mr1-dev-plus-aosp

commit | commitdiff | tree

Youngsang Cho [Thu, 21 Apr 2016 16:35:55 +0000 (16:35 +0000)]

Merge "PIP: Fix system UI crash" into nyc-dev am: 28d9c9f7b2
am: 552c5af941

* commit '552c5af941ad45fb9132807e3e3e341b05c44eaa':

Change-Id: Ie5bd40a5217495ec549211709baf60ed885b3fa1

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 21 Apr 2016 16:34:21 +0000 (16:34 +0000)]

Merge "Merge "PIP: Fix system UI crash" into nyc-dev am: 28d9c9f7b2 am: 552c5af941" into nyc-mr1-dev-plus-aosp

commit | commitdiff | tree

Youngsang Cho [Thu, 21 Apr 2016 16:33:57 +0000 (16:33 +0000)]

Merge "PIP: Fix system UI crash" into nyc-dev am: 28d9c9f7b2
am: 552c5af941

* commit '552c5af941ad45fb9132807e3e3e341b05c44eaa':
PIP: Fix system UI crash

Change-Id: I11bfc92d3cde5c62757d79fa7426192ec33eedae

commit | commitdiff | tree

Youngsang Cho [Thu, 21 Apr 2016 16:33:54 +0000 (16:33 +0000)]

Merge "PIP: Fix system UI crash" into nyc-dev am: 28d9c9f7b2
am: a7932ad290

* commit 'a7932ad29048f3b430a01a14c310e1718c35114c':
PIP: Fix system UI crash

Change-Id: I3b862c6f01bf05407cf4655a1bd48e732df52084

commit | commitdiff | tree

Jaewan Kim [Thu, 21 Apr 2016 16:31:43 +0000 (16:31 +0000)]

Merge "PIP: Fix system UI crash" into nyc-dev
am: 28d9c9f7b2

* commit '28d9c9f7b2498d5b81bdfbf6cabc955c4a2ecec9':
PIP: Fix system UI crash

Change-Id: If073cb6c099d05abd99674b461bc46fbd377c9c2

commit | commitdiff | tree

Jaewan Kim [Thu, 21 Apr 2016 16:31:42 +0000 (16:31 +0000)]

Merge "PIP: Fix system UI crash" into nyc-dev
am: 28d9c9f7b2

* commit '28d9c9f7b2498d5b81bdfbf6cabc955c4a2ecec9':
PIP: Fix system UI crash

Change-Id: Ief778c79108ac6d2eb5e7b2406f9c6d1da6c8ca7

commit | commitdiff | tree

Youngsang Cho [Thu, 21 Apr 2016 16:23:00 +0000 (16:23 +0000)]

Merge "PIP: Fix system UI crash" into nyc-dev

commit | commitdiff | tree

Tony Mak [Thu, 21 Apr 2016 15:58:21 +0000 (15:58 +0000)]

Merge "Fix wrong app is launched after solving challenge from tapping notification" into nyc-dev am: d3589ee715
am: c3bd9dc93f

* commit 'c3bd9dc93fa27b7fe96ed1870fa05074c9438266':

Change-Id: Ib2ec0d403ccac5ed35f08c559217ddda2684b3b4

commit | commitdiff | tree

Julia Reynolds [Thu, 21 Apr 2016 15:58:18 +0000 (15:58 +0000)]

Merge "Accept the calendar name in addition to the owner as a calendar filter." into nyc-dev am: 54a6394cf9
am: 49ac59197a

* commit '49ac59197aa35eafcb7f24bf6bf6332a49a0b9e9':

Change-Id: I9a54c8d213c921979ae361c30cde1c6f7f2f2804

commit | commitdiff | tree

Tony Mak [Thu, 21 Apr 2016 15:56:15 +0000 (15:56 +0000)]

Merge "Fix wrong app is launched after solving challenge from tapping notification" into nyc-dev am: d3589ee715
am: f5f982f014

* commit 'f5f982f0148f04f1bdf05312a9770f137e8dda54':
Fix wrong app is launched after solving challenge from tapping notification

Change-Id: If7fbf80682d5c7583f3cec37dd6e807a0067ac18

commit | commitdiff | tree

Julia Reynolds [Thu, 21 Apr 2016 15:56:13 +0000 (15:56 +0000)]

Merge "Accept the calendar name in addition to the owner as a calendar filter." into nyc-dev am: 54a6394cf9
am: ccd8b64b88

* commit 'ccd8b64b88572f123d138a336f72e8fcc99aabe1':
Accept the calendar name in addition to the owner as a calendar filter.

Change-Id: Icbb2bd0b0f2f175e7120b1e2868efe6863defde7

commit | commitdiff | tree

Tony Mak [Thu, 21 Apr 2016 15:56:06 +0000 (15:56 +0000)]

Merge "Fix wrong app is launched after solving challenge from tapping notification" into nyc-dev
am: d3589ee715

* commit 'd3589ee715e397e61025265adc883c9ed3be4f56':
Fix wrong app is launched after solving challenge from tapping notification

Change-Id: I9de441cca7574620fb3917adddbd911a8a935854

commit | commitdiff | tree

Julia Reynolds [Thu, 21 Apr 2016 15:56:04 +0000 (15:56 +0000)]

Merge "Accept the calendar name in addition to the owner as a calendar filter." into nyc-dev
am: 54a6394cf9

* commit '54a6394cf96423936e6f3548ed8d78ff82e6b247':
Accept the calendar name in addition to the owner as a calendar filter.

Change-Id: Id788bb4465b947d6b5515a3c1d560c337ea5c382

commit | commitdiff | tree

Tony Mak [Thu, 21 Apr 2016 15:53:57 +0000 (15:53 +0000)]

commit | commitdiff | tree

Julia Reynolds [Thu, 21 Apr 2016 15:53:55 +0000 (15:53 +0000)]

commit | commitdiff | tree

Tony Mak [Thu, 21 Apr 2016 15:51:13 +0000 (15:51 +0000)]

Merge "Fix wrong app is launched after solving challenge from tapping notification" into nyc-dev

commit | commitdiff | tree

Tony Mak [Thu, 21 Apr 2016 15:43:08 +0000 (16:43 +0100)]

Fix wrong app is launched after solving challenge from tapping notification

PendingIntent.FLAG_ONE_SHOT is needed to prevent the PendingIntent being
reused.

Also, flag and activity option of credential intent in BaseStatusBar
is not same as the one in ActivityStarter. Added a new
function startConfirmDeviceCredentialIntent in AM to centralize it.

Change-Id: I2d9e5923ad5d4d012f10057c409c666c8ca299a3
Fix: 28309964

commit | commitdiff | tree

Julia Reynolds [Thu, 21 Apr 2016 15:36:29 +0000 (15:36 +0000)]

Merge "Accept the calendar name in addition to the owner as a calendar filter." into nyc-dev

commit | commitdiff | tree

Julia Reynolds [Thu, 21 Apr 2016 15:36:02 +0000 (15:36 +0000)]

Merge "Always reevaluate rules when a new service is added." into nyc-dev am: a8574a1dfa
am: f581bc8399

* commit 'f581bc8399b953c655eb6a6ce24e11c2d5e1a569':

Change-Id: I96b0567223e6ad4da3ab50f5646cbe9ecb8e29e7

commit | commitdiff | tree

Keith Cheung [Thu, 21 Apr 2016 15:35:58 +0000 (15:35 +0000)]

Merge "Include work app in battery optimization settings" into nyc-dev am: 39066abb59
am: b21712eceb

* commit 'b21712eceb0dc5e25f52d151df2956748afbbecd':

Change-Id: I99b12a3e45646644dac8bc74c9bd62e7064523e1

commit | commitdiff | tree

Julia Reynolds [Thu, 21 Apr 2016 15:33:51 +0000 (15:33 +0000)]

Merge "Always reevaluate rules when a new service is added." into nyc-dev am: a8574a1dfa
am: f18655bd43

* commit 'f18655bd439f7c7996b585e02a4dc658d9230b46':
Always reevaluate rules when a new service is added.

Change-Id: I1fb7d9ef91deeac1559910b5c4d65807d074add4

commit | commitdiff | tree

Keith Cheung [Thu, 21 Apr 2016 15:33:49 +0000 (15:33 +0000)]

Merge "Include work app in battery optimization settings" into nyc-dev am: 39066abb59
am: 5b935c170a

* commit '5b935c170a1a746ad33da3d2383913508998db56':
Include work app in battery optimization settings

Change-Id: I437bafa953979a56314948b5d04e107317384aa3

commit | commitdiff | tree

Julia Reynolds [Thu, 21 Apr 2016 15:31:47 +0000 (15:31 +0000)]

Merge "Always reevaluate rules when a new service is added." into nyc-dev
am: a8574a1dfa

* commit 'a8574a1dfaa45089d392ebf05a8a82e4d8a1d82e':
Always reevaluate rules when a new service is added.

Change-Id: Ia9098705c487402bd987a1b55aec69a58fc67780

commit | commitdiff | tree

Keith Cheung [Thu, 21 Apr 2016 15:31:46 +0000 (15:31 +0000)]

Merge "Include work app in battery optimization settings" into nyc-dev
am: 39066abb59

* commit '39066abb5929622a1918805bf85d19180c6dfe3d':
Include work app in battery optimization settings

Change-Id: I3603894e9aca5b1dbe2ed0f6615ac8467e470a82

commit | commitdiff | tree

Julia Reynolds [Thu, 21 Apr 2016 15:31:20 +0000 (15:31 +0000)]

commit | commitdiff | tree

Keith Cheung [Thu, 21 Apr 2016 15:31:17 +0000 (15:31 +0000)]

commit | commitdiff | tree

Julia Reynolds [Thu, 21 Apr 2016 15:24:03 +0000 (15:24 +0000)]

Merge "Always reevaluate rules when a new service is added." into nyc-dev

commit | commitdiff | tree

Julia Reynolds [Thu, 21 Apr 2016 15:22:15 +0000 (15:22 +0000)]

Merge "Don\'t call into audiomanager holding a zen lock." into nyc-dev am: d0f2d1f9ac
am: bdfd3c836f

* commit 'bdfd3c836f637b9df5b48d160f55727b3c0b5cfa':

Change-Id: Idf0280d9caf6829fb5e9d0a9d62647bd724385fd

commit | commitdiff | tree

Julia Reynolds [Thu, 21 Apr 2016 15:20:06 +0000 (15:20 +0000)]

Merge "Don\'t call into audiomanager holding a zen lock." into nyc-dev am: d0f2d1f9ac
am: e042a3fe57

* commit 'e042a3fe577b9c19540b6e08376ac068b9bc1ab0':
Don't call into audiomanager holding a zen lock.

Change-Id: Ieb42deb5da289cf6ffaa036483d811aeb40c63e3

commit | commitdiff | tree

Julia Reynolds [Thu, 21 Apr 2016 15:18:12 +0000 (15:18 +0000)]

Merge "Don\'t call into audiomanager holding a zen lock." into nyc-dev
am: d0f2d1f9ac

* commit 'd0f2d1f9ace01c4e0581baa3f5eb0a694afca675':
Don't call into audiomanager holding a zen lock.

Change-Id: I8a7eee3478bca5d8bfd1262e68d136b58fda4884

commit | commitdiff | tree

Keith Cheung [Thu, 21 Apr 2016 15:18:06 +0000 (15:18 +0000)]

Merge "Include work app in battery optimization settings" into nyc-dev

commit | commitdiff | tree

Julia Reynolds [Thu, 21 Apr 2016 15:17:41 +0000 (15:17 +0000)]

commit | commitdiff | tree

Julia Reynolds [Thu, 21 Apr 2016 15:04:05 +0000 (15:04 +0000)]

Merge "Don't call into audiomanager holding a zen lock." into nyc-dev

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 21 Apr 2016 14:57:59 +0000 (14:57 +0000)]

Merge "Merge "Reinflate QS view on Locale configuration change" into nyc-dev am: 98c7c05dde am: aa9e0344fd" into nyc-mr1-dev-plus-aosp

commit | commitdiff | tree

Clara Bayarri [Thu, 21 Apr 2016 14:57:24 +0000 (14:57 +0000)]

Merge "Reinflate QS view on Locale configuration change" into nyc-dev am: 98c7c05dde
am: aa9e0344fd

* commit 'aa9e0344fdba1284ef9e45ac7764bb341056cfea':

Change-Id: I4caf450fc0bf01c6121bb8171f80d942c9cda88f

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 21 Apr 2016 14:55:47 +0000 (14:55 +0000)]

Merge "Merge "Reinflate QS view on Locale configuration change" into nyc-dev am: 98c7c05dde am: aa9e0344fd" into nyc-mr1-dev-plus-aosp

commit | commitdiff | tree

Clara Bayarri [Thu, 21 Apr 2016 14:55:17 +0000 (14:55 +0000)]

Merge "Reinflate QS view on Locale configuration change" into nyc-dev am: 98c7c05dde
am: aa9e0344fd

* commit 'aa9e0344fdba1284ef9e45ac7764bb341056cfea':
Reinflate QS view on Locale configuration change

Change-Id: Ia804f0393825c5d6f74f9447216227ae7692c741

commit | commitdiff | tree

Clara Bayarri [Thu, 21 Apr 2016 14:55:09 +0000 (14:55 +0000)]

Merge "Reinflate QS view on Locale configuration change" into nyc-dev am: 98c7c05dde
am: b91447b4e4

* commit 'b91447b4e4080743e2fd41019d096892bea29e1b':
Reinflate QS view on Locale configuration change

Change-Id: I2e1cc51d006147836a057ebe64390e8a338804d5