Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
182,679 Commits 3 Branches 0 Tags
3558752ec77f455bbabc86b3178dfb294edf5aff
Commit Graph

49647 Commits

Author SHA1 Message Date
Nicolas Prevot
3558752ec7 Merge "Improve the documentation of DISALLOW_CONFIG_BLUETOOTH." 2015-02-19 11:19:32 +00:00
Wale Ogunwale
9176a30d36 Merge "Set compatInfo to default if unset in ContextImpl constructor." 2015-02-19 01:05:29 +00:00
Wale Ogunwale
9cf9954432 Set compatInfo to default if unset in ContextImpl constructor. 
Will cause NPE when ResourceManager.getTopLevelResources() is called
if unset.

Bug: 19427781
Change-Id: I8c990cc425025cf426a87cac9dede09a14aa640c
 2015-02-18 16:31:34 -08:00
Mohamad Ayyash
97ae891df2 Merge "AlsaCardsParser: Ensure line is not NULL when reading Cards File." 2015-02-18 21:31:38 +00:00
Adrian Roos
a187960989 Merge "Set the light status flag based on right window" 2015-02-18 20:37:57 +00:00
Mohamad Ayyash
f98e1c72fc AlsaCardsParser: Ensure line is not NULL when reading Cards File. 
Change-Id: I5136bbb776bbbf97229b2d96975b819a94232d66
Signed-off-by: Mohamad Ayyash <mkayyash@google.com>
 2015-02-18 12:35:48 -08:00
Nicolas Prevot
1c4c442e45 Improve the documentation of DISALLOW_CONFIG_BLUETOOTH. 
BUG:19315055

Change-Id: Ic92a7b79f8113cad0474d62b0c615a1ada91838b
 2015-02-18 19:28:21 +00:00
Tor Norbye
a42d2eaf2d Merge "Add @ResourceInt annotations on APIs" 2015-02-18 19:24:01 +00:00
Adrian Roos
cd3884dfb2 Set the light status flag based on right window 
The flag needs to be set based on the top window that is either
reaching beneath the status bar or is dimming.

Bug: 19233606
Change-Id: I7b97f6869e3b7d5ae2b7030122b311ee9e13871f
 2015-02-18 20:09:42 +01:00
Adrian Roos
7478de1e87 Merge "Decouple package manager lock and bitmap decoding" 2015-02-18 18:09:09 +00:00
Tor Norbye
7b9c912f53 Add @ResourceInt annotations on APIs 
Change-Id: I119cc059c2f8bd98fd585fc84ac2b1b7d5892a08
 2015-02-18 07:49:03 -08:00
Adrian Roos
44bc07d874 Fix typo 
Change-Id: If59381862e3332675fd7b929bcee2928ecd0da21
 2015-02-18 15:03:37 +00:00
Wale Ogunwale
0233aee840 Merge "Fixed NPE in ResourceManager when Activity.recreate is called." 2015-02-18 03:23:39 +00:00
Svetoslav
1b71ea9b09 Remove unnecessary volume validators 
Change-Id: I5f13016fa23978c8d35e9b85ec0ebecdf40a3d74
 2015-02-17 18:35:02 -08:00
Wale Ogunwale
93f543ca98 Fixed NPE in ResourceManager when Activity.recreate is called. 
Bug: 19408756
Change-Id: I291badce7fe9a6feaf2a5e8ce1005e6a86b30147
 2015-02-17 16:55:03 -08:00
Marco Nelissen
8c98b8eb68 am 2fddfea3: am a3404263: am 2f71ee24: am ffaee8bd: Merge "Fix NPE" into lmp-mr1-dev 
* commit '2fddfea3e5311bb5503d148d7ad18240a13ee033':
  Fix NPE
 2015-02-18 00:40:19 +00:00
Alan Viverette
7a94dcfb71 am 7286d1ff: am 157c75e4: am 504c77e1: am d611fc4e: Merge "Fix year picker initial range" into lmp-mr1-dev 
* commit '7286d1ff3747d3a71aeb2c8724947b35cc77d2d5':
  Fix year picker initial range
 2015-02-18 00:30:15 +00:00
Marco Nelissen
2fddfea3e5 am a3404263: am 2f71ee24: am ffaee8bd: Merge "Fix NPE" into lmp-mr1-dev 
* commit 'a3404263c08c711fa5f2d73a92ec7c6f366b9338':
  Fix NPE
 2015-02-18 00:15:00 +00:00
Marco Nelissen
a3404263c0 am 2f71ee24: am ffaee8bd: Merge "Fix NPE" into lmp-mr1-dev 
* commit '2f71ee24c5d982ccaa490c7a3e1390473909fbf0':
  Fix NPE
 2015-02-18 00:07:58 +00:00
Marco Nelissen
2f71ee24c5 am ffaee8bd: Merge "Fix NPE" into lmp-mr1-dev 
* commit 'ffaee8bda9c8d22af17098fec0e6626301d91844':
  Fix NPE
 2015-02-18 00:01:02 +00:00
Marco Nelissen
ffaee8bda9 Merge "Fix NPE" into lmp-mr1-dev 2015-02-17 23:54:30 +00:00
Craig Mautner
2007a630d4 am 28de8edb: am ab8f60e4: am a94e4297: Merge "Do not make ActivityContainer available to apps. DO NOT MERGE" into lmp-mr1-dev 
* commit '28de8edb7d72f938f47d7fdd8ce058c5c8933b8e':
  Do not make ActivityContainer available to apps. DO NOT MERGE
 2015-02-17 23:53:11 +00:00
Craig Mautner
28de8edb7d am ab8f60e4: am a94e4297: Merge "Do not make ActivityContainer available to apps. DO NOT MERGE" into lmp-mr1-dev 
* commit 'ab8f60e425a90045eca06c09f0274f402b062d8f':
  Do not make ActivityContainer available to apps. DO NOT MERGE
 2015-02-17 23:43:33 +00:00
Craig Mautner
ab8f60e425 am a94e4297: Merge "Do not make ActivityContainer available to apps. DO NOT MERGE" into lmp-mr1-dev 
* commit 'a94e42970d4e664e193cde0cf2700cb7e15961c9':
  Do not make ActivityContainer available to apps. DO NOT MERGE
 2015-02-17 23:36:51 +00:00
Craig Mautner
a94e42970d Merge "Do not make ActivityContainer available to apps. DO NOT MERGE" into lmp-mr1-dev 2015-02-17 23:30:34 +00:00
Alan Viverette
7286d1ff37 am 157c75e4: am 504c77e1: am d611fc4e: Merge "Fix year picker initial range" into lmp-mr1-dev 
* commit '157c75e4b55d34d0426d08044130d74c2369be07':
  Fix year picker initial range
 2015-02-17 22:51:53 +00:00
Alan Viverette
157c75e4b5 am 504c77e1: am d611fc4e: Merge "Fix year picker initial range" into lmp-mr1-dev 
* commit '504c77e1ae2fdd3608cd7878a4b0ba4c9eac91de':
  Fix year picker initial range
 2015-02-17 22:41:15 +00:00
Alan Viverette
504c77e1ae am d611fc4e: Merge "Fix year picker initial range" into lmp-mr1-dev 
* commit 'd611fc4ea648e23ed3a6b311a07a5bd8b3e2927c':
  Fix year picker initial range
 2015-02-17 22:36:06 +00:00
Marco Nelissen
0e24cb7fb5 Fix NPE 
Path can be null if sd card was ejected, and we shouldn't make a thumbnail
in that case.

Bug: 19380821
Change-Id: Iee69effdd321622de026ad7b57c74cf9da81a176
 2015-02-17 14:35:37 -08:00
Alan Viverette
2a90fa6d94 Fix year picker initial range 
BUG: 19410328
Change-Id: I2a2952eb58eb856f93b7af2f49e08abe71078aa9
 2015-02-17 21:11:36 +00:00
Craig Mautner
ca0653a424 Do not make ActivityContainer available to apps. DO NOT MERGE 
A security leak was discovered whereby a malicious app could get the
IActivityContainer object from one app and use it to inject events
into another app. This fix removes the availability of the
IActivityContainer and replaces its one use with a method for
returning the information the IActivityContainer was used for.

Fixes bug 19394591.

Change-Id: Ib3cec25b25130cd8e098892c057742cfd575cfdd
 2015-02-17 20:41:39 +00:00
Adrian Roos
1bdff9139f Decouple package manager lock and bitmap decoding 
Also moves the actual reading and decoding of the
icon into the client process to avoid unnecessary
copies.

Bug: 18474438
Change-Id: I71623ef48c770d752593aa97d69517f6139cc947
 2015-02-17 20:57:23 +01:00
Craig Mautner
aa7e3ed947 Do not make ActivityContainer available to apps. 
A security leak was discovered whereby a malicious app could get the
IActivityContainer object from one app and use it to inject events
into another app. This fix removes the availability of the
IActivityContainer and replaces its one use with a method for
returning the information the IActivityContainer was used for.

Fixes bug 19394591.

Change-Id: Ib3cec25b25130cd8e098892c057742cfd575cfdd
 2015-02-17 10:31:20 -08:00
Adrian Roos
34c28165d7 Merge "Disable color view animations when stable insets change" 2015-02-17 15:50:10 +00:00
Adrian Roos
76f25f4ad3 Disable color view animations when stable insets change 
Prevents color view from showing up on phones when
the orientation changes to landscape. Previously, the
animation was only prevented when the stable inset of a
bar became nonzero; now we disable animations whenever
the nonzeroness changes.

Bug: 19353466

Change-Id: Ibcf15ee4e0c9fba429745dde1b808ee41c7473cf
 2015-02-17 16:37:53 +01:00
Robin Lee
abf3570f38 DevicePolicy: Make uid parameter an int 
This should not have been a long to begin with.

Change-Id: Icbf6e2e97cb6301b968b3eb8b3f9a46331f7983e
 2015-02-17 14:18:32 +00:00
Piotr Jastrzebski
cc34625cb7 am 07aaff33: am 58524b2a: am e7e92381: Merge "Register DDM handlers at the beginning of main method." 
* commit '07aaff33ef0e61dfbb15188c5aae0624dc9524a9':
  Register DDM handlers at the beginning of main method.
 2015-02-16 13:06:08 +00:00
Piotr Jastrzebski
07aaff33ef am 58524b2a: am e7e92381: Merge "Register DDM handlers at the beginning of main method." 
* commit '58524b2aa620ae1ea709ae48b8b8598548cc7202':
  Register DDM handlers at the beginning of main method.
 2015-02-16 12:59:37 +00:00
Piotr Jastrzebski
e7e9238180 Merge "Register DDM handlers at the beginning of main method." 2015-02-16 12:47:08 +00:00
Robin Lee
f6901eb9e2 Merge "Device Policy API to choose a private key silently" 2015-02-16 10:47:51 +00:00
Wale Ogunwale
421d6ad191 Merge "Adjust activity display metrics based on stack configuration." 2015-02-15 20:20:08 +00:00
Yohei Yukawa
8f3b76cb0c am 83c804be: Merge "Prevent duplicated registration of OnComputeInternalInsetsListener" automerge: efd9abb 
automerge: 32acf75

* commit '32acf753e8989766f67fd5300d3eb467f707cc79':
  Prevent duplicated registration of OnComputeInternalInsetsListener
 2015-02-14 15:21:50 +00:00
Yohei Yukawa
32acf753e8 am 83c804be: Merge "Prevent duplicated registration of OnComputeInternalInsetsListener" automerge: efd9abb 
* commit '83c804be9c1f33ff4bafbfd60218751a00c7d2b9':
  Prevent duplicated registration of OnComputeInternalInsetsListener
 2015-02-14 15:17:17 +00:00
Yohei Yukawa
efd9abb7df Merge "Prevent duplicated registration of OnComputeInternalInsetsListener" 2015-02-14 15:08:07 +00:00
Wale Ogunwale
7c72668f19 Adjust activity display metrics based on stack configuration. 
Apps normally use context.getResources().getDisplayMetrics()
or getWindowManager().getDefaultDisplay() to get information
about the screen dimensions. Not all the screen space is available
for apps in a multi-window environment, so we limit the dimensions
of the display object exposed to the app to that of the containing
stack.

Bug: 19225079
Bug: 19354838
Change-Id: I8dc3a6c9b99ecedcca28fc4ddaba9f31feb4f871
 2015-02-13 21:12:47 -08:00
Alan Viverette
91d415d863 Clear focus from previously focused view in EBT helper 
Change-Id: I1bd70e345fb7e8a2a1a621c20912b8325a3cd142
 2015-02-13 17:23:05 -08:00
Dianne Hackborn
682c8e509b Merge "Update voice interaction layer for new UI design." 2015-02-13 20:16:04 +00:00
Dianne Hackborn
ae6688b096 Update voice interaction layer for new UI design. 
Can switch from a pure overlay at the top of the screen,
to interactive mode with the voice UI drawing at the bottom
and pushing its target activity up like an IME.

Add mechanism to get assist data to the voice interaction UI.

Add some basic visualization of the assist data, outlining
where on the screen we have text.

Add a test ACTION_ASSIST handler, which can propagate the
assist data it gets to the voice interaction session so
you can see what kind of data we are getting from different
apps.

Change-Id: I18312fe1601d7926d1fb96a817638d60f6263771
 2015-02-13 11:27:57 -08:00
Chet Haase
50dd4c1c59 Merge "Add ClipReveal window transition for application launch" 2015-02-13 19:02:15 +00:00
Chet Haase
10e23ab61b Add ClipReveal window transition for application launch 
Issue #19362772 Better material launch animations

Change-Id: Ic94fde910b6b5554ee954dfbbf374949f9eb189d
 2015-02-13 11:00:55 -08:00