drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
267,280 Commits 1 Branch 0 Tags
Commit Graph

267280 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jorim Jaggi
9322632f6a Fix a flicker when returning to the lockscreen am: d11d1a9486 
am: afaf4ac7a9

Change-Id: I26eb19aba2c68fea5faa82bf1e41286b8999bf4a
 2016-08-17 18:54:20 +00:00
Andrew Solovay
d22a03d005 docs: Docs for Support Library 24.2.0 release am: 085994c40d am: 39cc61a4db am: 4cb3b9a60e 
am: b074294332

Change-Id: I97b44921d587ce5a6c86a45e5de895afb3b752e4
 2016-08-17 18:54:08 +00:00
Eric Schmidt
0e9b6e1a85 docs: Fixed code snippet in notify-user/navigation.html am: 32cc6b7fb7 am: c89c8c3e37 am: 707678d8c5 
am: a2036a2109

Change-Id: Id55478887f21abeaac4cab3c613e58510413202f
 2016-08-17 18:53:58 +00:00
Erik Kline
583db815ea Better error handling when NetworkManagementService#untetherInterface() fails. am: 1f4278a67a 
am: 121a238408

Change-Id: Ia6ba40f089a15f69329883bba9ada8654b456b16
 2016-08-17 18:53:48 +00:00
Doris Liu
ed4fcdb689 Merge "Fix listeners not getting called when AVD falls back on UI thread" into nyc-mr1-dev am: 69115b8e29 
am: ccc3794f77

Change-Id: I0e4fea7a87e84d7a211d90380f07ad117fddd4d1
 2016-08-17 18:42:57 +00:00
Doris Liu
a0daf61dd0 Fix listeners not getting called when AVD falls back on UI thread am: 853b23d1fa 
am: 79846f859c

Change-Id: I8f8a70a35f9b6ea75ae627af8235a0fe65802551
 2016-08-17 18:42:54 +00:00
Erik Kline
a4ee0280e4 Merge "Support tethering IPv6 toward the first requested downstream." into nyc-mr1-dev am: caf7d3f447 
am: a4e219b9d2

Change-Id: If82fc1e1dfe3a5ae4ffd259a1418c66a52a753ad
 2016-08-17 18:42:50 +00:00
Erik Kline
2f7509a7c3 Support tethering IPv6 toward the first requested downstream. am: 6e29bf0069 
am: ea6634fb11

Change-Id: I60fff390f3142c7a5e4336816b56b4e18aa2122e
 2016-08-17 18:42:47 +00:00
Fan Zhang
d254d188e0 Merge "Allow configurable data warning for BillingCyclerPreference" into nyc-mr1-dev am: f1e87a2003 
am: 3800b74013

Change-Id: I6c57431a4e288459e58ee02de3e5a5967f955e85
 2016-08-17 18:42:42 +00:00
Android Build Merger (Role)
7129d0a551 Merge changes from topics 'am-f4b13b8a7d3047959d28636f972cde03', 'am-709ecf5e9d934415bd2b800c61a87867' into nyc-mr1-dev-plus-aosp 
* changes:
  Allow configurable data warning for BillingCyclerPreference am: 70196d84a6 am: 0060d55f95
  Merge "Adds a CNAP filtering field to the CarrierConfig" into nyc-mr1-dev am: fb599587a1 am: c9457e184b
  Adds a CNAP filtering field to the CarrierConfig am: 5ea6b1ece9 am: 8dc27c8f40
  Merge "Fixed the animation of the no notifications view" into nyc-mr1-dev am: a9663254ac am: 0a0e5e47ff
  Fixed the animation of the no notifications view am: a9d3efd194 am: 5e5a78fc56
  Merge "Define low latency output stream (formerly primary)" into nyc-mr1-dev am: 46db227b84 am: 209fabdd3e
  Define low latency output stream (formerly primary) am: 2ed8f215f1 am: caea5a683b
 2016-08-17 18:35:25 +00:00
Fan Zhang
030d4dba76 Allow configurable data warning for BillingCyclerPreference am: 70196d84a6 
am: 0060d55f95

Change-Id: Ifbd834766ca62265a6eba9a57e34b5e8f2ae03d9
 2016-08-17 18:30:59 +00:00
Brad Ebinger
b140787175 Merge "Adds a CNAP filtering field to the CarrierConfig" into nyc-mr1-dev am: fb599587a1 
am: c9457e184b

Change-Id: Ib2272d72315401cf66514c3f1410c5c698189531
 2016-08-17 18:30:24 +00:00
Jorim Jaggi
afaf4ac7a9 Fix a flicker when returning to the lockscreen 
am: d11d1a9486

Change-Id: Ia0b617be2bb00db24115f04f362cd072d59ebe71
 2016-08-17 18:28:59 +00:00
Brad Ebinger
6314a0e9c7 Adds a CNAP filtering field to the CarrierConfig am: 5ea6b1ece9 
am: 8dc27c8f40

Change-Id: Ia35252ae72c26b29db792a870c4537b2cd6ddddb
 2016-08-17 18:28:58 +00:00
Selim Cinek
c09628928c Merge "Fixed the animation of the no notifications view" into nyc-mr1-dev am: a9663254ac 
am: 0a0e5e47ff

Change-Id: Idf72edd2364f9a77ae82ce498f0f68bc3355b53f
 2016-08-17 18:28:12 +00:00
Chih-hung Hsieh
4797b44d0c Merge "Fix google-explicit-constructor warnings in common_time." am: 67d47e0ca6 am: 9b36ce973e 
am: f121917e51

Change-Id: Id90b589066e93fee5f956dc2bf31e1e8405a5d5c
 2016-08-17 18:28:00 +00:00
Selim Cinek
00768a7fdc Fixed the animation of the no notifications view am: a9d3efd194 
am: 5e5a78fc56

Change-Id: Id1dc8db7bfd6be2f0d0892f9c0b4c2b06c878c16
 2016-08-17 18:27:34 +00:00
Glenn Kasten
ac509e0b61 Merge "Define low latency output stream (formerly primary)" into nyc-mr1-dev am: 46db227b84 
am: 209fabdd3e

Change-Id: Ibec333bf6408847d8c7b1399c3680db8c17d5f72
 2016-08-17 18:26:50 +00:00
Glenn Kasten
dedb2fd507 Define low latency output stream (formerly primary) am: 2ed8f215f1 
am: caea5a683b

Change-Id: I459a9fb99c11cb252232b7192355564d43397f04
 2016-08-17 18:25:32 +00:00
Android Build Merger (Role)
3ca943c8c7 Merge "Merge "Add new window type TYPE_DRAWN_APPLICATION" into nyc-mr1-dev am: f925b8df92 am: f420c7cbd4" into nyc-mr1-dev-plus-aosp 2016-08-17 18:24:13 +00:00
Android Build Merger (Role)
7b8b10bfe9 Merge "Add new window type TYPE_DRAWN_APPLICATION am: fea963edee am: 5e09ceb641" into nyc-mr1-dev-plus-aosp 2016-08-17 18:23:59 +00:00
Android Build Merger (Role)
cda1352ed7 Merge "Merge "Add null check to KeyEventDispatcher." into nyc-mr1-dev am: 49b684d562 am: b126ddb917" into nyc-mr1-dev-plus-aosp 2016-08-17 18:23:46 +00:00
Android Build Merger (Role)
25a6e68c31 Merge "Add null check to KeyEventDispatcher. am: 2a0e48aaf5 am: 2aab159e33" into nyc-mr1-dev-plus-aosp 2016-08-17 18:23:33 +00:00
Android Build Merger (Role)
816cc359c6 Merge "Merge "Fixed a bug where the summary could become visible even if it was suppressed" into nyc-mr1-dev am: e68228fbd9 am: 225bedbc86" into nyc-mr1-dev-plus-aosp 2016-08-17 18:23:18 +00:00
Chong Zhang
c2146ccc16 Merge "Add new window type TYPE_DRAWN_APPLICATION" into nyc-mr1-dev am: f925b8df92 
am: f420c7cbd4

Change-Id: Iae7e055d656e2b0a76107e07f2061c261a53b773
 2016-08-17 18:22:14 +00:00
Chong Zhang
9391bc557c Add new window type TYPE_DRAWN_APPLICATION am: fea963edee 
am: 5e09ceb641

Change-Id: I955b985c47ca10a17dec6921af0277d1d6a7431d
 2016-08-17 18:22:10 +00:00
Phil Weaver
9deac03237 Merge "Add null check to KeyEventDispatcher." into nyc-mr1-dev am: 49b684d562 
am: b126ddb917

Change-Id: I3b2c79f8b967f7db4f565e56cf82313ed892945d
 2016-08-17 18:22:04 +00:00
Phil Weaver
644f1c2466 Add null check to KeyEventDispatcher. am: 2a0e48aaf5 
am: 2aab159e33

Change-Id: Ib06fc038c6322bbb9d8cb090abb89f71018be10a
 2016-08-17 18:22:00 +00:00
Selim Cinek
5586bc62aa Merge "Fixed a bug where the summary could become visible even if it was suppressed" into nyc-mr1-dev am: e68228fbd9 
am: 225bedbc86

Change-Id: I9e988c9e48c1ceca17589bef18e7e3846cd89b60
 2016-08-17 18:21:56 +00:00
Android Build Merger (Role)
84acf63a77 Merge "Fixed a bug where the summary could become visible even if it was suppressed am: 80c44dd800 am: b665b73437" into nyc-mr1-dev-plus-aosp 2016-08-17 18:21:09 +00:00
Android Build Merger (Role)
2616b32666 Merge "Merge "NavBar: Use rotation watcher" into nyc-mr1-dev am: 27c3c34fe1 am: 9f36729f4d" into nyc-mr1-dev-plus-aosp 2016-08-17 18:20:56 +00:00
Android Build Merger (Role)
a5b2457dc7 Merge "NavBar: Use rotation watcher am: a98b32cea2 am: c5d9eb8ebd" into nyc-mr1-dev-plus-aosp 2016-08-17 18:20:41 +00:00
Android Build Merger (Role)
b373c6e3b2 Merge changes from topic 'am-0fee4bce4d374519bf38ae18517a4d79' into nyc-mr1-dev-plus-aosp 
* changes:
  Merge "Support auto-downgrade to audio when data disabled." into nyc-mr1-dev am: 76c973cda0 am: 464eb12320
  Support auto-downgrade to audio when data disabled. am: 86d5c3fcde am: 6c678716e4
 2016-08-17 18:20:17 +00:00
Selim Cinek
4a7e6cfe3f Fixed a bug where the summary could become visible even if it was suppressed am: 80c44dd800 
am: b665b73437

Change-Id: If10fcd405843f8e84e1512970b58186af5965948
 2016-08-17 18:18:48 +00:00
Adrian Roos
decebdad19 Merge "NavBar: Use rotation watcher" into nyc-mr1-dev am: 27c3c34fe1 
am: 9f36729f4d

Change-Id: Ic82cf732a685f2f3730594ec0880727ce2d4a0fa
 2016-08-17 18:18:44 +00:00
Adrian Roos
d966384d80 NavBar: Use rotation watcher am: a98b32cea2 
am: c5d9eb8ebd

Change-Id: I599c828ade63e93b0d71a3a1b5e96670c7a40ea1
 2016-08-17 18:18:39 +00:00
Eric Schmidt
b9709340bc docs: Fixed code snippet in notify-user/navigation.html am: 32cc6b7fb7 am: 39cc61a4db 
am: 2367fb1c56

Change-Id: Ibbca09bc1667ba02e9c6d99f39350ca8bb6d5e61
 2016-08-17 18:18:33 +00:00
Tyler Gunn
9b4da39028 Merge "Support auto-downgrade to audio when data disabled." into nyc-mr1-dev am: 76c973cda0 
am: 464eb12320

Change-Id: Ibab9f79cfb09cb41e56c549549539eaffb16bcb2
 2016-08-17 18:18:33 +00:00
Chih-hung Hsieh
f121917e51 Merge "Fix google-explicit-constructor warnings in common_time." am: 67d47e0ca6 
am: 9b36ce973e

Change-Id: I8a9e9d09a48da636a8256aec1c0000441d986d4e
 2016-08-17 18:18:22 +00:00
Tyler Gunn
f37124b2f5 Support auto-downgrade to audio when data disabled. am: 86d5c3fcde 
am: 6c678716e4

Change-Id: I0a488516d7e9f1a90b91bd46d6f9a8a27f7f8a61
 2016-08-17 18:17:59 +00:00
Jorim Jaggi
d11d1a9486 Fix a flicker when returning to the lockscreen 
If we return to the lockscreen from a FLAG_SHOW_WHEN_LOCKED activity,
there was an additional black flicker as the wallpaper wasn't shown
for a couple of frames. The issue is that we didn't set the wallpaper
flag again, to fix another flicker with lockscreen wallpapers. Now,
we pass the state whether we currently have a lockscreen wallpaper
and if we don't have one, we immediately set the wallpaper flag
again.

Bug: 30829255
Bug: 30883413
Change-Id: I9faeaa77b98eb02058171ce19cf90b43826ebe9e
 2016-08-17 18:10:54 +00:00
Android Build Merger (Role)
4e11151428 Merge "Merge "Merge "Revert "Revert "Track libcore update of Map classes to jdk8u60""" into stage-aosp-master am: 6f15eabd29" into nyc-dev-plus-aosp am: 8fa05abfab" into nyc-mr1-dev-plus-aosp 2016-08-17 18:07:25 +00:00
Android Build Merger (Role)
c208ec636c Merge "Merge "Revert "Revert "Track libcore update of Map classes to jdk8u60""" into stage-aosp-master am: 6f15eabd29 am: 150ab094ed" into nyc-mr1-dev-plus-aosp 2016-08-17 18:07:09 +00:00
Eric Schmidt
2367fb1c56 docs: Fixed code snippet in notify-user/navigation.html am: 32cc6b7fb7 
am: 39cc61a4db

Change-Id: I68dd3b9ebc95fe57fe9e4553f87774c69bb10df1
 2016-08-17 18:06:55 +00:00
Android Build Merger (Role)
6bb6c339f8 Merge "Merge "docs: Fixed code snippet in notify-user/navigation.html am: 32cc6b7fb7 am: c89c8c3e37" into nyc-dev-plus-aosp am: d604595820" into nyc-mr1-dev-plus-aosp 2016-08-17 18:06:54 +00:00
Android Build Merger (Role)
deee4c8b2d Merge "Merge "Replace android auto assets with the latest" into nyc-mr1-dev am: 91ef993e2d am: 8f7f6abd09" into nyc-mr1-dev-plus-aosp 2016-08-17 18:06:41 +00:00
Android Build Merger (Role)
84e360c86c Merge "docs: Fixed code snippet in notify-user/navigation.html am: 32cc6b7fb7 am: c89c8c3e37 am: 97b75e6ce9" into nyc-mr1-dev-plus-aosp 2016-08-17 18:06:31 +00:00
Chih-hung Hsieh
9b36ce973e Merge "Fix google-explicit-constructor warnings in common_time." 
am: 67d47e0ca6

Change-Id: I2548e50d2654d3dfacd175b4db118983848bf15c
 2016-08-17 18:06:22 +00:00
Android Build Merger (Role)
caed0244a8 Merge "Replace android auto assets with the latest am: e45311adc9 am: a7ad4e2e45" into nyc-mr1-dev-plus-aosp 2016-08-17 18:06:17 +00:00
Android Build Merger (Role)
95d9a69a60 Merge "Revert "Revert "Track libcore update of Map classes to jdk8u60"" am: 7f5095ddfe am: 900471ab11" into nyc-mr1-dev-plus-aosp 2016-08-17 18:06:07 +00:00