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

16931 Commits

Author SHA1 Message Date
Jason Monk
fc2c511ca0 am e18f69fa: am 473da8b6: am b73390ac: Merge "Fix work apps showing as not installed for owner" into mnc-dev 
* commit 'e18f69fa219e1649b5ec2aa53f2a3059ae58101d':
  Fix work apps showing as not installed for owner
 2015-06-10 17:13:08 +00:00
Chris Wren
a2acd4bc2b am 1d8d111a: am 7f588404: am 300a1416: Merge changes from topic \'tron\' into mnc-dev 
* commit '1d8d111a16bc696217162ddbd4cf08ca2bc5eb21':
  instrument notification longpress controls
  induct a bunch of new logging categories.
 2015-06-10 17:12:33 +00:00
Neil Fuller
afcbb4bb91 am c15b4bcf: am bbb06b32: am 8e095594: Merge "Stop showing long names for local timezones when it is ambiguous" into mnc-dev 
* commit 'c15b4bcf3d42b90c955bc3a19bc7eb5b23cad361':
  Stop showing long names for local timezones when it is ambiguous
 2015-06-10 17:12:07 +00:00
Jason Monk
e18f69fa21 am 473da8b6: am b73390ac: Merge "Fix work apps showing as not installed for owner" into mnc-dev 
* commit '473da8b6185ce13a9d07e3a6590901464a27900d':
  Fix work apps showing as not installed for owner
 2015-06-10 15:21:38 +00:00
Jason Monk
473da8b618 am b73390ac: Merge "Fix work apps showing as not installed for owner" into mnc-dev 
* commit 'b73390acdd6a71d74d6ad107520a0f22d2bc5f1e':
  Fix work apps showing as not installed for owner
 2015-06-10 15:07:49 +00:00
Chris Wren
1d8d111a16 am 7f588404: am 300a1416: Merge changes from topic \'tron\' into mnc-dev 
* commit '7f588404c531db878597f1221d56907c5c40de5e':
  instrument notification longpress controls
  induct a bunch of new logging categories.
 2015-06-10 15:02:04 +00:00
Neil Fuller
c15b4bcf3d am bbb06b32: am 8e095594: Merge "Stop showing long names for local timezones when it is ambiguous" into mnc-dev 
* commit 'bbb06b322bcd63a75484b2a54666141fc0a2b57e':
  Stop showing long names for local timezones when it is ambiguous
 2015-06-10 15:01:38 +00:00
Jason Monk
b73390acdd Merge "Fix work apps showing as not installed for owner" into mnc-dev 2015-06-10 14:58:56 +00:00
Chris Wren
7f588404c5 am 300a1416: Merge changes from topic \'tron\' into mnc-dev 
* commit '300a141650dc17d2a893b55133c62b0353d2a9bb':
  instrument notification longpress controls
  induct a bunch of new logging categories.
 2015-06-10 14:54:35 +00:00
Neil Fuller
bbb06b322b am 8e095594: Merge "Stop showing long names for local timezones when it is ambiguous" into mnc-dev 
* commit '8e095594a640a82b850ff3990bb690920eba921c':
  Stop showing long names for local timezones when it is ambiguous
 2015-06-10 14:53:54 +00:00
Jason Monk
6ff98ce2c8 Fix work apps showing as not installed for owner 
Bug: 21717956
Change-Id: Ia00537f3b50f958a2e35094abf1bfc73dc1f79af
 2015-06-10 10:18:22 -04:00
Chris Wren
300a141650 Merge changes from topic 'tron' into mnc-dev 
* changes:
  instrument notification longpress controls
  induct a bunch of new logging categories.
 2015-06-10 14:14:41 +00:00
Geoff Mendal
b381bcc185 Merge "Import translations. DO NOT MERGE" into mnc-dev 2015-06-10 14:10:00 +00:00
Geoff Mendal
d86ab3b324 Import translations. DO NOT MERGE 
Change-Id: I43d33e6e42b0bbeeec7cc330bbb9c068fa3828d2
Auto-generated-cl: translation import
 2015-06-10 09:04:16 -05:00
Geoff Mendal
36eb6d5f46 Merge "Import translations. DO NOT MERGE" into mnc-dev 2015-06-10 14:00:34 +00:00
Geoff Mendal
b6c026bec1 Merge "Import translations. DO NOT MERGE" into mnc-dev 2015-06-10 13:59:02 +00:00
Geoff Mendal
a126f69419 Import translations. DO NOT MERGE 
Change-Id: I20b6c72047df24a7b6f9ad21db1234bdc4889925
Auto-generated-cl: translation import
 2015-06-10 08:58:30 -05:00
Geoff Mendal
1947d9f55e Merge "Import translations. DO NOT MERGE" into mnc-dev 2015-06-10 13:57:32 +00:00
Geoff Mendal
09e34e989c Import translations. DO NOT MERGE 
Change-Id: I8f8557a777e3b2ed58593aa20d1a2b0f2a5aa33b
Auto-generated-cl: translation import
 2015-06-10 08:55:37 -05:00
Geoff Mendal
c960f3aa34 Import translations. DO NOT MERGE 
Change-Id: Id91c1fc06d73c8f99d53a5fce6d08ef9922b5d07
Auto-generated-cl: translation import
 2015-06-10 08:52:40 -05:00
Geoff Mendal
497e846b5a Merge "Import translations. DO NOT MERGE" 2015-06-10 13:03:14 +00:00
Geoff Mendal
fc8eaf0894 Import translations. DO NOT MERGE 
Change-Id: Iad81c74d4c36a30bb478892e34456b5713d22342
Auto-generated-cl: translation import
 2015-06-10 08:02:11 -05:00
Geoff Mendal
e9b37ac982 Merge "Import translations. DO NOT MERGE" 2015-06-10 12:56:32 +00:00
Geoff Mendal
e8316f974e Import translations. DO NOT MERGE 
Change-Id: I579a6e7b41757f72728d79a2680d55b82c239189
Auto-generated-cl: translation import
 2015-06-10 07:51:57 -05:00
Geoff Mendal
f4a9d6ed64 Merge "Import translations. DO NOT MERGE" 2015-06-10 12:51:29 +00:00
Geoff Mendal
3f88ea6c86 Merge "Import translations. DO NOT MERGE" 2015-06-10 12:49:41 +00:00
Geoff Mendal
39da55fece Import translations. DO NOT MERGE 
Change-Id: I444c2fffad2519fbb7b8bb43d6fbb5bb89261ac3
Auto-generated-cl: translation import
 2015-06-10 07:49:13 -05:00
Geoff Mendal
8c623de5fb Import translations. DO NOT MERGE 
Change-Id: Ic7ad9f69097b0acee4bb16f2c792ac01116f61fb
Auto-generated-cl: translation import
 2015-06-10 07:46:26 -05:00
Geoff Mendal
21ca82f3f6 Merge "Import translations. DO NOT MERGE" 2015-06-10 12:34:53 +00:00
Geoff Mendal
3c8a0debbf Import translations. DO NOT MERGE 
Change-Id: I6eba661705980ad16917844a08123cb49220a102
Auto-generated-cl: translation import
 2015-06-10 07:32:57 -05:00
Geoff Mendal
7098e6410f Import translations. DO NOT MERGE 
Change-Id: Ibb009dbb1ae21a98b16ee806b0e595b9f7299bd8
Auto-generated-cl: translation import
 2015-06-10 07:27:29 -05:00
Neil Fuller
8e095594a6 Merge "Stop showing long names for local timezones when it is ambiguous" into mnc-dev 2015-06-10 12:23:54 +00:00
Adrian Roos
9616eef270 am 31168493: am b4621174: am 5b7793ca: Merge "Expand scrim all the way to the right" into mnc-dev 
* commit '311684931c38292a5ed8f78ed839141c0a29e9f9':
  Expand scrim all the way to the right
 2015-06-10 02:06:01 +00:00
Adrian Roos
68f0c1e338 am 6220afe8: am dcd6ef27: am 94548476: Merge "Add content description to keyguard user avatar" into mnc-dev 
* commit '6220afe8db34d1e14e50c3a6fd25546d1c84177c':
  Add content description to keyguard user avatar
 2015-06-10 02:05:50 +00:00
Adrian Roos
311684931c am b4621174: am 5b7793ca: Merge "Expand scrim all the way to the right" into mnc-dev 
* commit 'b46211746c44180a231cef40ce06e8b2a63dd0a4':
  Expand scrim all the way to the right
 2015-06-10 01:54:33 +00:00
Adrian Roos
6220afe8db am dcd6ef27: am 94548476: Merge "Add content description to keyguard user avatar" into mnc-dev 
* commit 'dcd6ef27ed0674d17fcc94de006a10c84600e9d4':
  Add content description to keyguard user avatar
 2015-06-10 01:54:22 +00:00
Adrian Roos
b46211746c am 5b7793ca: Merge "Expand scrim all the way to the right" into mnc-dev 
* commit '5b7793cacf3910a386182a9b78460934d00dfdae':
  Expand scrim all the way to the right
 2015-06-10 01:40:51 +00:00
Adrian Roos
dcd6ef27ed am 94548476: Merge "Add content description to keyguard user avatar" into mnc-dev 
* commit '9454847618c3b799a0acfa0a2495cf8a120c4f26':
  Add content description to keyguard user avatar
 2015-06-10 01:40:42 +00:00
Adrian Roos
8dfe1b045b am f221e4b5: am 8aa14b59: am dbcf0a9e: Merge "ImageWallpaper: Atomically fetch display info" into mnc-dev 
* commit 'f221e4b52b0a702aeb832b98db9b336e68b0715c':
  ImageWallpaper: Atomically fetch display info
 2015-06-10 01:34:50 +00:00
Adrian Roos
5b7793cacf Merge "Expand scrim all the way to the right" into mnc-dev 2015-06-10 01:29:56 +00:00
Adrian Roos
f221e4b52b am 8aa14b59: am dbcf0a9e: Merge "ImageWallpaper: Atomically fetch display info" into mnc-dev 
* commit '8aa14b59d360ad0140dae7a1e6ecdc6b11017ea5':
  ImageWallpaper: Atomically fetch display info
 2015-06-10 01:29:13 +00:00
Adrian Roos
2f2bd9a8f8 Expand scrim all the way to the right 
Fixes a bug where the scrim would not cover
the area occupied by the nav bar which looks weird
when the nav bar is hidden.

Bug: 19582019
Change-Id: I7d96ca46a41ec764984be5fe42d225cb94f53497
 2015-06-10 01:29:12 +00:00
Adrian Roos
9454847618 Merge "Add content description to keyguard user avatar" into mnc-dev 2015-06-10 01:28:31 +00:00
Adrian Roos
8aa14b59d3 am dbcf0a9e: Merge "ImageWallpaper: Atomically fetch display info" into mnc-dev 
* commit 'dbcf0a9e7d36545b73225ba2c164beb4b0ad9a06':
  ImageWallpaper: Atomically fetch display info
 2015-06-10 01:16:32 +00:00
Adrian Roos
ffc9097d10 Add content description to keyguard user avatar 
Bug: 20535812
Change-Id: I32ff0878c2332681ebd848c9da6e2dc42363b9be
 2015-06-09 18:09:49 -07:00
Adrian Roos
dbcf0a9e7d Merge "ImageWallpaper: Atomically fetch display info" into mnc-dev 2015-06-10 01:02:48 +00:00
Adrian Roos
9b9947de5d ImageWallpaper: Atomically fetch display info 
Previously we fetched rotation and dimens separately
which had the potential to cause inconsistencies.

Bug: 21440533
Change-Id: Ic537dbc01fc27af14124b1d97d4babafb6bc15f8
 2015-06-09 16:48:57 -07:00
Robin Lee
0eeff6cfc0 am e26ae30e: am 9e46757d: am 63cc6458: Merge "Switch over to updated VPN warning strings" into mnc-dev 
* commit 'e26ae30eeedd8145a021697e9b7e18bb740537c7':
  Switch over to updated VPN warning strings
 2015-06-09 23:40:57 +00:00
Robin Lee
e26ae30eee am 9e46757d: am 63cc6458: Merge "Switch over to updated VPN warning strings" into mnc-dev 
* commit '9e46757d857ebdff91a822d4d6313e38f7a81a2d':
  Switch over to updated VPN warning strings
 2015-06-09 23:28:05 +00:00
Xiyuan Xia
d880c4bc1e am c7a1d5d6: am 000d5339: am 12149b69: Merge "Add setting for assistant" into mnc-dev 
* commit 'c7a1d5d6e23f1cc0fbe2fb277395792cd6ee1657':
  Add setting for assistant
 2015-06-09 23:22:57 +00:00