Commit Graph

3531 Commits

Author SHA1 Message Date
Filip Gruszczynski
db0fa33f44 Merge "Using initial activity layout to position the launching activity." 2015-08-24 14:39:03 +00:00
Filip Gruszczynski
9b1ce52f25 Using initial activity layout to position the launching activity.
The activity can be positioned in the center or in one of the corners.
From there it shifts its position and tries to find a spot where it
doesn't collide with other activities.

The CL also includes a few fixes necessary to pipe the information about
the initial layout through the system.

Change-Id: I2aaf5b6d20044aafec713b7bd4193b05cfbd16f3
2015-08-24 07:35:38 -07:00
Fyodor Kupolov
3a22ad0ac4 am 09dbd46a: am 037281d4: am 563f974d: am d7cdbd4d: am e6c64508: Merge "Fixed a typo in convertRestrictionsToBundle JavaDoc" into mnc-dev
* commit '09dbd46af8faa60419a97e926463dc25fbd0513f':
  Fixed a typo in convertRestrictionsToBundle JavaDoc
2015-08-22 01:22:32 +00:00
Fyodor Kupolov
09dbd46af8 am 037281d4: am 563f974d: am d7cdbd4d: am e6c64508: Merge "Fixed a typo in convertRestrictionsToBundle JavaDoc" into mnc-dev
* commit '037281d4a9a22fa55b643e785ff32144cfa61591':
  Fixed a typo in convertRestrictionsToBundle JavaDoc
2015-08-22 00:41:08 +00:00
Fyodor Kupolov
e6c64508ab Merge "Fixed a typo in convertRestrictionsToBundle JavaDoc" into mnc-dev 2015-08-21 23:04:09 +00:00
Fyodor Kupolov
7d35fc3898 Fixed a typo in convertRestrictionsToBundle JavaDoc
Bug: 23408097
Change-Id: Ie06c33aa7b9a953dec645d1763e27dcb506764f0
2015-08-21 11:25:55 -07:00
Filip Gruszczynski
c12e6780e4 Merge "API for specifying size/gravity of launching activity." 2015-08-20 22:43:25 +00:00
Filip Gruszczynski
848fe6bef2 API for specifying size/gravity of launching activity.
Change-Id: I4d75b3fa56ff9c35be9beeba81e3ec9ab28a9996
2015-08-20 15:27:36 -07:00
Fyodor Kupolov
e67177d79a am 9125dbbf: am 1ffb592e: am 78985f3f: am ea57b592: am 1773ded8: Merge "Fixed key comparison in equals method" into mnc-dev
* commit '9125dbbf932efafa7a86ddb3e45598f230a81952':
  Fixed key comparison in equals method
2015-08-20 20:27:35 +00:00
Fyodor Kupolov
9125dbbf93 am 1ffb592e: am 78985f3f: am ea57b592: am 1773ded8: Merge "Fixed key comparison in equals method" into mnc-dev
* commit '1ffb592e0b0bf68e2d1db13712dc1c9810507140':
  Fixed key comparison in equals method
2015-08-20 20:19:36 +00:00
Fyodor Kupolov
1af7a83939 Fixed key comparison in equals method
Bug: 23376695
Change-Id: Ie4bd55a88f5f86fd8de7b087d0a5f1755951e90d
2015-08-20 10:24:14 -07:00
Nicolas Prévot
be8b98b939 Merge "Allow non-owner users to have managed profiles." 2015-08-20 14:48:18 +00:00
Nicolas Prevot
b818681dca Allow non-owner users to have managed profiles.
In the split system user model:
The only users that are not allowed to have managed profiles are:
- purely system user (user 0)
- guest users
- restricted profiles
- managed profiles

In the non-split system user model, the behavior does not change:
only the primary user can have managed profiles.

BUG:22956426
Change-Id: If908c30f110fd3e740770174f050c9b6cf87ce1b
2015-08-20 14:15:19 +01:00
Xiaohui Chen
98404fdc0b Clean up USER_OWNER reference.
Bug: 19913735
Change-Id: I441672b360fa0fff5453f72c88f9577b5cc8eecf
2015-08-19 18:34:46 +00:00
Dianne Hackborn
83eb8493b2 am 0ce3a291: am 914eda00: am 574f9b42: am ac11522e: am 06f552cf: Merge "Add debugging for issue #23190084: [APPComm][Dev Test] {Unable to share photo..." into mnc-dev
* commit '0ce3a291fb4fdbfd041e605c0cb71dff4f681e8a':
  Add debugging for issue #23190084: [APPComm][Dev Test] {Unable to share photo...
2015-08-16 03:02:55 +00:00
Dianne Hackborn
0ce3a291fb am 914eda00: am 574f9b42: am ac11522e: am 06f552cf: Merge "Add debugging for issue #23190084: [APPComm][Dev Test] {Unable to share photo..." into mnc-dev
* commit '914eda0070cde26325db3d2a2e9bbf0a9e612107':
  Add debugging for issue #23190084: [APPComm][Dev Test] {Unable to share photo...
2015-08-16 02:55:05 +00:00
Dianne Hackborn
ae49872100 Add debugging for issue #23190084: [APPComm][Dev Test] {Unable to share photo...
...from Camera360 to Hangouts }

In the short URI toString, include a small summary of the ClipData (instead
of just saying it has a clip data).  This makes it a lot easier to understand
what is happening when you look at the log of activity starts.

Also separate out the activity manager dump of URI permission grants from
its dump of providers, so it is easy to just look at that state.

Change-Id: I68093d9f279944e1aa9a29347075f237f4f55ed3
2015-08-14 14:08:43 -07:00
Chris Tate
848dd4bfc9 am 14e12258: am 13845aea: am b2d4c550: am b47890c4: am 7e7d79ef: Merge "Make "Ask every time" actually work that way" into mnc-dev
* commit '14e122582c45e236bf2e4c59d10438816f2eed09':
  Make "Ask every time" actually work that way
2015-08-14 17:44:39 +00:00
Chris Tate
14e122582c am 13845aea: am b2d4c550: am b47890c4: am 7e7d79ef: Merge "Make "Ask every time" actually work that way" into mnc-dev
* commit '13845aeae3fc3044f3fc279ca421df6d4f78ee35':
  Make "Ask every time" actually work that way
2015-08-14 17:35:28 +00:00
Christopher Tate
56f0ff3c48 Make "Ask every time" actually work that way
..in link-opening behavior.  If a candidate is marked as "ask
every time," then the user is guaranteed to get a disambiguation
prompt including that candidate even when some other candidate
app is in the "always prefer this over a browser" state.

Bug 23147746

Change-Id: I904d8697a992b3f16f32b1c1b49c2bf9424c7137
2015-08-13 18:56:05 -07:00
Alan Viverette
02e8c2d418 Merge "Rebase system theme on configuration change" 2015-08-13 20:06:18 +00:00
Deepanshu Gupta
8d38e7c905 Merge "Add StyleableRes annotation to TypedArray." 2015-08-13 00:25:54 +00:00
Alan Viverette
395cd017e6 Rebase system theme on configuration change
Also makes native theme accesses thread-safe to avoid a race condition
when modifying the theme off the UI thread. Since drawable loading can
occur off the UI thread, we need to ensure Theme access is thread-safe
anyway.

This reverts commit c12ec70def.

Change-Id: If8fecde76d62738a8e55eddf898eafc468afdba2
2015-08-11 17:27:04 -04:00
Filip Gruszczynski
2349332f9f Only relaunch activity on significant size configuration changes.
Currently if the configuration width/height/smallest width changes, we
relaunch the activity or invoke onConfigurationChanged callback. When it
comes to size based configuration changes it might not be necessary: if
the size change doesn't pass one of the threshold defined by the
resources, it means there is no need to relaunch the activity.

In this CL the ActivityManager will receive the thresholds from the
application and use them to decide, whether to relaunch the activity.
The application reads the thresholds from the resources, specifically
from resource qualifiers used by the app.

Change-Id: Ie3cf0a172dc1ba0b865cf30c2962e7cfd9ad8436
2015-08-10 13:47:31 -07:00
Svetoslav Ganov
64b9b9ad9e am 618e065c: am 546a3449: am e12a685c: am 02d6c013: am 90b030ba: Merge "Do not show removed permissions in the UI - framework" into mnc-dev
* commit '618e065cc14b9069954e462fc25cdc934ee3300f':
  Do not show removed permissions in the UI - framework
2015-08-08 07:22:34 +00:00
Svetoslav Ganov
618e065cc1 am 546a3449: am e12a685c: am 02d6c013: am 90b030ba: Merge "Do not show removed permissions in the UI - framework" into mnc-dev
* commit '546a34490fbb31e40199e325473c5a510b61b55b':
  Do not show removed permissions in the UI - framework
2015-08-08 07:15:24 +00:00
Svet Ganov
3e0be7440b Do not show removed permissions in the UI - framework
bug:23043018

Change-Id: Ia5cf49f299eda627d9fde2b34498812afcb3a6d5
2015-08-07 23:06:04 -07:00
Deepanshu Gupta
d7bb3f8029 Add StyleableRes annotation to TypedArray.
Change-Id: Ice79b7791f72485aa3a6c2777334946316e72ff5
2015-08-07 21:59:53 +00:00
Filip Gruszczynski
101d93bfb8 am 42969008: am 94858568: am c3080d78: am 841d7b75: am 52d3312a: Merge "Make ResourceKey always use non-null configuration override." into mnc-dev
* commit '42969008ef898f204fc9f3504f85bb82ffc810c3':
  Make ResourceKey always use non-null configuration override.
2015-08-04 23:47:21 +00:00
Filip Gruszczynski
42969008ef am 94858568: am c3080d78: am 841d7b75: am 52d3312a: Merge "Make ResourceKey always use non-null configuration override." into mnc-dev
* commit '94858568a1ee6af7b40ae0fcc5c4453dffca1cb8':
  Make ResourceKey always use non-null configuration override.
2015-08-04 23:39:08 +00:00
Filip Gruszczynski
52d3312abe Merge "Make ResourceKey always use non-null configuration override." into mnc-dev 2015-08-04 23:02:19 +00:00
Filip Gruszczynski
a01f48681c Make ResourceKey always use non-null configuration override.
We don't differentiate between null conifguration and
Configuration.EMPTY, but if ResourceKey uses both, it will produce
different hashes and won't be equal. This CL makes ResourceKey always
hold a non null reference to the Configuration object.

We started delivering the configuration overrides in
Ib2c7be0b427f5ce05e7a362bcdd496ddbc9164f0, which changed behavior from
using always null, to using both null and Conifguration.EMPTY for empty
confgiuration. Now we will switch to using only one value, which is
Configuration.EMPTY.

Bug: 22620824
Change-Id: I090fd90ac21a6b3ebc7f2974a91dd7c861af10d7
2015-08-04 15:26:14 -07:00
Steve McKay
371d458838 Merge "Populate quick view intent w/ file uris." 2015-08-04 22:07:18 +00:00
Steve McKay
6eaf3863c8 Populate quick view intent w/ file uris.
Change-Id: Ie4f15b11be1939f8b71752505caa9d74ab9f9680
2015-08-04 15:06:40 -07:00
Matthew Williams
da7526b4be am 7667fa48: am 1dee8d41: am c62598bc: am d5fe5a8f: am fad3c663: Merge "Remove spurious syncmanager wake-ups" into mnc-dev
* commit '7667fa48224133adfbd4b1234c592988c0133713':
  Remove spurious syncmanager wake-ups
2015-08-04 18:29:05 +00:00
Matthew Williams
7667fa4822 am 1dee8d41: am c62598bc: am d5fe5a8f: am fad3c663: Merge "Remove spurious syncmanager wake-ups" into mnc-dev
* commit '1dee8d4164553082c392b236d30144b4bad16f22':
  Remove spurious syncmanager wake-ups
2015-08-04 18:18:52 +00:00
Steve McKay
2909598322 Merge "Use an explicit intent for "Quick View"..." 2015-08-04 16:40:37 +00:00
Steve McKay
c78bcb8c7f Use an explicit intent for "Quick View"...
Define Intent.ACTION_QUICK_VIEW.

Change-Id: Iae85a2a6fe35cfd135ff1af6672d37cc6b33dce4
2015-08-04 09:36:29 -07:00
Dianne Hackborn
3fa5609d83 am aa860fd8: am 35c68de9: am 5dd9ef04: am b0bc8368: am 3011f645: Merge "Fix issue #22912704: "android.process.acore has stopped" dialog keeps popping up" into mnc-dev
* commit 'aa860fd83ab3d3096c4bdf86297b7d8f36f5eec8':
  Fix issue #22912704: "android.process.acore has stopped" dialog keeps popping up
2015-08-04 01:40:48 +00:00
Dianne Hackborn
aa860fd83a am 35c68de9: am 5dd9ef04: am b0bc8368: am 3011f645: Merge "Fix issue #22912704: "android.process.acore has stopped" dialog keeps popping up" into mnc-dev
* commit '35c68de93dfec0a237642cca56ade0ba3a6aff92':
  Fix issue #22912704: "android.process.acore has stopped" dialog keeps popping up
2015-08-04 01:30:52 +00:00
Matthew Williams
665d0140ef Remove spurious syncmanager wake-ups
BUG: 22287469
1) Fix SyncManager waking up every 2 hrs if there is nothing
to do.
2) Fix sync wake-up alarm not being properly updated if the new
alarm was in the future.
2a) Due to staus bar sync signal that were removed post-K
one of the wake-ups was for 30s in the future, removed this
@hide intent completely.
3) The SyncManager will still set a timeout alarm for 5mins after
the start of a sync. Leaving this in as to post to a handler is
less expensive but more complex, and the alarm update is
correctly working now.

Change-Id: If51c9dd68391ccaeb480a17eb5a1364c4afe4c2a
2015-08-03 18:15:12 -07:00
Dianne Hackborn
28ec27cbfa Fix issue #22912704: "android.process.acore has stopped" dialog keeps popping up
Slice 'em up!

Change-Id: Ibba3af7ec5b7f92e6d5e55a57aa838a7f7f936e1
2015-08-03 15:28:28 -07:00
Yusuke Sato
22350a8c2c am 82e78074: am b98e2353: am 158560ad: Merge "Distinguish user-requested shutdown from power-related ones"
* commit '82e780743046e620b724c28023b580e0e624bb15':
  Distinguish user-requested shutdown from power-related ones
2015-08-03 18:14:37 +00:00
Yusuke Sato
82e7807430 am b98e2353: am 158560ad: Merge "Distinguish user-requested shutdown from power-related ones"
* commit 'b98e235364c2b221521f622c546733b2862e4677':
  Distinguish user-requested shutdown from power-related ones
2015-08-03 17:56:37 +00:00
Dianne Hackborn
f6f1a7ec99 am 628b4125: am bc2a8843: am b97c5ddd: am 9b36f526: am c1836bb0: Merge "Change MNC codename to just M." into mnc-dev
* commit '628b4125843b93dc7f3ed0c9bbea76ff470d2eed':
  Change MNC codename to just M.
2015-08-01 17:53:09 +00:00
Dianne Hackborn
628b412584 am bc2a8843: am b97c5ddd: am 9b36f526: am c1836bb0: Merge "Change MNC codename to just M." into mnc-dev
* commit 'bc2a88431e3dc51e2245cc28e327f11d0c78bd56':
  Change MNC codename to just M.
2015-08-01 17:04:28 +00:00
Dianne Hackborn
c1836bb0f1 Merge "Change MNC codename to just M." into mnc-dev 2015-07-31 17:11:58 +00:00
Yusuke Sato
705ffd1efe Distinguish user-requested shutdown from power-related ones
With this patch, when the user requested shutdown,
PowerManagerService sets sys.powerctl is set to
"shutdown,userrequested", and init runs fsck on shutdown.

When shutdown is triggered due to a low power state etc.,
the service sets the property to "shutdown,", and init
immediately shuts down the system without running the
command.

This is a follow-up CL for http://r.android.com/158525.

Bug: 21853106
Change-Id: Iae72990130fe9aa479c802f77301438190dbbfb3
2015-07-30 23:47:13 -07:00
Dianne Hackborn
0e3de6caca Change MNC codename to just M.
Change-Id: I4281d200ff6560791c47cf9073ceea1cb509361e
2015-07-29 15:20:21 -07:00
Svetoslav Ganov
fdf59bf82f am c875ad14: am 56de6167: am f6c2d8a9: am 6da43a83: am 9352af2a: Merge "Remove dependencies on the package installer\'s package name" into mnc-dev
* commit 'c875ad14ddc09d0d3a3bde58f71845123110f9f2':
  Remove dependencies on the package installer's package name
2015-07-29 22:03:19 +00:00