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

229293 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jason Monk
057ee76e5c Fix build 
Fix bad merge

Change-Id: I2cd1f32a7e50b8fa1f7f85c52fe34111f7cea577
 2016-01-11 14:37:44 -05:00
Jason Monk
c06fbb1298 Move battery saver notification to QS 
Remove the battery saver notification and instead create a detail
panel within QS that allows it to be turned on and off.

Change-Id: I54654d26183586fa171fda04877a840701f8ef33
 2016-01-11 14:29:23 -05:00
Rob Carr
3d4f83c01f Merge "Implement surfaceRedrawNeeded for GLSurfaceView" 2016-01-11 19:18:25 +00:00
Jeremy Klein
502658dd90 Merge "Add a TETHER_PRIVILEGED permission and use it where needed." 2016-01-11 19:10:22 +00:00
Jose Lima
246c8e9c79 am bb9045ea: am 5551aca2: Merge "Move ContentInfoExtender from Notification.java to a support library" into mnc-dev am: 57b7573210 
am: e54704461e

* commit 'e54704461e02437f83ddc7ed432c345d3cec1e9f':
 2016-01-11 19:06:42 +00:00
Steve McKay
9fd87f4f4c Merge branch 'master' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/frameworks/base 2016-01-11 19:05:00 +00:00
Steve McKay
f7ade5d9cc am c05605ae: am 5d2c1d54: Merge "Ensure sort menu is shown as needed." into mnc-dev am: c226801a43 
am: 2dbf679cf0

* commit '2dbf679cf080df06e5340ea4bb766ea4f1aa1956':
 2016-01-11 19:04:00 +00:00
Steve McKay
48bc4bf872 am c05605ae: am 5d2c1d54: Merge "Ensure sort menu is shown as needed." into mnc-dev am: c226801a43 
am: 2dbf679cf0

* commit '2dbf679cf080df06e5340ea4bb766ea4f1aa1956':
 2016-01-11 19:01:55 +00:00
Geoff Mendal
622b16aed3 Merge branch 'master' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/frameworks/base 2016-01-11 18:59:56 +00:00
Geoff Mendal
b072232562 am ffdbf7da: (-s ours) am cf1f2ea5: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev am: f68020abf3 -s ours 
am: 44ad3ac50a  -s ours

* commit '44ad3ac50aca8ec2fc23ad1ac9defdc1446d518b':
 2016-01-11 18:59:02 +00:00
Xiaohui Chen
37a106a31d Merge "sysui: refactor out PanelHolder" 2016-01-11 18:58:14 +00:00
Andrew Flynn
39919510a5 am 10dced7a: am ae499d19: Merge "SystemUI Carrier Network Change unit tests" into mnc-dev am: 4aa8c7df2e 
am: dfe384fed8

* commit 'dfe384fed881eaab1d7585fb4e23edfab0823c33':
 2016-01-11 18:56:38 +00:00
Victor Chan
95b28d8a38 Merge "Null check mRecentsComponent and mDivider." 2016-01-11 18:55:22 +00:00
John Reck
108c4503ec Merge branch 'master' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/frameworks/base 2016-01-11 18:53:03 +00:00
John Reck
f06b321970 am cc8418fc: am 1641c0cb: Merge "Move AssetAtlas off of SkBitmap*" into mnc-dev am: dd447382cd 
am: aa768491c3

* commit 'aa768491c3463849df9f3e52ff37e6d9136271af':
 2016-01-11 18:52:10 +00:00
Jeff Davidson
6cf2fb3f66 Merge "Define new APIs for metering and roaming network stats buckets." 2016-01-11 18:51:20 +00:00
Jose Lima
e54704461e am bb9045ea: am 5551aca2: Merge "Move ContentInfoExtender from Notification.java to a support library" into mnc-dev 
am: 57b7573210

* commit '57b7573210750ead5c6a5d6a8ebd41d8e61636ec':
 2016-01-11 18:48:01 +00:00
Geoff Mendal
b596820fef Merge branch 'master' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/frameworks/base 2016-01-11 18:48:01 +00:00
Geoff Mendal
8bfb5dee1f am 577e34c9: (-s ours) am 3f2f2cbb: (-s ours) Import translations. DO NOT MERGE am: 896262ef52 -s ours 
am: 625b8124a0  -s ours

* commit '625b8124a03a2bec5bc168ab27777263a3f8e114':
 2016-01-11 18:46:53 +00:00
Tor Norbye
7058cc4725 Merge branch 'master' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/frameworks/base 2016-01-11 18:46:10 +00:00
Tor Norbye
f4e932599b am 7a560701: am 335f043b: Merge "Add permission annotations on the AccountManager" into mnc-dev am: 20ccf13fbc 
am: a4f3fa62a3

* commit 'a4f3fa62a36a0bcb0dfc3adae54bb802084cd690':
 2016-01-11 18:45:08 +00:00
Steve McKay
2dbf679cf0 am c05605ae: am 5d2c1d54: Merge "Ensure sort menu is shown as needed." into mnc-dev 
am: c226801a43

* commit 'c226801a43c17d41e59988adbb77fd06f2f77c9d':
 2016-01-11 18:44:59 +00:00
Adam Lesinski
04a424082b Merge "AAPT2: Warn when positional arguments exist and --legacy is on" 2016-01-11 18:44:58 +00:00
Gustav Sennton
1075d812f6 Merge "Fix WebView loading logic to allow changing provider if current disabled" 2016-01-11 18:43:05 +00:00
Adam Lesinski
979ccb2e6f AAPT2: Warn when positional arguments exist and --legacy is on 
This is normally an error, but old AAPT didn't check for it correctly,
so many projects violate this. With --legacy, this becomes a warning.

Change-Id: I23647e029930e11b719591cd38609e1b43247e20
 2016-01-11 10:42:19 -08:00
Geoff Mendal
44ad3ac50a am ffdbf7da: (-s ours) am cf1f2ea5: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev 
am: f68020abf3  -s ours

* commit 'f68020abf3a51ffefcf3cd8d2043684501b6f3ce':
 2016-01-11 18:41:56 +00:00
Lorenzo Colitti
584d6d7993 am e0c29e8e: am 0fdf7eee: Merge "Add a status bar icon for Ethernet." into mnc-dev am: 1c562bbb61 
am: a4486aa875

* commit 'a4486aa875e8908b6527da9958e556651fc33ccf':
 2016-01-11 18:40:55 +00:00
Matthew Williams
80e7d61b62 Merge branch 'master' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/frameworks/base 2016-01-11 18:39:22 +00:00
Andrew Flynn
dfe384fed8 am 10dced7a: am ae499d19: Merge "SystemUI Carrier Network Change unit tests" into mnc-dev 
am: 4aa8c7df2e

* commit '4aa8c7df2e09892c305cf9984ecf1916fa034e7f':
 2016-01-11 18:39:12 +00:00
Matthew Williams
25d55cc793 am c341c1f7: am 303650c9: Add full backup criteria to android manifest am: ead811790e 
am: 33265de780

* commit '33265de780b47e5cbc9924236e368f33d43257ee':
 2016-01-11 18:38:16 +00:00
John Reck
173c0352a5 am 01b321de: am 05dc201f: Merge "Remove Bitmap#getSkBitmap" into mnc-dev 
am: 0b1c17bd31

* commit '0b1c17bd314ab093e8455077b1740e30b6189c02':
 2016-01-11 18:36:18 +00:00
Matthew Williams
2dc5875d77 am c341c1f7: am 303650c9: Add full backup criteria to android manifest am: ead811790e 
am: 33265de780

* commit '33265de780b47e5cbc9924236e368f33d43257ee':
 2016-01-11 18:36:15 +00:00
Svet Ganov
280d048acf Merge branch 'master' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/frameworks/base 2016-01-11 18:34:19 +00:00
Svet Ganov
4d56fb6bc8 am 6a67cd45: am ca030f8e: Merge "Add read cell broadcast app op - framework" into mnc-dev am: a938239f33 
am: 6f094f575e

* commit '6f094f575e8d42a08e7c9423662fb6c04f12b5fb':
 2016-01-11 18:33:19 +00:00
John Reck
aa768491c3 am cc8418fc: am 1641c0cb: Merge "Move AssetAtlas off of SkBitmap*" into mnc-dev 
am: dd447382cd

* commit 'dd447382cd2a1fb81b5d6607d25fed2c76fcd9e5':
 2016-01-11 18:33:15 +00:00
Svet Ganov
a1528534d9 am 6a67cd45: am ca030f8e: Merge "Add read cell broadcast app op - framework" into mnc-dev am: a938239f33 
am: 6f094f575e

* commit '6f094f575e8d42a08e7c9423662fb6c04f12b5fb':
 2016-01-11 18:31:18 +00:00
Tor Norbye
a4f3fa62a3 am 7a560701: am 335f043b: Merge "Add permission annotations on the AccountManager" into mnc-dev 
am: 20ccf13fbc

* commit '20ccf13fbc685b96a8b1d4a59452143bec4fd711':
 2016-01-11 18:30:26 +00:00
Geoff Mendal
625b8124a0 am 577e34c9: (-s ours) am 3f2f2cbb: (-s ours) Import translations. DO NOT MERGE 
am: 896262ef52  -s ours

* commit '896262ef52c5de199d1ab3e59cab4f8efc2e37e8':
 2016-01-11 18:27:30 +00:00
Svetoslav
c211280609 am 0f74977b: am e9fc4cda: Merge "Add camera app op - framework" into mnc-dev am: 4e71319952 
am: 857e778b8b

* commit '857e778b8bc5c552ebf51953273bb99b6dfe1f91':
 2016-01-11 18:26:44 +00:00
Lorenzo Colitti
a4486aa875 am e0c29e8e: am 0fdf7eee: Merge "Add a status bar icon for Ethernet." into mnc-dev 
am: 1c562bbb61

* commit '1c562bbb610ef83f328b53d88e4958383aea824c':
 2016-01-11 18:24:55 +00:00
Deepanshu Gupta
0beaeadbe3 Merge "Fix ninepatch scaling." into mnc-ub-dev am: 0c08fc0fc5 
am: 2aebcddf02

* commit '2aebcddf02383c84a8a21279d32fd00376b8c25e':
  Fix ninepatch scaling.
 2016-01-11 18:23:50 +00:00
Jerome Gaillard
27f28509a6 Merge branch 'master' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/frameworks/base 2016-01-11 18:22:05 +00:00
Matthew Williams
33265de780 am c341c1f7: am 303650c9: Add full backup criteria to android manifest 
am: ead811790e

* commit 'ead811790e11432e994260e879edc16aa4f45297':
 2016-01-11 18:22:01 +00:00
Jerome Gaillard
63ebf34d6d Merge "Get color state list file content from PSI instead of disk" into mnc-ub-dev am: 171a2a9322 
am: 1bddf2b19d

* commit '1bddf2b19dbfc3f1edc540a5aaaacd84f8831412':
  Get color state list file content from PSI instead of disk
 2016-01-11 18:20:35 +00:00
Svet Ganov
6f094f575e am 6a67cd45: am ca030f8e: Merge "Add read cell broadcast app op - framework" into mnc-dev 
am: a938239f33

* commit 'a938239f33f2fc615cb8e1813eb6a9773ff16c96':
 2016-01-11 18:19:08 +00:00
Geoff Mendal
307ed40360 am 44acc73e: (-s ours) am 6b27f789: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev am: d6a9daa65e -s ours 
am: ffaba5f3ec  -s ours

* commit 'ffaba5f3ece78d84dae8daeeb21ad6faa76e697d':
 2016-01-11 18:19:08 +00:00
Svetoslav
857e778b8b am 0f74977b: am e9fc4cda: Merge "Add camera app op - framework" into mnc-dev 
am: 4e71319952

* commit '4e713199526b1ddc8c8a1a518eff0d19e44a145d':
 2016-01-11 18:16:09 +00:00
Lajos Molnar
f8642182b7 am 6a667c6f: am 4971de2a: Merge "media: hook up MediaCodec.setSurface" into mnc-dev am: fe96c1891e 
am: 18e8be647d

* commit '18e8be647d9c235608c41fe065641fe7fcc43698':
 2016-01-11 18:15:19 +00:00
Deepanshu Gupta
2aebcddf02 Merge "Fix ninepatch scaling." into mnc-ub-dev 
am: 0c08fc0fc5

* commit '0c08fc0fc58be4f52527d7a0529960752056e83b':
  Fix ninepatch scaling.
 2016-01-11 18:15:01 +00:00
Mike Lockwood
99c413c743 am 32624f29: am 5ba44aff: Merge "BluetoothMidiService: Add support for sending SysEx messages that span multiple Bluetooth packets" into mnc-dev 
am: 37ba571347

* commit '37ba57134777a82227e3e12a958111d7f37beb48':
 2016-01-11 18:13:06 +00:00