231516 Commits

Author SHA1 Message Date
Makoto Onuki
d38308e4d0 Merge "Fix DPM unit tests" 2016-02-01 23:24:20 +00:00
Makoto Onuki
3f3657a61b Fix DPM unit tests
Bug 26911599

Change-Id: I874c9cd4f63c79bc984777ef3b1b654a414c4911
2016-02-01 15:21:49 -08:00
Arunesh Mishra
e909d94e03 Merge "Fix moduleProperties in SoundTriggerInternal." 2016-02-01 23:15:25 +00:00
Rob Carr
d7e4acba06 Merge "Ensure Surface matrix set even when size unchanged." 2016-02-01 23:12:14 +00:00
Rob Carr
d1a668fd9a Merge "Allow saving child surfaces." 2016-02-01 23:11:51 +00:00
Robert Carr
7098dbd4d6 Allow saving child surfaces.
We can and should save child surfaces as the client side window
state hasn't been torn down in the case where we would otherwise save.
So, if we destroy the Surface, the client will continue to render
and crash.

Bug: 26793431
Bug: 25780116
Bug: 26777815
Change-Id: Ia043b7af24b9370fc17a5b57226566f94c08ba4e
2016-02-01 23:09:16 +00:00
Steve McKay
a7dbccff77 Merge "Create "Home" dir instead of "home" to match other default dirs." 2016-02-01 23:00:59 +00:00
Roozbeh Pournader
ed553f6b0d Merge "Make default resources a better match for en-US requests" 2016-02-01 22:57:58 +00:00
Deepanshu Gupta
14889dd6cd Merge branch 'master' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/frameworks/base 2016-02-01 22:57:10 +00:00
Roozbeh Pournader
27953c349f Make default resources a better match for en-US requests
When locale fallback landed, resources which specified an 'English'
locale started to be considered a better match for en-US, even though
traditionally, apps tend to ship US English resources under their
default locale.

This fixes that, and makes en-US requests match default locales.

Bug: 26756573
Bug: 26789680
Bug: 26803868
Change-Id: I460c276bfc6ddba0439dcdf87497a0aece0fa05d
2016-02-01 14:56:52 -08:00
Deepanshu Gupta
08df538482 Remove obsolete try catch am: ebdcc80ac2
am: 29e8071d2e

* commit '29e8071d2e9f3a8171624fd63b849f5c14360b21':
  Remove obsolete try catch
2016-02-01 22:56:43 +00:00
Xiaohui Chen
f43491f8f2 sysui: small refactor
Bug: 26161831
Change-Id: I020176d49cb12c7f7b56ad6eb1221e678312f798
2016-02-01 22:53:33 +00:00
Deepanshu Gupta
29e8071d2e Remove obsolete try catch
am: ebdcc80ac2

* commit 'ebdcc80ac26ae51ba27d9469a501a6242256aa50':
  Remove obsolete try catch
2016-02-01 22:52:50 +00:00
Philip P. Moltmann
76855d322b Merge "Init and clean up printer registry independat of state." 2016-02-01 22:49:51 +00:00
Steve McKay
5c462a0e31 Create "Home" dir instead of "home" to match other default dirs.
Add DIRECTORY_HOME to android.os.Environment...use that for dir name,
    so we don't use a localized name when creating directory.
Mark all of the DIRECTORY_* fields final.

Bug: 26814341
Change-Id: I5a11bcb180674c619de2f5ce9ed598521e60cc25
2016-02-01 14:46:34 -08:00
Rubin Xu
7e444c0059 Merge "Mask widgets for suspended packages." 2016-02-01 22:46:02 +00:00
Bart Sears
e3d9ae1769 Merge "Hack to get devices booting again." into mnc-dr1.5-dev am: 29700949ad am: 795e53a36b
am: 6d9b0fb923

* commit '6d9b0fb923bc6d77b23ac40841625d61eb003e0f':
  Hack to get devices booting again.
2016-02-01 22:30:21 +00:00
Bart Sears
6d9b0fb923 Merge "Hack to get devices booting again." into mnc-dr1.5-dev am: 29700949ad
am: 795e53a36b

* commit '795e53a36b0bda3555e23ea8b54cf97361014a24':
  Hack to get devices booting again.
2016-02-01 22:27:37 +00:00
Jorim Jaggi
1444cfd50e Fix build
Change-Id: Ifed64dc2a4db9a58c3588ea0ca899f628efe685a
2016-02-01 22:24:46 +00:00
Bart Sears
795e53a36b Merge "Hack to get devices booting again." into mnc-dr1.5-dev
am: 29700949ad

* commit '29700949ad981bde8d35219914161f6424e7757b':
  Hack to get devices booting again.
2016-02-01 22:23:34 +00:00
Jorim Jaggi
ccdab44d25 Merge changes Ie6c1ea33,Id1af37e6,I9c474f7a,I439c9b66
* changes:
  Reset create state in moveTaskToStack
  Divider tuning
  Fix transition to recents in docked mode
  Fix flicker and other weirdness
2016-02-01 22:18:21 +00:00
Bart Sears
29700949ad Merge "Hack to get devices booting again." into mnc-dr1.5-dev 2016-02-01 22:17:49 +00:00
Antonio Cansado
89270a445a Merge "Retuning tag information through NetworkStatsManager." 2016-02-01 22:16:44 +00:00
Arunesh Mishra
55a9b0089c Fix moduleProperties in SoundTriggerInternal.
Change-Id: Ie7ea74ca39894f78875768dbc3e504b32f262fe6
2016-02-01 14:14:06 -08:00
Antonio Cansado
46c75367fa Retuning tag information through NetworkStatsManager.
Network tags could be set since ICS but was not exposed
through the SDK. This CL extends existing functionality
of NetworkStatsManager to return network tags.

Bug: 25813338
Change-Id: I414b98193249ba88a3f2d64cb2e0d2633f64fa3f
2016-02-01 14:13:20 -08:00
Steven Dao
58869d2c9f Merge "Fix CollectionItemInfo.isHeading for ListView" 2016-02-01 22:10:52 +00:00
Rubin Xu
d09020576f Mask widgets for suspended packages.
Bug: 22776761
Change-Id: I271257e765a2297c780ac2bd37426d8fb451e5d9
2016-02-01 22:06:06 +00:00
Philip P. Moltmann
7874bdcd54 Merge "Only update UI when bound" 2016-02-01 22:03:36 +00:00
Deepanshu Gupta
ebdcc80ac2 Remove obsolete try catch
The try catch was to prevent crashing on preview releases of Android
Studio. We don't support them anymore.

Change-Id: I8e33cae98117c0034aea1b56903b623fcb64435e
2016-02-01 14:03:30 -08:00
Xiaohui Chen
a747ab8c0b Merge "Make user deletion dialog reusable." 2016-02-01 22:03:27 +00:00
Philip P. Moltmann
51dbc8ec6a Init and clean up printer registry independat of state.
The printer registry is created not in sync with the states or the
activity life-cycle. It might not be initialized when stop is called as
we might have a very quick

create -> start -> stop -> finish

without time for the print subsystem to initialize.

Bug: 21749058
Change-Id: I991029a7fd0ad162c1144ff03438707f16bf0b02
2016-02-01 13:56:45 -08:00
Hyunyoung Song
2678d30e7b Merge "Runtime exception on AppWidgetHostView should not cause crash to the hosting process." 2016-02-01 21:52:42 +00:00
Hyunyoung Song
4d1bf09339 Runtime exception on AppWidgetHostView should not cause crash to the hosting process.
b/26797293

Change-Id: I7e1efad7d5314141d21440bf8915c101e35c2adf
2016-02-01 13:51:39 -08:00
Jorim Jaggi
9349e65a2d Reset create state in moveTaskToStack
One could call moveTaskToStack with DOCKED_STACK as argument. In that
case, we also need to set the create state so it resets it to
something sane.

Change-Id: Ie6c1ea33e4ec3c4cd2a935dc186d2b496289946f
2016-02-01 13:46:30 -08:00
Jorim Jaggi
1b12ef55b7 Divider tuning
- Take insets into account for calculating dismissing fraction,
but don't dim into 100% when the device has insets at that
side.
- When applying parallax to the top side, apply less.

Change-Id: Id1af37e6f7af43ec3682dad4ad1ce68034301b4d
2016-02-01 13:43:36 -08:00
Oleksandr Peletskyi
8e9316cdde Merge "Added restriction that disallows ability to set wallpaper. BUG: 24890474" 2016-02-01 21:30:43 +00:00
Michael Lentine
8f2cd95930 Merge "Adding plumbing for passing the lib directory." 2016-02-01 21:28:25 +00:00
Fyodor Kupolov
c34c37f74f Merge "Synchronously finish boot when user starts in background" 2016-02-01 21:21:46 +00:00
Geoff Mendal
6ee840509a Merge "Import translations. DO NOT MERGE" into mnc-dr2-dev am: 60e392e021 -s ours
am: 8cc5899aef  -s ours

* commit '8cc5899aef3ab8e1ad35d6882a082416aea734ed':
  Import translations. DO NOT MERGE
2016-02-01 21:20:11 +00:00
Geoff Mendal
8cc5899aef Merge "Import translations. DO NOT MERGE" into mnc-dr2-dev
am: 60e392e021  -s ours

* commit '60e392e021da2fe8b05986c545b324a4e70f396e':
  Import translations. DO NOT MERGE
2016-02-01 21:14:42 +00:00
Sanket Agarwal
f8a1c9121d Add Headset HF role to the settings menu
- Makes the HF client a configurable item in Settings. You can
  enable/disable HF per item.
- Disconnect works cleanly since Settings now disconnects HF and hence
  tear down the ACL.

Bug: b/26808830

Change-Id: I062b64beac4c009a6075756b7f163c6455d77af2
2016-02-01 21:13:37 +00:00
Geoff Mendal
60e392e021 Merge "Import translations. DO NOT MERGE" into mnc-dr2-dev 2016-02-01 21:10:47 +00:00
Robert Carr
e1034cc39a Ensure Surface matrix set even when size unchanged.
Simple error preventing transform matrices from being
updated when the size isn't changed.

Bug: 26454664
Bug: 25287371
Change-Id: I0e1a71ceda725e26d49786593665cf0865213c91
2016-02-01 13:08:15 -08:00
Geoff Mendal
203eec6b37 Import translations. DO NOT MERGE
Change-Id: I22adb9c9dea51a632471abe8623deea91ba90b25
Auto-generated-cl: translation import
2016-02-01 13:08:15 -08:00
Philip P. Moltmann
c2f913d09b Only update UI when bound
If the PrintActivity gets destroyed (e.g. due to low memory) it gets
re-created when the PrintToPDF activity returns in onActivityResult. In
this case onActivityResult is called right after onCreate and before the
UI is bound. This resulted in a NullPointerException when accessing the
unbound UI elements.

Bug: 21749058
Change-Id: I44e625e8c4f10432591d0afcf7825d7e0dbee6f5
2016-02-01 13:03:44 -08:00
Geoff Mendal
a5da90c6f4 Merge "Import translations. DO NOT MERGE" 2016-02-01 21:02:43 +00:00
Geoff Mendal
4b88cf0dd8 Import translations. DO NOT MERGE
Change-Id: I33ec1d301ea490620093cf078e4bf3e9d8f81d7e
Auto-generated-cl: translation import
2016-02-01 13:00:10 -08:00
Julia Reynolds
f1c00cf3d1 Merge "Send ranking update on importance change." 2016-02-01 20:59:06 +00:00
Geoff Mendal
4e379c14dc Import translations. DO NOT MERGE am: f544fc21d0 -s ours am: b2628caab6 -s ours am: 21a6f2050a -s ours
am: 80a4c66e61  -s ours

* commit '80a4c66e61348bc22d6c0eef467ead55fc95c6c3':
  Import translations. DO NOT MERGE
2016-02-01 20:52:55 +00:00
Geoff Mendal
80a4c66e61 Import translations. DO NOT MERGE am: f544fc21d0 -s ours am: b2628caab6 -s ours
am: 21a6f2050a  -s ours

* commit '21a6f2050adcbbd8f121abbb3c3ef3f0b57391c7':
  Import translations. DO NOT MERGE
2016-02-01 20:48:37 +00:00