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

190319 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jose Lima
5551aca2b8 Merge "Move ContentInfoExtender from Notification.java to a support library" into mnc-dev 2015-05-04 16:29:30 +00:00
Steve McKay
5d2c1d54b9 Merge "Ensure sort menu is shown as needed." into mnc-dev 2015-05-04 16:22:43 +00:00
Steve McKay
69aee097a3 Ensure sort menu is shown as needed. 
This also hoists common code for options menu setup into BaseActivity.

Change-Id: Ie87b8188a6c142b2312c92dc0d0bd550f0b1e59f
 2015-05-04 16:21:09 +00:00
Geoff Mendal
cf1f2ea5a7 Merge "Import translations. DO NOT MERGE" into mnc-dev 2015-05-04 14:44:12 +00:00
Geoff Mendal
123db791d0 Import translations. DO NOT MERGE 
Change-Id: I6371c9d043b9d5436804c4d755ecc6a645ff7119
Auto-generated-cl: translation import
 2015-05-04 07:43:39 -07:00
Andrew Flynn
ae499d19eb Merge "SystemUI Carrier Network Change unit tests" into mnc-dev 2015-05-04 14:43:20 +00:00
John Reck
05dc201ff6 Merge "Remove Bitmap#getSkBitmap" into mnc-dev 2015-05-04 14:34:52 +00:00
John Reck
1641c0cb0b Merge "Move AssetAtlas off of SkBitmap*" into mnc-dev 2015-05-04 14:34:39 +00:00
Andrew Flynn
5e75147806 SystemUI Carrier Network Change unit tests 
- Includes unit tests for verifying mobile data indicators.
- Found one bug where dark mode icon wasn't showing properly when
  different from light mode icon.
- Comment out failing test
  NetworkControllerSignalTest#testSetCurrentSubscriptions

Bug: 20288155
Change-Id: Ib3c9ba224c4187cab35d6bfa68f6bd4c489cf98e
 2015-05-04 10:25:09 -04:00
Tor Norbye
335f043bdb Merge "Add permission annotations on the AccountManager" into mnc-dev 2015-05-04 14:19:20 +00:00
Tor Norbye
80b530afdb Add permission annotations on the AccountManager 
Also add some @NonNull and @Nullable annotations.

Change-Id: Ia42b1af21ed14691b2268ea8b0f55d1b8b5ea2a3
 2015-05-04 06:29:55 -07:00
Geoff Mendal
3f2f2cbbd6 Import translations. DO NOT MERGE 
Change-Id: I1ece3421339dabd55a0c586e9ffd961cf7e3de56
Auto-generated-cl: translation import
 2015-05-04 07:11:09 -05:00
Lorenzo Colitti
0fdf7eee67 Merge "Add a status bar icon for Ethernet." into mnc-dev 2015-05-04 01:01:51 +00:00
Matthew Williams
303650c9cd Add full backup criteria to android manifest 
BUG: 20010079
Api change: ApplicationInfo now has a fullBackupContent int
where -1 is (off) 0 is (on) and >0 indicates an xml
resource that should be parsed in order for a developer
to indicate exactly which files they want to include/exclude
from the backup set.
dd: https://docs.google.com/document/d/1dnNctwhWOI-_qtZ7I3iNRtrbShmERj2GFTzwV4xXtOk/edit#heading=h.wcfw1q2pbmae

Change-Id: I90273dc0aef5e9a3230c6b074a45e8f5409ed5ce
 2015-05-03 16:19:27 -07:00
Svet Ganov
ca030f8ed5 Merge "Add read cell broadcast app op - framework" into mnc-dev 2015-05-03 00:44:14 +00:00
Svet Ganov
ede431678e Add read cell broadcast app op - framework 
Change-Id: Icecc9d918db55493ada7a0faa6bfcc41d4114bbd
 2015-05-02 17:42:44 -07:00
Svetoslav
e9fc4cda50 Merge "Add camera app op - framework" into mnc-dev 2015-05-03 00:41:50 +00:00
Svetoslav
fbf0ecabac Add camera app op - framework 
Change-Id: I17736a8abe2c6775e990b88fb3eab963f47167d0
 2015-05-02 16:23:19 -07:00
Mike Lockwood
5ba44affe6 Merge "BluetoothMidiService: Add support for sending SysEx messages that span multiple Bluetooth packets" into mnc-dev 2015-05-02 16:09:47 +00:00
Geoff Mendal
9eb25fad18 Merge "Import translations. DO NOT MERGE" into mnc-dev 2015-05-02 06:29:55 +00:00
Geoff Mendal
d6fec943d7 Import translations. DO NOT MERGE 
Change-Id: Ib21a9d53d30f304a1c82dc4f45e82f3fe27723bb
Auto-generated-cl: translation import
 2015-05-01 23:27:24 -07:00
Geoff Mendal
6b27f7899f Merge "Import translations. DO NOT MERGE" into mnc-dev 2015-05-02 04:23:07 +00:00
Geoff Mendal
480798d878 Import translations. DO NOT MERGE 
Change-Id: I982c3b51da747b06c157c947ca441dc641acb5d5
Auto-generated-cl: translation import
 2015-05-01 23:16:15 -05:00
Lajos Molnar
4971de2a2e Merge "media: hook up MediaCodec.setSurface" into mnc-dev 2015-05-02 02:23:11 +00:00
Chong Zhang
039cd7ffaa Merge "MediaRecorderTest: test recording from persistent surface" into mnc-dev 2015-05-02 02:20:47 +00:00
Chong Zhang
0335916173 MediaRecorder: implement persistent input surface APIs 
Bug: 19127604
Bug: 19489395

Change-Id: Ic8e151b97ea6b85fc65f724d3e68e1cb6b500866
 2015-05-02 02:20:20 +00:00
Chong Zhang
1d82220a0e Merge "MediaCodec: implement persistent input surface APIs" into mnc-dev 2015-05-02 02:14:37 +00:00
Lorenzo Colitti
d46bb58fa6 Add a status bar icon for Ethernet. 
Bug: 20613953
Change-Id: I52970b4f5fb6429876d1a2eb195a834c9e020021
 2015-05-02 10:43:31 +09:00
Chong Zhang
ac95f1ac77 MediaRecorderTest: test recording from persistent surface 
Bug: 19127604
Bug: 19489395

Change-Id: I17984e0febaf0541a0ce650a07e0c485ffc41c08
 2015-05-01 18:37:07 -07:00
Jose Lima
4fdcc184e6 Move ContentInfoExtender from Notification.java to a support library 
Bug: 20643107

Change-Id: Idabd8b0ceb4b3c63584296736e0a5015511659e7
 2015-05-01 18:32:26 -07:00
Chong Zhang
8034d60f6e MediaCodec: implement persistent input surface APIs 
Bug: 19127604
Bug: 19489395

Change-Id: If0d723c9ecd6fe81d9df210bd2fd026b8603ea4a
 2015-05-01 18:30:09 -07:00
Bryce Lee
13428b5079 am f626c679: am a7f07fc3: Merge "Add configuration to allow animations during low power mode." into lmp-mr1-modular-dev 
* commit 'f626c679fdd7e44c6cf0eb2d2f6be786636a90bc':
  Add configuration to allow animations during low power mode.
 2015-05-02 01:22:24 +00:00
Rich Slogar
c2180dd516 am 31e49327: am 4e3a9193: am 7e42a822: am a00cf127: am 3e70c6b4: Merge "docs: studio 1.2 download link fix" into lmp-docs 
* commit '31e493277ada5dc72e6b0bf501fa649307bf6814':
 2015-05-02 01:22:14 +00:00
Rich Slogar
d8417f1216 am 906c4f27: am f7ef3edb: am 3e70c6b4: Merge "docs: studio 1.2 download link fix" into lmp-docs 
* commit '906c4f2719f73263a2c004e110172f41f5fbd67a':
  docs: studio 1.2 download link fix
 2015-05-02 01:22:07 +00:00
Raph Levien
5c26876304 Merge "Expose StaticLayout.Builder publicly" into mnc-dev 2015-05-02 00:42:18 +00:00
Raph Levien
4bf4e4c801 Merge "Make Paint a required field of StaticLayout Builder" into mnc-dev 2015-05-02 00:41:51 +00:00
Lajos Molnar
5e02ba977e media: hook up MediaCodec.setSurface 
Bug: 11990461
Change-Id: Id2dc952594c21c6be68e4ffd039c7f74006a2374
 2015-05-01 17:39:37 -07:00
Yohei Yukawa
b6bec1a403 Remove unused methods/variables/fields from Editor.java. 
This CL does nothing but remove unused code.

Change-Id: Ibe7c7aa1b9bdfd4117e27cb198082e307f4d68a4
 2015-05-01 23:30:35 +00:00
Mike Lockwood
8c26d843a7 BluetoothMidiService: Add support for sending SysEx messages that span multiple Bluetooth packets 
Change-Id: Id56f7c82ec97b6a46258111bbfd46ab1dc14dfe9
 2015-05-01 16:16:42 -07:00
Svet Ganov
574f53793d Merge "Add body sensors app op - framework base" into mnc-dev 2015-05-01 23:09:52 +00:00
Raph Levien
531c30c62b Expose StaticLayout.Builder publicly 
Expose the new Builder pattern for creating StaticLayout. This allows
access to a number of features that have been available to TextView
through a hidden constructor. Some of these features have existed
for a while (mostly maxLines), while others are new (breakStrategy,
indents).

The builder is cleaner and has a better upgrade path than the old
pattern of lots of constructors with varying numbers of arguments.

Bug: 20190561
Change-Id: Ia3cd124825ab0cb469d22d1fc576ad26454545b8
 2015-05-01 15:15:48 -07:00
John Reck
7c103a36f6 Remove Bitmap#getSkBitmap 
Change-Id: Ifb9047b426122d3e5a445eb7a0eb3fce38dedf27
 2015-05-01 14:38:44 -07:00
Chris Craik
106f88c890 Merge "Revert "Revert "Merge getDisplayList and updateDisplayListIfDirty""" into mnc-dev 2015-05-01 21:36:06 +00:00
John Reck
c6e2e8ff47 Move AssetAtlas off of SkBitmap* 
Switched to SkPixelRef*

Change-Id: I4a1d9dc6c55c1ebcce6b0b8c585e69559e523898
 2015-05-01 14:30:21 -07:00
Chris Craik
31a2d063df Revert "Revert "Merge getDisplayList and updateDisplayListIfDirty"" 
Fixes breakage from HwAccelerationTest

This reverts commit b2847afde24aac22c8fb804cdce0c24b8a7c40c4.

Change-Id: I762b3c9020fc1d06bac61ffa8b956049147515b1
 2015-05-01 14:30:15 -07:00
Fabrice Di Meglio
4eb03f8fd2 Merge "Remove obsolete code for App Links IntentFilterVerifier" into mnc-dev 2015-05-01 21:25:30 +00:00
Fabrice Di Meglio
7d7094fd2b Remove obsolete code for App Links IntentFilterVerifier 
- the intent filter verification is now done by the StatementService

See bug #20759587

Change-Id: Icee668819feffc282b3986873c9d13abbe03e92b
 2015-05-01 14:24:02 -07:00
Chris Craik
5c705c595d Merge "Fix build." into mnc-dev 2015-05-01 21:01:14 +00:00
Chris Craik
b2847afde2 Fix build. 
Revert "Merge getDisplayList and updateDisplayListIfDirty"

This reverts commit f85d064b536d9b2028a83e21d98eac9b40b74e95.

Change-Id: I8b1566aba67c385d72759ea2aea16edcd8477813
 2015-05-01 21:01:01 +00:00
Svet Ganov
b9d71a6f89 Add body sensors app op - framework base 
Change-Id: Idd5cd573fab3405e5b2a6e51d2d9d115650826e9
 2015-05-01 13:56:04 -07:00