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

158928 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Junda Liu
5716ebe50d Merge "Add HIDE_CARRIER_NETWORK_SETTINGS global setting." into lmp-mr1-dev 
automerge: 2eb5a5f

* commit '2eb5a5f727d4692b70b68cb4b1b7e31bf74f13a4':
  Add HIDE_CARRIER_NETWORK_SETTINGS global setting.
 2014-11-12 01:14:00 +00:00
Junda Liu
2eb5a5f727 Merge "Add HIDE_CARRIER_NETWORK_SETTINGS global setting." into lmp-mr1-dev 2014-11-12 00:05:20 +00:00
Ihab Awad
cf9248cbf5 am 9114a845: Merge "Update PhoneAccount icon API (1/6)" into lmp-mr1-dev 
* commit '9114a845d9474bc2ecc807c3f195fe0c5314556c':
  Update PhoneAccount icon API (1/6)
 2014-11-11 23:02:22 +00:00
Ihab Awad
9114a845d9 Merge "Update PhoneAccount icon API (1/6)" into lmp-mr1-dev 2014-11-11 22:56:08 +00:00
Jeff Brown
c1275e72ec am 32f7a6d8: Merge "Move device admin max screen off timeout to internal interface." into lmp-mr1-dev 
* commit '32f7a6d813d7f936c7aa6a1f3abe2f05022a6cd9':
  Move device admin max screen off timeout to internal interface.
 2014-11-11 22:48:23 +00:00
Jeff Brown
32f7a6d813 Merge "Move device admin max screen off timeout to internal interface." into lmp-mr1-dev 2014-11-11 22:27:45 +00:00
Ihab Awad
476cc83558 Update PhoneAccount icon API (1/6) 
Responding to comments by jeffbrown@ in http://ag/574833

Bug: 18291787

Change-Id: I011aa59642f1ca6998bce76a59850909d2daa987
 2014-11-11 13:18:49 -08:00
Adam Lesinski
1e2e05bf8c am da772234: Merge "AAPT: Ignore densities specified in -c flag" into lmp-mr1-dev 
* commit 'da772234f6f9498bf02f31448bda16e9fcbd6bd2':
  AAPT: Ignore densities specified in -c flag
 2014-11-11 20:26:24 +00:00
Chris Wren
56c1037767 am aeca1baf: Merge "Add event logs when we launch fullscreen notications." into lmp-mr1-dev 
* commit 'aeca1baf656ac5197db345db6b890a5c5e4719b0':
  Add event logs when we launch fullscreen notications.
 2014-11-11 20:26:19 +00:00
Adam Lesinski
da772234f6 Merge "AAPT: Ignore densities specified in -c flag" into lmp-mr1-dev 2014-11-11 20:23:59 +00:00
Chris Wren
aeca1baf65 Merge "Add event logs when we launch fullscreen notications." into lmp-mr1-dev 2014-11-11 20:21:59 +00:00
Prabhakar Thirumoorthy
d476bfd01b am 2cc8043c: Merge "If task isn\'t found in recents, look in the stacks." into lmp-mr1-dev 
* commit '2cc8043cad4c51aeffd5650b669b15e93fb980d5':
  If task isn't found in recents, look in the stacks.
 2014-11-11 20:05:20 +00:00
Prabhakar Thirumoorthy
2cc8043cad Merge "If task isn't found in recents, look in the stacks." into lmp-mr1-dev 2014-11-11 20:01:10 +00:00
Craig Mautner
e042bf2b22 If task isn't found in recents, look in the stacks. 
It may take an attach to move a task into the recents list. If the
timing is right a task may not be in recents by the time we are
removing it from the stacks due to a finish. In that case we should
look in the stacks for the task as well as looking in recents.

Fixes bug 18017409.

Change-Id: Idcfe2e263c9d0fe9a063fdf22515ac4e7fe89ecb
 2014-11-11 11:28:43 -08:00
Chong Zhang
6610985c35 am 00795e9e: Merge "return error MEDIA_ERROR_UNSUPPORTED when Range request fail" into lmp-mr1-dev 
* commit '00795e9edda7038022d8f1268ca3304165076d2e':
  return error MEDIA_ERROR_UNSUPPORTED when Range request fail
 2014-11-11 18:38:04 +00:00
Chong Zhang
00795e9edd Merge "return error MEDIA_ERROR_UNSUPPORTED when Range request fail" into lmp-mr1-dev 2014-11-11 18:33:21 +00:00
Pavel Zhamaitsiak
5ff25cb76c am 7635aab1: Merge "IMS: Peer capabilities support" into lmp-mr1-dev 
* commit '7635aab10b44773d599ef8229a967fdf99d2817a':
  IMS: Peer capabilities support
 2014-11-11 18:11:45 +00:00
Chris Wren
223c66b681 Add event logs when we launch fullscreen notications. 
When the heads up does not trigger on enqueue, and also when a heads up
is escalated to a fullscreen on a screen event.

Bug: 16644299
Change-Id: Iec7f7ddb966b46171d0e7d1ee52daf5847a7c9da
 2014-11-11 18:11:25 +00:00
Pavel Zhamaitsiak
7635aab10b Merge "IMS: Peer capabilities support" into lmp-mr1-dev 2014-11-11 18:07:06 +00:00
Wale Ogunwale
4937d95aa4 am 285970cf: Merge "Fixed index out of bounds issue when removing windows." into lmp-mr1-dev 
* commit '285970cfeae3b175699b038f51c0f9b012a95d0e':
  Fixed index out of bounds issue when removing windows.
 2014-11-11 18:03:04 +00:00
Wale Ogunwale
285970cfea Merge "Fixed index out of bounds issue when removing windows." into lmp-mr1-dev 2014-11-11 18:00:06 +00:00
Alan Viverette
0aaebd47cc am a9b503ae: Merge "Fix Material styling in remaining dialogs and layouts" into lmp-mr1-dev 
* commit 'a9b503aec2cd27eeb40fab8436c64b4c7de9cacf':
  Fix Material styling in remaining dialogs and layouts
 2014-11-11 17:39:55 +00:00
Alan Viverette
a9b503aec2 Merge "Fix Material styling in remaining dialogs and layouts" into lmp-mr1-dev 2014-11-11 17:34:36 +00:00
Deepanshu Gupta
8f6e7a868c am 7ed525bf: am 5ad9b395: am a44fdb9e: Merge "Don\'t skip loading object animator." into lmp-dev 
* commit '7ed525bf92749113a177815ffce5d6545bd59314':
  Don't skip loading object animator.
 2014-11-11 17:26:17 +00:00
Deepanshu Gupta
7ed525bf92 am 5ad9b395: am a44fdb9e: Merge "Don\'t skip loading object animator." into lmp-dev 
* commit '5ad9b395db341b3360d481039f152f8ce1d8360c':
  Don't skip loading object animator.
 2014-11-11 17:22:00 +00:00
Deepanshu Gupta
5ad9b395db am a44fdb9e: Merge "Don\'t skip loading object animator." into lmp-dev 
* commit 'a44fdb9e216810ba62f20c1b4571ebc240931efa':
  Don't skip loading object animator.
 2014-11-11 17:17:02 +00:00
Deepanshu Gupta
a44fdb9e21 Merge "Don't skip loading object animator." into lmp-dev 2014-11-11 17:11:24 +00:00
John Spurlock
3069aa2057 am 73546e53: Merge "Zen: Exit downtime on next alarm (if mode=none)." into lmp-mr1-dev 
* commit '73546e535925e6c2902cba10d9da962ba6b39d5f':
  Zen: Exit downtime on next alarm (if mode=none).
 2014-11-11 16:56:37 +00:00
John Spurlock
73546e5359 Merge "Zen: Exit downtime on next alarm (if mode=none)." into lmp-mr1-dev 2014-11-11 16:50:15 +00:00
Shriram Ganesh
482e6da972 IMS: Peer capabilities support 
Add support for querying peer capabilities

IMS: Add support for HD icon display related information

Added support to pass the restrict cause associated with the peer
in order to enable display of the HD icon when necessary.Added
support to pass local audio codec information and defined values
for new codecs not defined.

Change-Id: If05d46bdb3907a0ec7efdde48337a7932a7a5c21
 2014-11-11 16:36:15 +00:00
George Mount
c07b6295c6 am 12403b24: Merge "Make setOutlineProvider change transitionGroup." into lmp-mr1-dev 
* commit '12403b242f86c0572a99a963fd1e71eda680192b':
  Make setOutlineProvider change transitionGroup.
 2014-11-11 15:45:09 +00:00
George Mount
12403b242f Merge "Make setOutlineProvider change transitionGroup." into lmp-mr1-dev 2014-11-11 15:41:33 +00:00
Deepanshu Gupta
2c5cddbd07 Don't skip loading object animator. 
This is used by Buttons as part of StateListAnimator.

Change-Id: Id370869e71898d46e11bbd17ad31169c9f9f5274
 2014-11-11 15:21:19 +00:00
John Spurlock
3c984d67eb Zen: Exit downtime on next alarm (if mode=none). 
Bug: 16373455
Change-Id: Ie5d878ea4f930556ed84225c21d7c6df61024fbc
 2014-11-11 10:03:24 -05:00
Tim Kilbourn
215779b226 am 54a5ca1a: Merge "Add tv product variants to strings." into lmp-mr1-dev 
* commit '54a5ca1aad1bdbb154ca731ab9a6c026d58a42d6':
  Add tv product variants to strings.
 2014-11-11 06:37:52 +00:00
Tim Kilbourn
54a5ca1aad Merge "Add tv product variants to strings." into lmp-mr1-dev 2014-11-11 06:32:33 +00:00
Chong Zhang
8976a0954c return error MEDIA_ERROR_UNSUPPORTED when Range request fail 
Bug: 18235751
Change-Id: I4631daf50bb76b70dd740c45b628294ad1aa45e1
 2014-11-10 19:32:28 -08:00
Adam Lesinski
c78b33d011 Merge "split-select: fix OSX build" into lmp-mr1-dev 
automerge: be593a7

* commit 'be593a7778fe053f67fa37dcc2174639ed725b17':
  split-select: fix OSX build
 2014-11-11 02:48:01 +00:00
Adam Lesinski
be593a7778 Merge "split-select: fix OSX build" into lmp-mr1-dev 2014-11-11 02:29:58 +00:00
Eric Laurent
b45d3b2bd0 am 4b7b5570: am 75c306dd: am df878bd3: am ced2f74a: am e8c1a97f: am 3b92fc04: am 1c2b0d52: AudioEffect JNI: use new max preprocessing constant automerge: 8db769d automerge: 9e0ed1c automerge: ad64557 
* commit '4b7b55705561be791cdc8258f2ebcdd0b8ed1427':
 2014-11-11 02:14:56 +00:00
Eric Laurent
4b7b557055 am 75c306dd: am df878bd3: am ced2f74a: am e8c1a97f: am 3b92fc04: am 1c2b0d52: AudioEffect JNI: use new max preprocessing constant automerge: 8db769d automerge: 9e0ed1c 
automerge: ad64557

* commit 'ad6455721e1257054f2ca4334d2578129429e3b6':
 2014-11-11 02:10:37 +00:00
Adam Lesinski
a2bb565db5 AAPT: Ignore densities specified in -c flag 
The --preferred-density flag knows how to handle missing resources of
specific densities. Using -c with a density leads to missing resources.

Change-Id: I2251d842f48c08ed083663bb7ed608e14c4983c8
 2014-11-10 17:56:11 -08:00
Eric Laurent
ad6455721e am 75c306dd: am df878bd3: am ced2f74a: am e8c1a97f: am 3b92fc04: am 1c2b0d52: AudioEffect JNI: use new max preprocessing constant automerge: 8db769d automerge: 9e0ed1c 
* commit '75c306ddc716b36bdc54aaf75dd7eacbd008ab98':
 2014-11-11 01:43:21 +00:00
Adam Lesinski
c3344e8a6d split-select: fix OSX build 
Clang is a bit stricter about what template definition it chooses
for mixed types that are normally possible to cast between.
Operations like std::find(int iterator, int iterator, enum) will fail,
as Clang won't implicitly cast an enum to an int here.

Change-Id: Ib2276c382ebf2b877e1045d32b1a9d0a1fa4d4a4
 2014-11-10 17:39:47 -08:00
Eric Laurent
75c306ddc7 am df878bd3: am ced2f74a: am e8c1a97f: am 3b92fc04: am 1c2b0d52: AudioEffect JNI: use new max preprocessing constant automerge: 8db769d 
automerge: 9e0ed1c

* commit '9e0ed1c2d67bc2ec74e24782f3738889fa0d79d2':
 2014-11-11 01:34:45 +00:00
Dianne Hackborn
525da30193 am 85d558cd: Add Activity API to get referrer information. 
* commit '85d558cd486d195aabfc4b43cff8f338126f60a5':
  Add Activity API to get referrer information.
 2014-11-11 00:47:53 +00:00
Dianne Hackborn
85d558cd48 Add Activity API to get referrer information. 
This expands the use of EXTRA_REFERRER to be relevant anywhere,
allowing apps to supply referrer information if they want.  However,
if they don't explicitly supply it, then the platform now keeps
track of package names that go with Intents when delivering them
to apps, which it can be returned as the default value.

The new method Activity.getReferrer() is used to retrieve this
referrer information.  It knows about EXTRA_REFERRER, it can return
the default package name tracked internally, and it also can return
a new EXTRA_REFERRER_NAME if that exists.  The latter is needed
because we can't use EXTRA_REFERRER in some cases since it is a Uri,
and things like #Intent; URI extras can only generate primitive type
extras.  We really need to support this syntax for referrers, so we
need to have this additional extra field as an option.

When a referrer is to a native app, we are adopting the android-app
scheme.  Since we are doing this, Intent's URI creation and parsing
now supports this scheme, and we improve its syntax to be able to build
intents with custom actions and stuff, instead of being all hung up
on custom schemes.

While doing this, fixed a problem when parsing both intent: and new
android-app: schemes with a selector portion, where we were not
respecting any scheme that was specified.

Change-Id: I06e55221e21a8156c1d6ac755a254fea386917a2
 2014-11-11 00:42:18 +00:00
Eric Laurent
9e0ed1c2d6 am df878bd3: am ced2f74a: am e8c1a97f: am 3b92fc04: am 1c2b0d52: AudioEffect JNI: use new max preprocessing constant 
automerge: 8db769d

* commit '8db769dd56822a59f1997a9cb53ed02d3d1cb8dd':
  AudioEffect JNI: use new max preprocessing constant
 2014-11-11 00:22:33 +00:00
Alan Viverette
f89b58ca83 Fix Material styling in remaining dialogs and layouts 
Also updates existing row and dialog layouts to use preferred list item
or dialog padding as appropriate, fixes incorrect activity themes, and
updates ChooseAccountActivity variants for Material.

BUG: 18314215
BUG: 18292562
Change-Id: I2fde4ba6db80d839104abdaa334a46ad1861600f
 2014-11-10 16:14:27 -08:00
Alan Viverette
e1362d1170 am 993e3d2d: Merge "Call OnTimeChangedListener when new TimePicker values are selected" into lmp-mr1-dev 
* commit '993e3d2d40cbd95d78cd3d2a76c77af2f4ab0e88':
  Call OnTimeChangedListener when new TimePicker values are selected
 2014-11-10 23:57:55 +00:00