Commit Graph

57778 Commits

Author SHA1 Message Date
Todd Kennedy
f36f4f5845 Merge "resolved conflicts for 389bb7f5 to master" 2015-09-25 22:58:27 +00:00
Todd Kennedy
56ebb25708 resolved conflicts for 389bb7f5 to master
Change-Id: I9c3474577166cc91c50d32d225957fbd13c205bf
2015-09-25 15:57:11 -07:00
Fyodor Kupolov
9265189f77 Merge "Added --restricted option for create-user command" 2015-09-25 22:48:05 +00:00
Todd Kennedy
389bb7f509 am 9f860264: resolved conflicts for 7de7e0b0 to stage-aosp-master
* commit '9f8602644418ecfb1a5c9555792ceed285fa72bd':
  Pass dexopt flags as integer
2015-09-25 22:17:06 +00:00
Todd Kennedy
9f86026444 resolved conflicts for 7de7e0b0 to stage-aosp-master
Change-Id: I4e45e5bbaebb98b0e740167eaf7517f99d917f30
2015-09-25 15:06:49 -07:00
Oren Blasberg
b8c7ef5eaf Merge "Make context menus show as popup menus." 2015-09-25 21:09:18 +00:00
Todd Kennedy
fa54ab7950 Pass dexopt flags as integer
Instead of using a series of booleans, create a single flags integer
that contains all of the dexopt options.

Change-Id: Ia8fa968f64b164267f43dd29cea9dc0413058125
2015-09-25 13:52:33 -07:00
Oren Blasberg
ed3912692f Make context menus show as popup menus.
This means that right-clicking/long pressing on a view that is registered for
context menu will show the context menu as a popup menu instead.

Bug: 20016398
Change-Id: I96fea60435fff2f981d288521f490f8ff24ada15
2015-09-25 12:01:01 -07:00
Gus Prevas
efca0aa919 am 3197cd36: am 41110261: am b17d1e5e: Merge "Adds an option to override RemoteViews transition." into cw-e-dev
* commit '3197cd36fef11b1fdd59bdd341f65f9f2364ed2a':
  Adds an option to override RemoteViews transition.
2015-09-25 18:59:45 +00:00
Jorim Jaggi
fc832e3ef2 resolved conflicts for c594e935 to master
Change-Id: Ifaf8c6c2b80e5284e027278f5ff0437202439cf0
2015-09-25 11:54:05 -07:00
Fyodor Kupolov
737b216b5c Added --restricted option for create-user command
Also moved restricted profile create/setup logic from Settings to
UMS.createRestrictedProfile.

Bug: 24212155
Bug: 24303609
Change-Id: I5f0d48bcbd3c0b51927926b874fd057c15ac5219
2015-09-25 11:22:13 -07:00
Gus Prevas
3197cd36fe am 41110261: am b17d1e5e: Merge "Adds an option to override RemoteViews transition." into cw-e-dev
* commit '41110261bb4f9f733b579b3dc26d3d6de5642ef5':
  Adds an option to override RemoteViews transition.
2015-09-25 18:09:41 +00:00
Jorim Jaggi
c594e9354a am f9f9999d: am b7b9b31f: am ad26dc5f: Merge "Deliver camera launch source for analytics" into mnc-dr-dev
* commit 'f9f9999d3245dffc8463a1f3f5f74dc900aa0196':
  Deliver camera launch source for analytics
2015-09-25 18:07:52 +00:00
Gus Prevas
b17d1e5e6a Merge "Adds an option to override RemoteViews transition." into cw-e-dev 2015-09-25 17:17:44 +00:00
Gus Prevas
1ed322b123 Adds an option to override RemoteViews transition.
This change adds a configuration option,
"config_overrideRemoteViewsActivityTransition", which is false by
default and true on watches.  If it's true, when a RemoteViews
is clicked, it will use a new attribute on the active window animation
style, "activityOpenRemoteViewsEnterAnimation", to determine
the entry transition to use, instead of the current hard-coded
default.

Bug: 23534750
Change-Id: I91e92804a663ab71a3e46c3430fa579b87cc7931
2015-09-25 13:10:52 -04:00
Wale Ogunwale
a5ffea3b7d Revert "Fix leaking the first activity while preserving windows."
This reverts commit 640a3909a3.

Bug: 24293179
Change-Id: I9819f85d96bee240544beee9583b070c751cb9fc
2015-09-25 09:01:22 -07:00
Wale Ogunwale
49966d67a8 Merge "Batch ACTION_MOVE events to vsync boundries when resizing task" 2015-09-25 14:39:42 +00:00
Jorim Jaggi
b7b9b31f69 am ad26dc5f: Merge "Deliver camera launch source for analytics" into mnc-dr-dev
* commit 'ad26dc5f15d6ac13741ad8724c25ef8c58e73e81':
  Deliver camera launch source for analytics
2015-09-25 01:30:43 +00:00
Jorim Jaggi
40aa8811bc Deliver camera launch source for analytics
Bug: 24304031
Change-Id: I606bccf4b62b651e17c6e6d9472648deeab703da
2015-09-24 16:32:09 -07:00
Wale Ogunwale
e25a8292f8 Merge "Added am command to suppress config. changes during task resize." 2015-09-24 23:08:02 +00:00
Wale Ogunwale
83301a933f Added am command to suppress config. changes during task resize.
This command is useful for testing during development, but at some
point we will decide if allowing configuration changes during resizing
is okay or merge in http://ag/759766 to suppress configuration changes
during resizing and deliver the new config. to the app.

This functionality will be reverted once we decide.

Bug: 24380097
Change-Id: I223c08bc939e564a78e70994b599770be9d4730d
2015-09-24 15:54:08 -07:00
Todd Kennedy
4e32174517 resolved conflicts for cafacef6 to stage-aosp-master
Change-Id: Id02e098a02aede327c5bc1a98aa177d8bf9ec5a9
2015-09-24 14:34:06 -07:00
Wale Ogunwale
4f52bc6f78 Batch ACTION_MOVE events to vsync boundries when resizing task
- Created helper class BatchedInputEventReceiver for batching
ACTION_MOVE events to vsync boundries.
- Switched TaskPositioner to use new helper class for input events
so we reduce the number of input events we process per vsync.

Bug: 24375616
Change-Id: I4ee27949b956784fb89d8f190497e4765522c9d3
2015-09-24 14:31:11 -07:00
Oren Blasberg
8f3976c875 Merge "Cascading submenus: Fix a few small issues." 2015-09-24 20:59:44 +00:00
Oren Blasberg
734320d06b Cascading submenus: Fix a few small issues.
1. Open submenus now disappear instantly rather than fading out when
mouse hovers over a non-submenu item.

2. When a submenu is opened on hover, the item that was hovered now
will remain selected instead of being deselected.

3. Fix an issue where if the same chain of submenus was opened more
than once, the submenus could open in a different direction each
time. To fix, we keep track of the direction of opening along the way
and make sure to reset the preferred direction when a submenu is
closed.

Bug: 20127825
Change-Id: I99972cce4ddabe316c5148f1dd79a5d7b3e64b87
2015-09-24 13:36:15 -07:00
Andreas Gampe
55fe944f98 Frameworks/base: Propagate boot status to installd
Propagate the boot status explicitly to installd so that we do not
have to rely on dev.bootcomplete, which isn't meaningfully set
when the device needs the decryption screen on boot.

Bug: 23898216
(cherry picked from commit 06bb908b78)
Change-Id: I9b34298caf70b1e5d40970cc0d04c469016a80a7
2015-09-24 12:27:25 -07:00
Abodunrinwa Toki
b9acbe40d2 Reduce delay of floating toolbar appearance.
Bug: 21956394
Change-Id: Ide7ee2daffbf618b0a483c377032bf25b20d5b8e
2015-09-24 16:58:08 +00:00
Ryo Hashimoto
a316536528 Merge "Use the proper variant of String#substring to report broken strict mode stacks" 2015-09-24 06:22:00 +00:00
Erik Kline
02cc5a030a Refactor netlink and IpReachabilityMonitor into services/net
- netlink from core to services/net/netlink
    - IpReachabilityMonitor from core to services/net/ip

Change-Id: I45ac3f591bade45dd5ec441111b02b621234c0e4
2015-09-24 12:50:36 +09:00
Steve McKay
b0a3cc16f8 Merge "Merge BROWSE and BROWSE_ALL actions." 2015-09-23 22:41:49 +00:00
Filip Gruszczynski
ab6fc9ebe3 Merge "Showing docked stack divider window." 2015-09-23 21:59:15 +00:00
Filip Gruszczynski
466f321650 Showing docked stack divider window.
When there is docked stack, we want to show a "handle" through which the
user will resize the docked stack. We add it from the system process,
because we want to avoid IPC calls.

Change-Id: If15fd2a0fcb7077446d1ba6c533acb3028a42039
2015-09-23 14:58:43 -07:00
Alan Viverette
ed49b02abc Merge "End switch thumb animator if it's been started" 2015-09-23 20:05:35 +00:00
Steve McKay
83df8c072d Merge BROWSE and BROWSE_ALL actions.
Open Files app when exploring from settings.
Force visibility of file size in this mode.
Don't hide empty media providers.

Bug: 24136618, 24140864
Change-Id: I6f238586725f9b6255812e3082bb8d8655219a7d
2015-09-23 12:25:13 -07:00
Jan Nordqvist
ca30939346 Merge "Hotspot 2.0 relase 2 first cut." 2015-09-23 19:05:53 +00:00
Xiaohui Chen
a449062220 Cleanup USER_OWNER in activity and location services
Bug: 19913735
Change-Id: Ie2b7acb3fa53b1dcf7319de1eb5bdec585dbf78c
2015-09-23 18:51:18 +00:00
Xiaohui Chen
e4de5a0d3b Cleanup OWNER references.
Bug: 19913735
Change-Id: I2150c6baaab80fe11312e4401394a2a8da52e595
2015-09-23 18:50:11 +00:00
Xiaohui Chen
f85c977414 Cleanup USER_OWNER in DPMS
This cl assumes device owner will continue running under user 0.

Bug: 19913735
Change-Id: I65c97f6f14fb362acbdcb6588b73787291100698
2015-09-23 18:49:00 +00:00
Alan Viverette
ee20d7799f End switch thumb animator if it's been started
Running implies that it's been started and the animation has actually
begun, which is not true if we call start() and then immediately try
to jump state.

Bug: 24273164
Change-Id: I7f8d856dbe925679dad082f1e28d8936ac2b04db
2015-09-23 14:23:21 -04:00
Todd Kennedy
898e6973ca am 739bb7c6: Merge "save "retain loader" state" into mnc-dr-dev
* commit '739bb7c694aee521995100c456cf1c8341820bec':
  save "retain loader" state
2015-09-23 18:05:58 +00:00
Todd Kennedy
739bb7c694 Merge "save "retain loader" state" into mnc-dr-dev 2015-09-23 17:56:52 +00:00
Filip Gruszczynski
f387b28399 Merge "Preserve windows during stack resize." 2015-09-23 15:32:29 +00:00
Alan Viverette
9477229fe8 Merge "Smooth progress bar animations" 2015-09-23 14:07:11 +00:00
Alan Viverette
a64ed3bf8c Smooth progress bar animations
Removes smooth progress bar hack from volume dialog.

Bug: 23566299
Change-Id: Iafa32538b4f92705c4c1ca2a02145c078add2532
2015-09-23 10:01:45 -04:00
Nicolas Prévot
7d92c47498 Merge "Revert "Add more methods that take a userId to PackageManager."" 2015-09-23 11:35:50 +00:00
Nicolas Prévot
3355eca23e Revert "Add more methods that take a userId to PackageManager."
This reverts commit 3b0fc3cf24.

It breaks the build. I had missed other places that extend PackageManager.

Change-Id: Iff012ed4ec8d2d32821586eca85fce55ae67f5b5
2015-09-23 11:34:38 +00:00
Nicolas Prévot
daa838390c Merge "Add more methods that take a userId to PackageManager." 2015-09-23 09:49:29 +00:00
Jan Nordqvist
52eb29f082 Hotspot 2.0 relase 2 first cut.
CP mods to take a URL as a parameter, and new ScanInfo object.

Change-Id: Idbb2d4751c575ba07a56942771e2b2955b624635
2015-09-22 17:24:22 -07:00
Filip Gruszczynski
bc5a6c5f0c Preserve windows during stack resize.
It also adds debugging information for configuration changes, so it's
easier to observe what exactly changes.

Change-Id: Ia2cd4df9a868a8cea216ce137d67a1bb8ed2e6c7
2015-09-22 15:23:34 -07:00
Makoto Onuki
7c7ad1a204 Merge "Make DPM/DPMS unit-testable" 2015-09-22 21:17:23 +00:00