OSDN Git Service

android-x86/frameworks-base.git
8 years agoAllow system home app to show when filtering app list.
Fan Zhang [Tue, 26 Jul 2016 20:59:03 +0000 (13:59 -0700)]
Allow system home app to show when filtering app list.

Bug: 28796031

Sometimes system app can handle CATEGORY_HOME but it doesn't have a
launcher icon in launcher itself. We should allow it to show in default
app list so user can take action on such app.

Change-Id: Ie85b8f2519be4ccb41b1bb831f4d7cf2531e466f

8 years agoMerge "Add Settings#ACTION_NIGHT_DISPLAY_SETTINGS" into nyc-mr1-dev
Justin Klaassen [Fri, 22 Jul 2016 21:55:58 +0000 (21:55 +0000)]
Merge "Add Settings#ACTION_NIGHT_DISPLAY_SETTINGS" into nyc-mr1-dev

8 years agoMerge "ImageReader: Add discardFreeBuffers method" into nyc-mr1-dev
Eino-Ville Talvala [Fri, 22 Jul 2016 21:42:36 +0000 (21:42 +0000)]
Merge "ImageReader: Add discardFreeBuffers method" into nyc-mr1-dev

8 years agoMerge "Ensure forwarding listener target is long-clickable" into nyc-mr1-dev
Alan Viverette [Fri, 22 Jul 2016 21:09:35 +0000 (21:09 +0000)]
Merge "Ensure forwarding listener target is long-clickable" into nyc-mr1-dev

8 years agoMerge "Fix NPE in JobPackageTracker" into nyc-mr1-dev
Chet Haase [Fri, 22 Jul 2016 20:45:49 +0000 (20:45 +0000)]
Merge "Fix NPE in JobPackageTracker" into nyc-mr1-dev

8 years agoMerge "Fix intent flags" into nyc-mr1-dev
TreeHugger Robot [Fri, 22 Jul 2016 20:34:43 +0000 (20:34 +0000)]
Merge "Fix intent flags" into nyc-mr1-dev

8 years agodocs: Updated support library revision history for 24.1.1 am: 0b80531b5b
Andrew Solovay [Fri, 22 Jul 2016 20:30:08 +0000 (20:30 +0000)]
docs: Updated support library revision history for 24.1.1 am: 0b80531b5b
am: 6a2782548d

Change-Id: I14ce3e45b87eef0401d4429e26f7b2a7af96343f

8 years agoMerge "bootanimation: fix glitchy playback" into nyc-mr1-dev
Eric Laurent [Fri, 22 Jul 2016 20:23:56 +0000 (20:23 +0000)]
Merge "bootanimation: fix glitchy playback" into nyc-mr1-dev

8 years agodocs: Updated support library revision history for 24.1.1
Andrew Solovay [Fri, 22 Jul 2016 20:14:57 +0000 (20:14 +0000)]
docs: Updated support library revision history for 24.1.1
am: 0b80531b5b

Change-Id: I26c19728affe538d49282d9966fa5d87e55ba076

8 years agoMerge "Notification icons: Correctly apply color filter for DrawableContainers" into...
Adrian Roos [Fri, 22 Jul 2016 20:12:19 +0000 (20:12 +0000)]
Merge "Notification icons: Correctly apply color filter for DrawableContainers" into nyc-mr1-dev

8 years agoMerge changes Idd0b38b4,I511356a8 into nyc-mr1-dev
TreeHugger Robot [Fri, 22 Jul 2016 19:20:48 +0000 (19:20 +0000)]
Merge changes Idd0b38b4,I511356a8 into nyc-mr1-dev

* changes:
  Fixed a bug where the fade in from dark would not work properly
  Changed the appearance of fullscreen intent notifications again

8 years agoFixed a bug where the fade in from dark would not work properly
Selim Cinek [Fri, 22 Jul 2016 00:21:09 +0000 (17:21 -0700)]
Fixed a bug where the fade in from dark would not work properly

Change-Id: Idd0b38b40b06806c727d8e033847a0da0b51f55e
Fixes: 30224123

8 years agoChanged the appearance of fullscreen intent notifications again
Selim Cinek [Thu, 21 Jul 2016 03:41:58 +0000 (20:41 -0700)]
Changed the appearance of fullscreen intent notifications again

Change-Id: I511356a8dc0fe253541c625fb7b43ed0c7bafaca
Fixes: 28269355

8 years agoFix intent flags
Makoto Onuki [Fri, 22 Jul 2016 18:57:05 +0000 (11:57 -0700)]
Fix intent flags

Bug 30307198

Change-Id: If127001320dcabdc53ee73860dbb9983cb25b611

8 years agodocs: Updated support library revision history for 24.1.1
Andrew Solovay [Fri, 22 Jul 2016 18:35:04 +0000 (11:35 -0700)]
docs: Updated support library revision history for 24.1.1

See first comment for doc stage location.

bug: 30302654
Change-Id: Icb9a171963b6bf7feec69b6dd36aa6513055bb05

8 years agobootanimation: fix glitchy playback
Eric Laurent [Fri, 22 Jul 2016 01:17:15 +0000 (18:17 -0700)]
bootanimation: fix glitchy playback

Do not use low latency playback mode to be more
robust against scheduling problems during boot phase.

Also:
- remove unused reverb on output mix
- fix WAV file parser.

Bug: 30277818
Change-Id: I1e15d3003a25c93d4995006885b32a754d17343f

8 years agoMerge "Make sure to apply latest configuration to resources" into nyc-mr1-dev
Andrii Kulian [Fri, 22 Jul 2016 18:16:34 +0000 (18:16 +0000)]
Merge "Make sure to apply latest configuration to resources" into nyc-mr1-dev

8 years agoMerge "Clean up surfaces when app is resumed without being stopped." into nyc-mr1-dev
Chong Zhang [Fri, 22 Jul 2016 17:07:44 +0000 (17:07 +0000)]
Merge "Clean up surfaces when app is resumed without being stopped." into nyc-mr1-dev

8 years agoMerge "ServiceConnection: Properly serialize events" into nyc-mr1-dev
Adrian Roos [Fri, 22 Jul 2016 17:03:42 +0000 (17:03 +0000)]
Merge "ServiceConnection: Properly serialize events" into nyc-mr1-dev

8 years agoMerge \"Block user from setting safe boot setting via adb\" into nyc-dev
Benjamin Franz [Fri, 22 Jul 2016 08:47:37 +0000 (08:47 +0000)]
Merge \"Block user from setting safe boot setting via adb\" into nyc-dev
am: f97faada5d

Change-Id: I8f2fad8933d62c0424632c7fcd5e158aa1b0d4bf

8 years agoBlock user from setting safe boot setting via adb
Benjamin Franz [Fri, 22 Jul 2016 08:47:32 +0000 (08:47 +0000)]
Block user from setting safe boot setting via adb
am: 0ff13fce6f

Change-Id: I50db586478eb52d0a2f43e9150cc663c96e5779b

8 years agoMerge "Block user from setting safe boot setting via adb" into nyc-dev
Benjamin Franz [Fri, 22 Jul 2016 08:37:30 +0000 (08:37 +0000)]
Merge "Block user from setting safe boot setting via adb" into nyc-dev

8 years agoMerge "Decrease default longpress timeout to 400ms." into nyc-mr1-dev
Daniel Sandler [Fri, 22 Jul 2016 04:41:28 +0000 (04:41 +0000)]
Merge "Decrease default longpress timeout to 400ms." into nyc-mr1-dev

8 years agoMerge "Better docs for ImageView legacy tint" into nyc-mr1-dev
Alan Viverette [Fri, 22 Jul 2016 02:50:38 +0000 (02:50 +0000)]
Merge "Better docs for ImageView legacy tint" into nyc-mr1-dev

8 years agoMerge "Fix realCallingUid/Pid for startActivities()" into nyc-mr1-dev
Makoto Onuki [Fri, 22 Jul 2016 02:49:11 +0000 (02:49 +0000)]
Merge "Fix realCallingUid/Pid for startActivities()" into nyc-mr1-dev

8 years agoAdd Settings#ACTION_NIGHT_DISPLAY_SETTINGS
Justin Klaassen [Fri, 22 Jul 2016 02:22:09 +0000 (19:22 -0700)]
Add Settings#ACTION_NIGHT_DISPLAY_SETTINGS

- The ACTION_NIGHT_DISPLAY_SETTINGS action can be used to launch
  Night display settings directly.
- Updated NightDisplayTile to use ACTION_NIGHT_DISPLAY_SETTINGS.

Bug: 30291948
Change-Id: I6d912cf481f72ef5b52f53fa23942071fc795452

8 years agoFix NPE in JobPackageTracker
Chet Haase [Thu, 21 Jul 2016 23:23:27 +0000 (16:23 -0700)]
Fix NPE in JobPackageTracker

Issue #30229662  UI server crash

Change-Id: I1487824c8c8aee857446f9607906081e7541eaf6

8 years agoImageReader: Add discardFreeBuffers method
Eino-Ville Talvala [Fri, 22 Jul 2016 00:04:19 +0000 (17:04 -0700)]
ImageReader: Add discardFreeBuffers method

This method (currently @hide) discards all cached buffers for
the ImageReader, which can be useful to free up memory at the
cost of reallocationt time if more buffers are needed later.

It has no effect on acquired Images, filled Images waiting to be
acquired, or buffers being actively used by the source rendering to the
Surface.

Bug: 28695173
Change-Id: I427a8ba4ad73a267083f843dbf228bfc53a730d9

8 years agoMerge \\"docs: Replacing curly apostrophes with straight ones\\" into nyc-docs am...
Andrew Solovay [Thu, 21 Jul 2016 23:58:55 +0000 (23:58 +0000)]
Merge \\"docs: Replacing curly apostrophes with straight ones\\" into nyc-docs am: 1d545c4f83
am: adfb20c2f0

Change-Id: I1031fb300f16e0a80a4c0ca81b0eabfd4482eaa0

8 years agodocs: Replacing curly apostrophes with straight ones am: abea4b1dcd
Andrew Solovay [Thu, 21 Jul 2016 23:58:53 +0000 (23:58 +0000)]
docs: Replacing curly apostrophes with straight ones am: abea4b1dcd
am: 85d40b4feb

Change-Id: Iac36fce8060cb0f8b8580b1c0a4872547dfaefd8

8 years agoMerge \"docs: Replacing curly apostrophes with straight ones\" into nyc-docs
Andrew Solovay [Thu, 21 Jul 2016 23:48:00 +0000 (23:48 +0000)]
Merge \"docs: Replacing curly apostrophes with straight ones\" into nyc-docs
am: 1d545c4f83

Change-Id: Ia21fd5e04dc0565feea5207951372e6ceaf60e38

8 years agodocs: Replacing curly apostrophes with straight ones
Andrew Solovay [Thu, 21 Jul 2016 23:47:58 +0000 (23:47 +0000)]
docs: Replacing curly apostrophes with straight ones
am: abea4b1dcd

Change-Id: I1fd344ed7087b962a66d577b1c3cb5fa0e81fbaa

8 years agoFix realCallingUid/Pid for startActivities()
Makoto Onuki [Thu, 21 Jul 2016 23:26:36 +0000 (16:26 -0700)]
Fix realCallingUid/Pid for startActivities()

They now match startActivityMayWait().

Bug 30277795

Change-Id: I883d74bf02cb79a19e2139134aa9be0296787fed

8 years agoDecrease default longpress timeout to 400ms.
Dan Sandler [Wed, 20 Jul 2016 17:46:05 +0000 (13:46 -0400)]
Decrease default longpress timeout to 400ms.

If the device being upgraded happens to have a timeout of
500ms it will be reset to 400. If the value is something
else it will be left alone upon upgrade.

Bug: 30159825
Change-Id: Ifec70e458ce0199b61d36f7504aea02b4a974990

8 years agoMerge "docs: Replacing curly apostrophes with straight ones" into nyc-docs
TreeHugger Robot [Thu, 21 Jul 2016 23:07:15 +0000 (23:07 +0000)]
Merge "docs: Replacing curly apostrophes with straight ones" into nyc-docs

8 years agoMerge "use printwriter instead of stdout" into nyc-mr1-dev
TreeHugger Robot [Thu, 21 Jul 2016 22:55:25 +0000 (22:55 +0000)]
Merge "use printwriter instead of stdout" into nyc-mr1-dev

8 years agoServiceConnection: Properly serialize events
Adrian Roos [Thu, 21 Jul 2016 20:20:38 +0000 (13:20 -0700)]
ServiceConnection: Properly serialize events

Fixes a bug where onServiceDisconnected could be delayed
such that it would be dispatched after the connection has
already reconnected.

Bug: 30182617
Change-Id: I6e3fc2f125a477bb342de601530c254c34ffb4f7

8 years agoMerge "Skip failed package installs" into nyc-mr1-dev
TreeHugger Robot [Thu, 21 Jul 2016 22:37:24 +0000 (22:37 +0000)]
Merge "Skip failed package installs" into nyc-mr1-dev

8 years agoMerge "Unit tests for "cmd shortcut"" into nyc-mr1-dev
Makoto Onuki [Thu, 21 Jul 2016 22:11:51 +0000 (22:11 +0000)]
Merge "Unit tests for "cmd shortcut"" into nyc-mr1-dev

8 years agoMerge "Resolve ListView children's RTL properties when added" into nyc-mr1-dev
Yigit Boyar [Thu, 21 Jul 2016 21:56:55 +0000 (21:56 +0000)]
Merge "Resolve ListView children's RTL properties when added" into nyc-mr1-dev

8 years agoMerge "Add View reveal on focus hint" into nyc-mr1-dev
TreeHugger Robot [Thu, 21 Jul 2016 21:05:35 +0000 (21:05 +0000)]
Merge "Add View reveal on focus hint" into nyc-mr1-dev

8 years agoMake sure to apply latest configuration to resources
Andrii Kulian [Tue, 19 Jul 2016 02:15:56 +0000 (19:15 -0700)]
Make sure to apply latest configuration to resources

When app is transferred from split-screen mode to fullscreen
and the app doesn't handle configuration change, relaunch is
scheduled with non-empty override config corresponding to
fullscreen size. This override config is then used in instance
of DisplayAdjustments and in size/metrics calculations in
corresponding methods of Display class. To obtain correct values
in fullscreen mode override config should be empty.
Configuration change that follows relaunch has correct (empty)
override config, but it is not really applied for resources
because final config matched current activity config.

Bug: 30185335
Change-Id: I95fb69e0c229c2c6b0c1cd79e9d60556de579ae4

8 years agoSkip failed package installs
Todd Kennedy [Thu, 21 Jul 2016 18:54:53 +0000 (11:54 -0700)]
Skip failed package installs

If a package installation doesn't succeed [or hasn't succeeded yet], its
structures won't be setup so we should skip them when sending first
launch broadcasts.

Change-Id: I89a88480dc6d311a232cae5a236279b2f0a9df3a
Fixes: 30258737

8 years agodocs: Replacing curly apostrophes with straight ones
Andrew Solovay [Thu, 21 Jul 2016 20:50:23 +0000 (13:50 -0700)]
docs: Replacing curly apostrophes with straight ones

Need to have a CL ready to go in case that's necessary to force
a docs build on the new branch, so I'm setting up this one. Doing
nothing but changing ’ to ' in a few files.

Change-Id: I408f9152d4898e75ab34a92606620afeaf4d3ab9

8 years agoMerge "Follow-up to multiple intents support" into nyc-mr1-dev
Makoto Onuki [Thu, 21 Jul 2016 20:46:47 +0000 (20:46 +0000)]
Merge "Follow-up to multiple intents support" into nyc-mr1-dev

8 years agoMerge \"Merge \\\"docs: Fixed typo.\\\" into mnc-io-docs am: 71f742920d am: 9b911b873...
Sreevani Sreejith [Thu, 21 Jul 2016 20:43:03 +0000 (20:43 +0000)]
Merge \"Merge \\\"docs: Fixed typo.\\\" into mnc-io-docs am: 71f742920d am: 9b911b8736\" into nyc-dev
am: 7e9ce5ceaa

Change-Id: I6322203aa7a83b69fbdb892cd99a0992c4717d89

8 years agoMerge \\\"docs: Fixed typo.\\\" into mnc-io-docs am: 71f742920d am: 01f12a9e18
sreevanis [Thu, 21 Jul 2016 20:43:01 +0000 (20:43 +0000)]
Merge \\\"docs: Fixed typo.\\\" into mnc-io-docs am: 71f742920d am: 01f12a9e18
am: daaa7b7e5b

Change-Id: I7a138db4a96049c2369bcf89b60519dda2dbd7b5

8 years agoMerge "Merge \\"docs: Fixed typo.\\" into mnc-io-docs am: 71f742920d am: 9b911b8736...
Android Build Merger (Role) [Thu, 21 Jul 2016 20:39:26 +0000 (20:39 +0000)]
Merge "Merge \\"docs: Fixed typo.\\" into mnc-io-docs am: 71f742920d am: 9b911b8736" into nyc-dev

8 years agoMerge \\"docs: Fixed typo.\\" into mnc-io-docs am: 71f742920d
Sreevani Sreejith [Thu, 21 Jul 2016 20:38:53 +0000 (20:38 +0000)]
Merge \\"docs: Fixed typo.\\" into mnc-io-docs am: 71f742920d
am: 9b911b8736

Change-Id: If294d38647849c51c2ba46b041417346a410c533

8 years agoMerge \\"docs: Fixed typo.\\" into mnc-io-docs am: 71f742920d
Sreevani Sreejith [Thu, 21 Jul 2016 20:38:48 +0000 (20:38 +0000)]
Merge \\"docs: Fixed typo.\\" into mnc-io-docs am: 71f742920d
am: 01f12a9e18

Change-Id: I3c72f75050a4426d4e67fd6a73b7d0f3bc8eff71

8 years agoMerge \"docs: Fixed typo.\" into mnc-io-docs
sreevanis [Thu, 21 Jul 2016 20:32:55 +0000 (20:32 +0000)]
Merge \"docs: Fixed typo.\" into mnc-io-docs
am: 71f742920d

Change-Id: Ia489afb465582c6600d35ffed5826816b4043746

8 years agoMerge \"docs: Fixed typo.\" into mnc-io-docs
sreevanis [Thu, 21 Jul 2016 20:32:51 +0000 (20:32 +0000)]
Merge \"docs: Fixed typo.\" into mnc-io-docs
am: 71f742920d

Change-Id: Ife230ca465a93b9cad9367d302fe402e574f3175

8 years agoBetter docs for ImageView legacy tint
Alan Viverette [Thu, 21 Jul 2016 20:25:13 +0000 (16:25 -0400)]
Better docs for ImageView legacy tint

Bug: 30283225
Change-Id: Ic748c2cc341edf44aed0202aa55a57584bd928c1

8 years agoMerge "docs: Fixed typo." into mnc-io-docs
Sreevani Sreejith [Thu, 21 Jul 2016 20:24:50 +0000 (20:24 +0000)]
Merge "docs: Fixed typo." into mnc-io-docs

8 years agoMerge changes I4a7b64dc,Ic7df8d38 into nyc-mr1-dev
Selim Cinek [Thu, 21 Jul 2016 20:12:12 +0000 (20:12 +0000)]
Merge changes I4a7b64dc,Ic7df8d38 into nyc-mr1-dev

* changes:
  Fixes a usability issue where groups were clearable
  Fixed a bug where notifications could reappear

8 years agoEnsure forwarding listener target is long-clickable
Alan Viverette [Thu, 21 Jul 2016 20:04:33 +0000 (16:04 -0400)]
Ensure forwarding listener target is long-clickable

Bug: 28550349
Change-Id: Id9bb74eee0c91919e3167e3a8a316e3921652df5

8 years agoMerge "Remove date & time picker dialog titles to conform to Material spec" into...
TreeHugger Robot [Thu, 21 Jul 2016 19:33:16 +0000 (19:33 +0000)]
Merge "Remove date & time picker dialog titles to conform to Material spec" into nyc-mr1-dev

8 years agoMerge "Update current.txt to reflect result type change" into nyc-mr1-dev
Makoto Onuki [Thu, 21 Jul 2016 19:22:25 +0000 (19:22 +0000)]
Merge "Update current.txt to reflect result type change" into nyc-mr1-dev

8 years agoMerge "Add CarrierConfig to remove hold during Ims Calls" into nyc-mr1-dev
Brad Ebinger [Thu, 21 Jul 2016 18:40:42 +0000 (18:40 +0000)]
Merge "Add CarrierConfig to remove hold during Ims Calls" into nyc-mr1-dev

8 years agoFollow-up to multiple intents support
Makoto Onuki [Thu, 21 Jul 2016 18:21:59 +0000 (11:21 -0700)]
Follow-up to multiple intents support

 - More unit tests
 - LauncherApps.startShortcut() now supports sourceBounds
 (again)
- Updated the javadoc.

Bug 30218829

Change-Id: Iae208ffd4911d149246ccfd0c4380544c2aafffc

8 years agoMerge "Also report resize when frame changes without inset change." into nyc-mr1-dev
Rob Carr [Thu, 21 Jul 2016 17:59:46 +0000 (17:59 +0000)]
Merge "Also report resize when frame changes without inset change." into nyc-mr1-dev

8 years agoClean up surfaces when app is resumed without being stopped.
Chong Zhang [Thu, 21 Jul 2016 01:33:56 +0000 (18:33 -0700)]
Clean up surfaces when app is resumed without being stopped.

When quickly toggling between two apps, app could be resumed while
it's stopping but not yet stopped. Upon resuming, it could have
surfaces that's marked mDestroying and waiting for the stopped
to be destroyed.

We need to dispose these surfaces properly. If the window is already
removed, we destroy them. Otherwise, clear mDestroying flag so that
the window is ready to be used again. Leaving mDestroying=true makes
the window ineligible for certain things such as receiving wallpaper.

bug: 30255354
Change-Id: Id881653550595ab8e702d6950949bf202ac5a0d9

8 years agoMerge \"Adding projec.yaml files to all top/sub categories.\" into nyc-dev
Amanda Kassay [Thu, 21 Jul 2016 17:09:46 +0000 (17:09 +0000)]
Merge \"Adding projec.yaml files to all top/sub categories.\" into nyc-dev
am: 5a76378471

Change-Id: Ibf98357a67297ee6bb20d58d2c1063917aa5c7b1

8 years agoMerge "Adding projec.yaml files to all top/sub categories." into nyc-dev
Amanda Kassay [Thu, 21 Jul 2016 17:02:12 +0000 (17:02 +0000)]
Merge "Adding projec.yaml files to all top/sub categories." into nyc-dev

8 years agoUpdate current.txt to reflect result type change
Makoto Onuki [Thu, 21 Jul 2016 16:49:00 +0000 (09:49 -0700)]
Update current.txt to reflect result type change

Bug 30218829

Change-Id: I5b4788961a5ef4e7d8f396f55a311ec0d174b0f1

8 years agoMerge "Import translations. DO NOT MERGE" into nyc-mr1-dev
Bill Yi [Thu, 21 Jul 2016 16:09:12 +0000 (16:09 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev

8 years agoImport translations. DO NOT MERGE
Bill Yi [Thu, 21 Jul 2016 16:07:41 +0000 (09:07 -0700)]
Import translations. DO NOT MERGE

Auto-generated-cl: translation import

Bug: 30233028
Change-Id: If78d06c444ccd169c81a1ec4e5d8af86c846ced9

8 years agoMerge "Adding a new getThreadScheduler() method." into nyc-mr1-dev
Srinath Sridharan [Thu, 21 Jul 2016 16:00:39 +0000 (16:00 +0000)]
Merge "Adding a new getThreadScheduler() method." into nyc-mr1-dev

8 years agoMerge \\\\\"DO NOT MERGE Block the user from entering safe boot mode\\\\\" into mnc...
Benjamin Franz [Thu, 21 Jul 2016 15:39:52 +0000 (15:39 +0000)]
Merge \\\\\"DO NOT MERGE Block the user from entering safe boot mode\\\\\" into mnc-dev am: 3e582390b3 am: 7abd7ba093 am: 87534f4ac9 am: cb805b35f3  -s ours
am: 662e2a7975

Change-Id: Ib1fe35a3725c38157a0612d838aca173b77b5981

8 years agoMerge \"docs: work - Managed configuration bundles am: ef57498142 am: ba633fc919...
Billy Lamberta [Thu, 21 Jul 2016 15:39:50 +0000 (15:39 +0000)]
Merge \"docs: work - Managed configuration bundles am: ef57498142 am: ba633fc919\" into nyc-dev
am: 7dbcfcadd5

Change-Id: Ibf90220d894e5d50a0080489e4966289e998873a

8 years agodocs: work - Managed configuration bundles am: ef57498142 am: 9684f2cd2f
Billy Lamberta [Thu, 21 Jul 2016 15:39:48 +0000 (15:39 +0000)]
docs: work - Managed configuration bundles am: ef57498142 am: 9684f2cd2f
am: c7cffa3e6a

Change-Id: Ifc44d30b39e0123fe51aff6603ea23530385a136

8 years agoFix for b/30088807 Dashboard page repeating charts three times on mobile. Staged...
Amanda Kassay [Thu, 21 Jul 2016 15:39:45 +0000 (15:39 +0000)]
Fix for b/30088807 Dashboard page repeating charts three times on mobile. Staged: https://android-dot-devsite.googleplex.com/about/dashboards/index.html am: 83fb75ded3
am: e9d58227bb

Change-Id: I53746a89ee71386ca5184bcf6539f43f4d4d10cb

8 years agoMerge \\\\"DO NOT MERGE Block the user from entering safe boot mode\\\\" into mnc...
Benjamin Franz [Thu, 21 Jul 2016 15:27:28 +0000 (15:27 +0000)]
Merge \\\\"DO NOT MERGE Block the user from entering safe boot mode\\\\" into mnc-dev am: 3e582390b3 am: 7abd7ba093 am: 87534f4ac9
am: cb805b35f3  -s ours

Change-Id: Icbc3d0dbcce8e079a895f194c13a5fa35957bc09

8 years agoMerge "docs: work - Managed configuration bundles am: ef57498142 am: ba633fc919"...
Android Build Merger (Role) [Thu, 21 Jul 2016 15:22:31 +0000 (15:22 +0000)]
Merge "docs: work - Managed configuration bundles am: ef57498142 am: ba633fc919" into nyc-dev

8 years agoMerge \"docs: fixed \'@\' signs that were escaped improperly\" into nyc-dev
Mark Lu [Thu, 21 Jul 2016 15:22:27 +0000 (15:22 +0000)]
Merge \"docs: fixed \'@\' signs that were escaped improperly\" into nyc-dev
am: a7ce29962c

Change-Id: I767392c1b039e0c3c0307504a077a8afb18e6b8a

8 years agodocs: work - Managed configuration bundles am: ef57498142
Billy Lamberta [Thu, 21 Jul 2016 15:21:58 +0000 (15:21 +0000)]
docs: work - Managed configuration bundles am: ef57498142
am: ba633fc919

Change-Id: I819bc7a7568f4ea753b053338c7f73f64e80ec0e

8 years agodocs: work - Managed configuration bundles am: ef57498142
Billy Lamberta [Thu, 21 Jul 2016 15:21:52 +0000 (15:21 +0000)]
docs: work - Managed configuration bundles am: ef57498142
am: 9684f2cd2f

Change-Id: Idaeea63ba30ecb86a4f60955bb4937357ba4fd1b

8 years agoFix for b/30088807 Dashboard page repeating charts three times on mobile. Staged...
Amanda Kassay [Thu, 21 Jul 2016 15:21:50 +0000 (15:21 +0000)]
Fix for b/30088807 Dashboard page repeating charts three times on mobile. Staged: https://android-dot-devsite.googleplex.com/about/dashboards/index.html
am: 83fb75ded3

Change-Id: Ib5e4d45692c54beb3b4fafe89ebc0a5c19400359

8 years agoSupport removing specific routes from local_network
Erik Kline [Sun, 17 Jul 2016 12:28:39 +0000 (21:28 +0900)]
Support removing specific routes from local_network

Bug: 9580643
Change-Id: Id0aaf4bc7424797e2beef03fb18a2c1885a86509

8 years agoMerge \\\"DO NOT MERGE Block the user from entering safe boot mode\\\" into mnc-dev...
Benjamin Franz [Thu, 21 Jul 2016 10:14:59 +0000 (10:14 +0000)]
Merge \\\"DO NOT MERGE Block the user from entering safe boot mode\\\" into mnc-dev am: 3e582390b3 am: 7abd7ba093
am: 87534f4ac9

Change-Id: I05e37f474e496b41c39b7a160418d9f48a265fa3

8 years agoMerge \\"DO NOT MERGE Block the user from entering safe boot mode\\" into mnc-dev...
Benjamin Franz [Thu, 21 Jul 2016 10:10:03 +0000 (10:10 +0000)]
Merge \\"DO NOT MERGE Block the user from entering safe boot mode\\" into mnc-dev am: 3e582390b3
am: 7abd7ba093

Change-Id: I8dd5c0934f135cd567ae6bf2f4edf759ed757dfe

8 years agoMerge \"DO NOT MERGE Block the user from entering safe boot mode\" into mnc-dev
Benjamin Franz [Thu, 21 Jul 2016 10:05:33 +0000 (10:05 +0000)]
Merge \"DO NOT MERGE Block the user from entering safe boot mode\" into mnc-dev
am: 3e582390b3

Change-Id: Ibb90e151746d405e1cc8a1eb889ffa91aca35bc8

8 years agoMerge "DO NOT MERGE Block the user from entering safe boot mode" into mnc-dev
Benjamin Franz [Thu, 21 Jul 2016 09:59:41 +0000 (09:59 +0000)]
Merge "DO NOT MERGE Block the user from entering safe boot mode" into mnc-dev

8 years agoMerge "Import translations. DO NOT MERGE" into nyc-mr1-dev
TreeHugger Robot [Thu, 21 Jul 2016 04:14:05 +0000 (04:14 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev

8 years agoMerge changes from topic 'enable_persist_kernel_log' into nyc-mr1-dev
Thierry Strudel [Thu, 21 Jul 2016 04:07:22 +0000 (04:07 +0000)]
Merge changes from topic 'enable_persist_kernel_log' into nyc-mr1-dev

* changes:
  Settings: add logpersist kernel only selection (strings)
  Settings: add logpersist selection (strings)

8 years agoMerge "Import translations. DO NOT MERGE" into nyc-mr1-dev
TreeHugger Robot [Thu, 21 Jul 2016 04:02:06 +0000 (04:02 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev

8 years agoMerge "Import translations. DO NOT MERGE" into nyc-mr1-dev
TreeHugger Robot [Thu, 21 Jul 2016 03:33:19 +0000 (03:33 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev

8 years agoMerge "Import translations. DO NOT MERGE" into nyc-mr1-dev
TreeHugger Robot [Thu, 21 Jul 2016 03:33:10 +0000 (03:33 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev

8 years agoMerge "Import translations. DO NOT MERGE" into nyc-mr1-dev
TreeHugger Robot [Thu, 21 Jul 2016 03:32:50 +0000 (03:32 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev

8 years agoMerge "Import translations. DO NOT MERGE" into nyc-mr1-dev
TreeHugger Robot [Thu, 21 Jul 2016 03:32:42 +0000 (03:32 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev

8 years agoMerge "Import translations. DO NOT MERGE" into nyc-mr1-dev
TreeHugger Robot [Thu, 21 Jul 2016 03:32:19 +0000 (03:32 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev

8 years agoMerge "Import translations. DO NOT MERGE" into nyc-mr1-dev
TreeHugger Robot [Thu, 21 Jul 2016 03:32:00 +0000 (03:32 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev

8 years agoMerge "Import translations. DO NOT MERGE" into nyc-mr1-dev
TreeHugger Robot [Thu, 21 Jul 2016 03:31:51 +0000 (03:31 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev

8 years agoMerge "Import translations. DO NOT MERGE" into nyc-mr1-dev
TreeHugger Robot [Thu, 21 Jul 2016 03:31:31 +0000 (03:31 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev

8 years agoMerge "Import translations. DO NOT MERGE" into nyc-mr1-dev
TreeHugger Robot [Thu, 21 Jul 2016 03:31:23 +0000 (03:31 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev

8 years agoMerge "Import translations. DO NOT MERGE" into nyc-mr1-dev
TreeHugger Robot [Thu, 21 Jul 2016 03:31:01 +0000 (03:31 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev

8 years agoImport translations. DO NOT MERGE
Bill Yi [Thu, 21 Jul 2016 02:44:42 +0000 (19:44 -0700)]
Import translations. DO NOT MERGE

Change-Id: I7261aecb1f28f1b46c1555c52a0010bcc6c52408
Auto-generated-cl: translation import

8 years agoImport translations. DO NOT MERGE
Bill Yi [Thu, 21 Jul 2016 02:38:44 +0000 (19:38 -0700)]
Import translations. DO NOT MERGE

Change-Id: If251730b4f9eb5fb6f9e0ce7fd2e675adb73862e
Auto-generated-cl: translation import

8 years agoMerge "Revert "Revert "Error colors to point to frameworks rather than hard-code...
Matthew Fritze [Thu, 21 Jul 2016 01:04:23 +0000 (01:04 +0000)]
Merge "Revert "Revert "Error colors to point to frameworks rather than hard-code them""" into nyc-mr1-dev

8 years agoRevert "Revert "Error colors to point to frameworks rather than hard-code them""
Matthew Fritze [Thu, 21 Jul 2016 00:59:33 +0000 (00:59 +0000)]
Revert "Revert "Error colors to point to frameworks rather than hard-code them""

This reverts commit 7c11e933d540b27d596a1536ffbb75007e24a7e6.

Change-Id: I79ecbc39a78f17d22ec20097cfba213de5e30b5e